From d34f97fa5d842228ba29252d596472b348c95338 Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Tue, 19 Aug 2025 23:09:50 +0200 Subject: [PATCH 1/4] feat(repo): Go to repo.katenary.io --- README.md | 6 +- cmd/katenary/main.go | 8 +- doc/docs/packages/cmd/katenary.md | 2 +- doc/docs/packages/internal/generator.md | 170 +++++++++--------- .../packages/internal/generator/extrafiles.md | 6 +- .../internal/generator/katenaryfile.md | 10 +- .../packages/internal/generator/labels.md | 16 +- .../internal/generator/labels/labelstructs.md | 48 ++--- doc/docs/packages/internal/parser.md | 4 +- doc/docs/packages/internal/utils.md | 42 ++--- doc/mkdocs.yml | 2 +- go.mod | 2 +- internal/generator/chart.go | 6 +- internal/generator/chart_test.go | 2 +- internal/generator/configMap.go | 7 +- internal/generator/configMap_test.go | 3 +- internal/generator/converter.go | 12 +- internal/generator/cronJob.go | 7 +- internal/generator/deployment.go | 7 +- internal/generator/deployment_test.go | 3 +- internal/generator/generator.go | 6 +- internal/generator/globals.go | 2 +- internal/generator/helper.go | 3 +- internal/generator/ingress.go | 6 +- internal/generator/ingress_test.go | 3 +- internal/generator/katenaryfile/main.go | 7 +- internal/generator/katenaryfile/main_test.go | 3 +- internal/generator/labels.go | 3 +- internal/generator/labels/katenaryLabels.go | 3 +- .../labels/labelstructs/configMap_test.go | 3 +- .../generator/labels/labelstructs/ingress.go | 3 +- internal/generator/rbac.go | 2 +- internal/generator/secret.go | 5 +- internal/generator/secret_test.go | 3 +- internal/generator/service.go | 3 +- internal/generator/tools_test.go | 2 +- internal/generator/utils.go | 6 +- internal/generator/utils_test.go | 5 +- internal/generator/volume.go | 3 +- internal/generator/volume_test.go | 5 +- makefiles/build.mk | 2 +- makefiles/packager.mk | 2 +- oci/katenary/Containerfile | 14 +- 43 files changed, 238 insertions(+), 219 deletions(-) diff --git a/README.md b/README.md index 5bc25b4..60f6d0b 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ is continuously updated. It's preferable to use releases. You can use this commands on Linux: ```bash -sh <(curl -sSL https://raw.githubusercontent.com/Katenary/katenary/master/install.sh) +sh <(curl -sSL https://repo.katenary.io/Katenary/katenary/raw/branch/master/install.sh) ``` ## Or, build yourself @@ -269,7 +269,7 @@ return { settings = { yaml = { schemas = { - ["https://raw.githubusercontent.com/Katenary/katenary/master/katenary.json"] = "katenary.yaml", + ["https://repo.katenary.io/Katenary/katenary/raw/branch/master/katenary.json"] = "katenary.yaml", }, }, }, @@ -285,7 +285,7 @@ Use this address to validate the `katenary.yaml` file in VSCode: ```json { "yaml.schemas": { - "https://raw.githubusercontent.com/Katenary/katenary/master/katenary.json": "katenary.yaml" + "https://repo.katenary.io/Katenary/katenary/raw/branch/master/katenary.json": "katenary.yaml" } } ``` diff --git a/cmd/katenary/main.go b/cmd/katenary/main.go index 63a6cbc..375ab8a 100644 --- a/cmd/katenary/main.go +++ b/cmd/katenary/main.go @@ -10,10 +10,10 @@ import ( "os" "strings" - "github.com/katenary/katenary/internal/generator" - "github.com/katenary/katenary/internal/generator/katenaryfile" - "github.com/katenary/katenary/internal/generator/labels" - "github.com/katenary/katenary/internal/utils" + "repo.katenary.io/katenary/katenary/internal/generator" + "repo.katenary.io/katenary/katenary/internal/generator/katenaryfile" + "repo.katenary.io/katenary/katenary/internal/generator/labels" + "repo.katenary.io/katenary/katenary/internal/utils" "github.com/compose-spec/compose-go/cli" "github.com/spf13/cobra" diff --git a/doc/docs/packages/cmd/katenary.md b/doc/docs/packages/cmd/katenary.md index 7436644..d3d0981 100644 --- a/doc/docs/packages/cmd/katenary.md +++ b/doc/docs/packages/cmd/katenary.md @@ -3,7 +3,7 @@ # katenary ```go -import "github.com/katenary/katenary/cmd/katenary" +import "repo.katenary.io/katenary/katenary/cmd/katenary" ``` Katenary CLI, main package. diff --git a/doc/docs/packages/internal/generator.md b/doc/docs/packages/internal/generator.md index f8ce06a..e1afc62 100644 --- a/doc/docs/packages/internal/generator.md +++ b/doc/docs/packages/internal/generator.md @@ -3,7 +3,7 @@ # generator ```go -import "github.com/katenary/katenary/internal/generator" +import "repo.katenary.io/katenary/katenary/internal/generator" ``` Package generator generates kubernetes objects from a "compose" file and transforms them into a helm chart. @@ -35,7 +35,7 @@ var Version = "master" // changed at compile time ``` -## func [Convert]() +## func [Convert]() ```go func Convert(config ConvertOptions, dockerComposeFile ...string) error @@ -44,7 +44,7 @@ func Convert(config ConvertOptions, dockerComposeFile ...string) error Convert a compose \(docker, podman...\) project to a helm chart. It calls Generate\(\) to generate the chart and then write it to the disk. -## func [GetLabels]() +## func [GetLabels]() ```go func GetLabels(serviceName, appName string) map[string]string @@ -53,7 +53,7 @@ func GetLabels(serviceName, appName string) map[string]string GetLabels returns the labels for a service. It uses the appName to replace the \_\_replace\_\_ in the labels. This is used to generate the labels in the templates. -## func [GetMatchLabels]() +## func [GetMatchLabels]() ```go func GetMatchLabels(serviceName, appName string) map[string]string @@ -62,7 +62,7 @@ func GetMatchLabels(serviceName, appName string) map[string]string GetMatchLabels returns the matchLabels for a service. It uses the appName to replace the \_\_replace\_\_ in the labels. This is used to generate the matchLabels in the templates. -## func [GetVersion]() +## func [GetVersion]() ```go func GetVersion() string @@ -71,7 +71,7 @@ func GetVersion() string GetVersion return the version of katneary. It's important to understand that the version is set at compile time for the github release. But, it the user get katneary using \`go install\`, the version should be different. -## func [Helper]() +## func [Helper]() ```go func Helper(name string) string @@ -80,7 +80,7 @@ func Helper(name string) string Helper returns the \_helpers.tpl file for a chart. -## func [NewCronJob]() +## func [NewCronJob]() ```go func NewCronJob(service types.ServiceConfig, chart *HelmChart, appName string) (*CronJob, *RBAC) @@ -89,7 +89,7 @@ func NewCronJob(service types.ServiceConfig, chart *HelmChart, appName string) ( NewCronJob creates a new CronJob from a compose service. The appName is the name of the application taken from the project name. -## func [ToK8SYaml]() +## func [ToK8SYaml]() ```go func ToK8SYaml(obj any) ([]byte, error) @@ -98,7 +98,7 @@ func ToK8SYaml(obj any) ([]byte, error) -## func [UnWrapTPL]() +## func [UnWrapTPL]() ```go func UnWrapTPL(in []byte) []byte @@ -107,7 +107,7 @@ func UnWrapTPL(in []byte) []byte UnWrapTPL removes the line wrapping from a template. -## type [ChartTemplate]() +## type [ChartTemplate]() ChartTemplate is a template of a chart. It contains the content of the template and the name of the service. This is used internally to generate the templates. @@ -119,7 +119,7 @@ type ChartTemplate struct { ``` -## type [ConfigMap]() +## type [ConfigMap]() ConfigMap is a kubernetes ConfigMap. Implements the DataMap interface. @@ -131,7 +131,7 @@ type ConfigMap struct { ``` -### func [NewConfigMap]() +### func [NewConfigMap]() ```go func NewConfigMap(service types.ServiceConfig, appName string, forFile bool) *ConfigMap @@ -140,7 +140,7 @@ func NewConfigMap(service types.ServiceConfig, appName string, forFile bool) *Co NewConfigMap creates a new ConfigMap from a compose service. The appName is the name of the application taken from the project name. The ConfigMap is filled by environment variables and labels "map\-env". -### func [NewConfigMapFromDirectory]() +### func [NewConfigMapFromDirectory]() ```go func NewConfigMapFromDirectory(service types.ServiceConfig, appName, path string) *ConfigMap @@ -149,7 +149,7 @@ func NewConfigMapFromDirectory(service types.ServiceConfig, appName, path string NewConfigMapFromDirectory creates a new ConfigMap from a compose service. This path is the path to the file or directory. If the path is a directory, all files in the directory are added to the ConfigMap. Each subdirectory are ignored. Note that the Generate\(\) function will create the subdirectories ConfigMaps. -### func \(\*ConfigMap\) [AddBinaryData]() +### func \(\*ConfigMap\) [AddBinaryData]() ```go func (c *ConfigMap) AddBinaryData(key string, value []byte) @@ -158,7 +158,7 @@ func (c *ConfigMap) AddBinaryData(key string, value []byte) AddBinaryData adds binary data to the configmap. Append or overwrite the value if the key already exists. -### func \(\*ConfigMap\) [AddData]() +### func \(\*ConfigMap\) [AddData]() ```go func (c *ConfigMap) AddData(key, value string) @@ -167,7 +167,7 @@ func (c *ConfigMap) AddData(key, value string) AddData adds a key value pair to the configmap. Append or overwrite the value if the key already exists. -### func \(\*ConfigMap\) [AppendDir]() +### func \(\*ConfigMap\) [AppendDir]() ```go func (c *ConfigMap) AppendDir(path string) error @@ -176,7 +176,7 @@ func (c *ConfigMap) AppendDir(path string) error AppendDir adds files from given path to the configmap. It is not recursive, to add all files in a directory, you need to call this function for each subdirectory. -### func \(\*ConfigMap\) [AppendFile]() +### func \(\*ConfigMap\) [AppendFile]() ```go func (c *ConfigMap) AppendFile(path string) error @@ -185,7 +185,7 @@ func (c *ConfigMap) AppendFile(path string) error -### func \(\*ConfigMap\) [Filename]() +### func \(\*ConfigMap\) [Filename]() ```go func (c *ConfigMap) Filename() string @@ -194,7 +194,7 @@ func (c *ConfigMap) Filename() string Filename returns the filename of the configmap. If the configmap is used for files, the filename contains the path. -### func \(\*ConfigMap\) [SetData]() +### func \(\*ConfigMap\) [SetData]() ```go func (c *ConfigMap) SetData(data map[string]string) @@ -203,7 +203,7 @@ func (c *ConfigMap) SetData(data map[string]string) SetData sets the data of the configmap. It replaces the entire data. -### func \(\*ConfigMap\) [Yaml]() +### func \(\*ConfigMap\) [Yaml]() ```go func (c *ConfigMap) Yaml() ([]byte, error) @@ -212,7 +212,7 @@ func (c *ConfigMap) Yaml() ([]byte, error) Yaml returns the yaml representation of the configmap -## type [ConfigMapMount]() +## type [ConfigMapMount]() @@ -223,7 +223,7 @@ type ConfigMapMount struct { ``` -## type [ConvertOptions]() +## type [ConvertOptions]() ConvertOptions are the options to convert a compose project to a helm chart. @@ -241,7 +241,7 @@ type ConvertOptions struct { ``` -## type [CronJob]() +## type [CronJob]() CronJob is a kubernetes CronJob. @@ -253,7 +253,7 @@ type CronJob struct { ``` -### func \(\*CronJob\) [Filename]() +### func \(\*CronJob\) [Filename]() ```go func (c *CronJob) Filename() string @@ -264,7 +264,7 @@ Filename returns the filename of the cronjob. Implements the Yaml interface. -### func \(\*CronJob\) [Yaml]() +### func \(\*CronJob\) [Yaml]() ```go func (c *CronJob) Yaml() ([]byte, error) @@ -275,7 +275,7 @@ Yaml returns the yaml representation of the cronjob. Implements the Yaml interface. -## type [CronJobValue]() +## type [CronJobValue]() CronJobValue is a cronjob configuration that will be saved in values.yaml. @@ -289,7 +289,7 @@ type CronJobValue struct { ``` -## type [DataMap]() +## type [DataMap]() DataMap is a kubernetes ConfigMap or Secret. It can be used to add data to the ConfigMap or Secret. @@ -301,7 +301,7 @@ type DataMap interface { ``` -## type [Deployment]() +## type [Deployment]() Deployment is a kubernetes Deployment. @@ -313,7 +313,7 @@ type Deployment struct { ``` -### func [NewDeployment]() +### func [NewDeployment]() ```go func NewDeployment(service types.ServiceConfig, chart *HelmChart) *Deployment @@ -322,7 +322,7 @@ func NewDeployment(service types.ServiceConfig, chart *HelmChart) *Deployment NewDeployment creates a new Deployment from a compose service. The appName is the name of the application taken from the project name. It also creates the Values map that will be used to create the values.yaml file. -### func \(\*Deployment\) [AddContainer]() +### func \(\*Deployment\) [AddContainer]() ```go func (d *Deployment) AddContainer(service types.ServiceConfig) @@ -331,7 +331,7 @@ func (d *Deployment) AddContainer(service types.ServiceConfig) AddContainer adds a container to the deployment. -### func \(\*Deployment\) [AddHealthCheck]() +### func \(\*Deployment\) [AddHealthCheck]() ```go func (d *Deployment) AddHealthCheck(service types.ServiceConfig, container *corev1.Container) @@ -340,7 +340,7 @@ func (d *Deployment) AddHealthCheck(service types.ServiceConfig, container *core -### func \(\*Deployment\) [AddIngress]() +### func \(\*Deployment\) [AddIngress]() ```go func (d *Deployment) AddIngress(service types.ServiceConfig, appName string) *Ingress @@ -349,7 +349,7 @@ func (d *Deployment) AddIngress(service types.ServiceConfig, appName string) *In AddIngress adds an ingress to the deployment. It creates the ingress object. -### func \(\*Deployment\) [AddLegacyVolume]() +### func \(\*Deployment\) [AddLegacyVolume]() ```go func (d *Deployment) AddLegacyVolume(name, kind string) @@ -358,7 +358,7 @@ func (d *Deployment) AddLegacyVolume(name, kind string) -### func \(\*Deployment\) [AddVolumes]() +### func \(\*Deployment\) [AddVolumes]() ```go func (d *Deployment) AddVolumes(service types.ServiceConfig, appName string) @@ -367,7 +367,7 @@ func (d *Deployment) AddVolumes(service types.ServiceConfig, appName string) AddVolumes adds a volume to the deployment. It does not create the PVC, it only adds the volumes to the deployment. If the volume is a bind volume it will warn the user that it is not supported yet. -### func \(\*Deployment\) [BindFrom]() +### func \(\*Deployment\) [BindFrom]() ```go func (d *Deployment) BindFrom(service types.ServiceConfig, binded *Deployment) @@ -376,7 +376,7 @@ func (d *Deployment) BindFrom(service types.ServiceConfig, binded *Deployment) -### func \(\*Deployment\) [BindMapFilesToContainer]() +### func \(\*Deployment\) [BindMapFilesToContainer]() ```go func (d *Deployment) BindMapFilesToContainer(service types.ServiceConfig, secrets []string, appName string) (*corev1.Container, int) @@ -385,7 +385,7 @@ func (d *Deployment) BindMapFilesToContainer(service types.ServiceConfig, secret -### func \(\*Deployment\) [DependsOn]() +### func \(\*Deployment\) [DependsOn]() ```go func (d *Deployment) DependsOn(to *Deployment, servicename string) error @@ -394,7 +394,7 @@ func (d *Deployment) DependsOn(to *Deployment, servicename string) error DependsOn adds a initContainer to the deployment that will wait for the service to be up. -### func \(\*Deployment\) [Filename]() +### func \(\*Deployment\) [Filename]() ```go func (d *Deployment) Filename() string @@ -403,7 +403,7 @@ func (d *Deployment) Filename() string Filename returns the filename of the deployment. -### func \(\*Deployment\) [MountExchangeVolumes]() +### func \(\*Deployment\) [MountExchangeVolumes]() ```go func (d *Deployment) MountExchangeVolumes() @@ -412,7 +412,7 @@ func (d *Deployment) MountExchangeVolumes() -### func \(\*Deployment\) [SetEnvFrom]() +### func \(\*Deployment\) [SetEnvFrom]() ```go func (d *Deployment) SetEnvFrom(service types.ServiceConfig, appName string, samePod ...bool) @@ -421,7 +421,7 @@ func (d *Deployment) SetEnvFrom(service types.ServiceConfig, appName string, sam SetEnvFrom sets the environment variables to a configmap. The configmap is created. -### func \(\*Deployment\) [Yaml]() +### func \(\*Deployment\) [Yaml]() ```go func (d *Deployment) Yaml() ([]byte, error) @@ -430,7 +430,7 @@ func (d *Deployment) Yaml() ([]byte, error) Yaml returns the yaml representation of the deployment. -## type [FileMapUsage]() +## type [FileMapUsage]() FileMapUsage is the usage of the filemap. @@ -448,7 +448,7 @@ const ( ``` -## type [HelmChart]() +## type [HelmChart]() HelmChart is a Helm Chart representation. It contains all the templates, values, versions, helpers... @@ -471,7 +471,7 @@ type HelmChart struct { ``` -### func [Generate]() +### func [Generate]() ```go func Generate(project *types.Project) (*HelmChart, error) @@ -491,7 +491,7 @@ The Generate function will create the HelmChart object this way: - Merge the same\-pod services. -### func [NewChart]() +### func [NewChart]() ```go func NewChart(name string) *HelmChart @@ -500,7 +500,7 @@ func NewChart(name string) *HelmChart NewChart creates a new empty chart with the given name. -### func \(\*HelmChart\) [SaveTemplates]() +### func \(\*HelmChart\) [SaveTemplates]() ```go func (chart *HelmChart) SaveTemplates(templateDir string) @@ -509,7 +509,7 @@ func (chart *HelmChart) SaveTemplates(templateDir string) SaveTemplates the templates of the chart to the given directory. -## type [Ingress]() +## type [Ingress]() @@ -521,7 +521,7 @@ type Ingress struct { ``` -### func [NewIngress]() +### func [NewIngress]() ```go func NewIngress(service types.ServiceConfig, Chart *HelmChart) *Ingress @@ -530,7 +530,7 @@ func NewIngress(service types.ServiceConfig, Chart *HelmChart) *Ingress NewIngress creates a new Ingress from a compose service. -### func \(\*Ingress\) [Filename]() +### func \(\*Ingress\) [Filename]() ```go func (ingress *Ingress) Filename() string @@ -539,7 +539,7 @@ func (ingress *Ingress) Filename() string -### func \(\*Ingress\) [Yaml]() +### func \(\*Ingress\) [Yaml]() ```go func (ingress *Ingress) Yaml() ([]byte, error) @@ -548,7 +548,7 @@ func (ingress *Ingress) Yaml() ([]byte, error) -## type [IngressValue]() +## type [IngressValue]() IngressValue is a ingress configuration that will be saved in values.yaml. @@ -564,7 +564,7 @@ type IngressValue struct { ``` -## type [PersistenceValue]() +## type [PersistenceValue]() PersistenceValue is a persistence configuration that will be saved in values.yaml. @@ -578,7 +578,7 @@ type PersistenceValue struct { ``` -## type [RBAC]() +## type [RBAC]() RBAC is a kubernetes RBAC containing a role, a rolebinding and an associated serviceaccount. @@ -591,7 +591,7 @@ type RBAC struct { ``` -### func [NewRBAC]() +### func [NewRBAC]() ```go func NewRBAC(service types.ServiceConfig, appName string) *RBAC @@ -600,7 +600,7 @@ func NewRBAC(service types.ServiceConfig, appName string) *RBAC NewRBAC creates a new RBAC from a compose service. The appName is the name of the application taken from the project name. -## type [RepositoryValue]() +## type [RepositoryValue]() RepositoryValue is a docker repository image and tag that will be saved in values.yaml. @@ -612,7 +612,7 @@ type RepositoryValue struct { ``` -## type [Role]() +## type [Role]() Role is a kubernetes Role. @@ -624,7 +624,7 @@ type Role struct { ``` -### func \(\*Role\) [Filename]() +### func \(\*Role\) [Filename]() ```go func (r *Role) Filename() string @@ -633,7 +633,7 @@ func (r *Role) Filename() string -### func \(\*Role\) [Yaml]() +### func \(\*Role\) [Yaml]() ```go func (r *Role) Yaml() ([]byte, error) @@ -642,7 +642,7 @@ func (r *Role) Yaml() ([]byte, error) -## type [RoleBinding]() +## type [RoleBinding]() RoleBinding is a kubernetes RoleBinding. @@ -654,7 +654,7 @@ type RoleBinding struct { ``` -### func \(\*RoleBinding\) [Filename]() +### func \(\*RoleBinding\) [Filename]() ```go func (r *RoleBinding) Filename() string @@ -663,7 +663,7 @@ func (r *RoleBinding) Filename() string -### func \(\*RoleBinding\) [Yaml]() +### func \(\*RoleBinding\) [Yaml]() ```go func (r *RoleBinding) Yaml() ([]byte, error) @@ -672,7 +672,7 @@ func (r *RoleBinding) Yaml() ([]byte, error) -## type [Secret]() +## type [Secret]() Secret is a kubernetes Secret. @@ -686,7 +686,7 @@ type Secret struct { ``` -### func [NewSecret]() +### func [NewSecret]() ```go func NewSecret(service types.ServiceConfig, appName string) *Secret @@ -695,7 +695,7 @@ func NewSecret(service types.ServiceConfig, appName string) *Secret NewSecret creates a new Secret from a compose service -### func \(\*Secret\) [AddData]() +### func \(\*Secret\) [AddData]() ```go func (s *Secret) AddData(key, value string) @@ -704,7 +704,7 @@ func (s *Secret) AddData(key, value string) AddData adds a key value pair to the secret. -### func \(\*Secret\) [Filename]() +### func \(\*Secret\) [Filename]() ```go func (s *Secret) Filename() string @@ -713,7 +713,7 @@ func (s *Secret) Filename() string Filename returns the filename of the secret. -### func \(\*Secret\) [SetData]() +### func \(\*Secret\) [SetData]() ```go func (s *Secret) SetData(data map[string]string) @@ -722,7 +722,7 @@ func (s *Secret) SetData(data map[string]string) SetData sets the data of the secret. -### func \(\*Secret\) [Yaml]() +### func \(\*Secret\) [Yaml]() ```go func (s *Secret) Yaml() ([]byte, error) @@ -731,7 +731,7 @@ func (s *Secret) Yaml() ([]byte, error) Yaml returns the yaml representation of the secret. -## type [Service]() +## type [Service]() Service is a kubernetes Service. @@ -743,7 +743,7 @@ type Service struct { ``` -### func [NewService]() +### func [NewService]() ```go func NewService(service types.ServiceConfig, appName string) *Service @@ -752,7 +752,7 @@ func NewService(service types.ServiceConfig, appName string) *Service NewService creates a new Service from a compose service. -### func \(\*Service\) [AddPort]() +### func \(\*Service\) [AddPort]() ```go func (s *Service) AddPort(port types.ServicePortConfig, serviceName ...string) @@ -761,7 +761,7 @@ func (s *Service) AddPort(port types.ServicePortConfig, serviceName ...string) AddPort adds a port to the service. -### func \(\*Service\) [Filename]() +### func \(\*Service\) [Filename]() ```go func (s *Service) Filename() string @@ -770,7 +770,7 @@ func (s *Service) Filename() string Filename returns the filename of the service. -### func \(\*Service\) [Yaml]() +### func \(\*Service\) [Yaml]() ```go func (s *Service) Yaml() ([]byte, error) @@ -779,7 +779,7 @@ func (s *Service) Yaml() ([]byte, error) Yaml returns the yaml representation of the service. -## type [ServiceAccount]() +## type [ServiceAccount]() ServiceAccount is a kubernetes ServiceAccount. @@ -791,7 +791,7 @@ type ServiceAccount struct { ``` -### func \(\*ServiceAccount\) [Filename]() +### func \(\*ServiceAccount\) [Filename]() ```go func (r *ServiceAccount) Filename() string @@ -800,7 +800,7 @@ func (r *ServiceAccount) Filename() string -### func \(\*ServiceAccount\) [Yaml]() +### func \(\*ServiceAccount\) [Yaml]() ```go func (r *ServiceAccount) Yaml() ([]byte, error) @@ -809,7 +809,7 @@ func (r *ServiceAccount) Yaml() ([]byte, error) -## type [TLS]() +## type [TLS]() @@ -821,7 +821,7 @@ type TLS struct { ``` -## type [Value]() +## type [Value]() Value will be saved in values.yaml. It contains configuration for all deployment and services. @@ -841,7 +841,7 @@ type Value struct { ``` -### func [NewValue]() +### func [NewValue]() ```go func NewValue(service types.ServiceConfig, main ...bool) *Value @@ -852,7 +852,7 @@ NewValue creates a new Value from a compose service. The value contains the nece If \`main\` is true, the tag will be empty because it will be set in the helm chart appVersion. -### func \(\*Value\) [AddIngress]() +### func \(\*Value\) [AddIngress]() ```go func (v *Value) AddIngress(host, path string) @@ -861,7 +861,7 @@ func (v *Value) AddIngress(host, path string) -### func \(\*Value\) [AddPersistence]() +### func \(\*Value\) [AddPersistence]() ```go func (v *Value) AddPersistence(volumeName string) @@ -870,7 +870,7 @@ func (v *Value) AddPersistence(volumeName string) AddPersistence adds persistence configuration to the Value. -## type [VolumeClaim]() +## type [VolumeClaim]() VolumeClaim is a kubernetes VolumeClaim. This is a PersistentVolumeClaim. @@ -882,7 +882,7 @@ type VolumeClaim struct { ``` -### func [NewVolumeClaim]() +### func [NewVolumeClaim]() ```go func NewVolumeClaim(service types.ServiceConfig, volumeName, appName string) *VolumeClaim @@ -891,7 +891,7 @@ func NewVolumeClaim(service types.ServiceConfig, volumeName, appName string) *Vo NewVolumeClaim creates a new VolumeClaim from a compose service. -### func \(\*VolumeClaim\) [Filename]() +### func \(\*VolumeClaim\) [Filename]() ```go func (v *VolumeClaim) Filename() string @@ -900,7 +900,7 @@ func (v *VolumeClaim) Filename() string Filename returns the suggested filename for a VolumeClaim. -### func \(\*VolumeClaim\) [Yaml]() +### func \(\*VolumeClaim\) [Yaml]() ```go func (v *VolumeClaim) Yaml() ([]byte, error) @@ -909,7 +909,7 @@ func (v *VolumeClaim) Yaml() ([]byte, error) Yaml marshals a VolumeClaim into yaml. -## type [Yaml]() +## type [Yaml]() Yaml is a kubernetes object that can be converted to yaml. diff --git a/doc/docs/packages/internal/generator/extrafiles.md b/doc/docs/packages/internal/generator/extrafiles.md index da78080..944042b 100644 --- a/doc/docs/packages/internal/generator/extrafiles.md +++ b/doc/docs/packages/internal/generator/extrafiles.md @@ -3,12 +3,12 @@ # extrafiles ```go -import "github.com/katenary/katenary/internal/generator/extrafiles" +import "repo.katenary.io/katenary/katenary/internal/generator/extrafiles" ``` Package extrafiles provides function to generate the Chart files that are not objects. Like README.md and notes.txt... -## func [NotesFile]() +## func [NotesFile]() ```go func NotesFile(services []string) string @@ -17,7 +17,7 @@ func NotesFile(services []string) string NotesFile returns the content of the note.txt file. -## func [ReadMeFile]() +## func [ReadMeFile]() ```go func ReadMeFile(charname, description string, values map[string]any) string diff --git a/doc/docs/packages/internal/generator/katenaryfile.md b/doc/docs/packages/internal/generator/katenaryfile.md index ecf6530..fa4c931 100644 --- a/doc/docs/packages/internal/generator/katenaryfile.md +++ b/doc/docs/packages/internal/generator/katenaryfile.md @@ -3,7 +3,7 @@ # katenaryfile ```go -import "github.com/katenary/katenary/internal/generator/katenaryfile" +import "repo.katenary.io/katenary/katenary/internal/generator/katenaryfile" ``` Package katenaryfile is a package for reading and writing katenary files. @@ -12,7 +12,7 @@ A katenary file, named "katenary.yml" or "katenary.yaml", is a file where you ca Formely, the file describe the same structure as in labels, and so that can be validated and completed by LSP. It also ease the use of katenary. -## func [GenerateSchema]() +## func [GenerateSchema]() ```go func GenerateSchema() string @@ -21,7 +21,7 @@ func GenerateSchema() string GenerateSchema generates the schema for the katenary.yaml file. -## func [OverrideWithConfig]() +## func [OverrideWithConfig]() ```go func OverrideWithConfig(project *types.Project) @@ -30,7 +30,7 @@ func OverrideWithConfig(project *types.Project) OverrideWithConfig overrides the project with the katenary.yaml file. It will set the labels of the services with the values from the katenary.yaml file. It work in memory, so it will not modify the original project. -## type [Service]() +## type [Service]() Service is a struct that contains the service configuration for katenary @@ -56,7 +56,7 @@ type Service struct { ``` -## type [StringOrMap]() +## type [StringOrMap]() StringOrMap is a struct that can be either a string or a map of strings. It's a helper struct to unmarshal the katenary.yaml file and produce the schema diff --git a/doc/docs/packages/internal/generator/labels.md b/doc/docs/packages/internal/generator/labels.md index 884c504..d9cd158 100644 --- a/doc/docs/packages/internal/generator/labels.md +++ b/doc/docs/packages/internal/generator/labels.md @@ -3,7 +3,7 @@ # labels ```go -import "github.com/katenary/katenary/internal/generator/labels" +import "repo.katenary.io/katenary/katenary/internal/generator/labels" ``` Package labels provides functionality to parse and manipulate labels. @@ -17,7 +17,7 @@ const KatenaryLabelPrefix = "katenary.v3" ``` -## func [GetLabelHelp]() +## func [GetLabelHelp]() ```go func GetLabelHelp(asMarkdown bool) string @@ -26,7 +26,7 @@ func GetLabelHelp(asMarkdown bool) string GetLabelHelp return the help for the labels. -## func [GetLabelHelpFor]() +## func [GetLabelHelpFor]() ```go func GetLabelHelpFor(labelname string, asMarkdown bool) string @@ -35,7 +35,7 @@ func GetLabelHelpFor(labelname string, asMarkdown bool) string GetLabelHelpFor returns the help for a specific label. -## func [GetLabelNames]() +## func [GetLabelNames]() ```go func GetLabelNames() []string @@ -44,7 +44,7 @@ func GetLabelNames() []string GetLabelNames returns a sorted list of all katenary label names. -## func [Prefix]() +## func [Prefix]() ```go func Prefix() string @@ -53,7 +53,7 @@ func Prefix() string -## type [Help]() +## type [Help]() Help is the documentation of a label. @@ -67,7 +67,7 @@ type Help struct { ``` -## type [Label]() +## type [Label]() Label is a katenary label to find in compose files. @@ -99,7 +99,7 @@ const ( ``` -### func [LabelName]() +### func [LabelName]() ```go func LabelName(name string) Label diff --git a/doc/docs/packages/internal/generator/labels/labelstructs.md b/doc/docs/packages/internal/generator/labels/labelstructs.md index f9a1991..afdca87 100644 --- a/doc/docs/packages/internal/generator/labels/labelstructs.md +++ b/doc/docs/packages/internal/generator/labels/labelstructs.md @@ -3,12 +3,12 @@ # labelstructs ```go -import "github.com/katenary/katenary/internal/generator/labels/labelstructs" +import "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" ``` Package labelstructs is a package that contains the structs used to represent the labels in the yaml files. -## type [ConfigMapFiles]() +## type [ConfigMapFiles]() @@ -17,7 +17,7 @@ type ConfigMapFiles []string ``` -### func [ConfigMapFileFrom]() +### func [ConfigMapFileFrom]() ```go func ConfigMapFileFrom(data string) (ConfigMapFiles, error) @@ -26,7 +26,7 @@ func ConfigMapFileFrom(data string) (ConfigMapFiles, error) -## type [CronJob]() +## type [CronJob]() @@ -40,7 +40,7 @@ type CronJob struct { ``` -### func [CronJobFrom]() +### func [CronJobFrom]() ```go func CronJobFrom(data string) (*CronJob, error) @@ -49,7 +49,7 @@ func CronJobFrom(data string) (*CronJob, error) -## type [Dependency]() +## type [Dependency]() Dependency is a dependency of a chart to other charts. @@ -64,7 +64,7 @@ type Dependency struct { ``` -### func [DependenciesFrom]() +### func [DependenciesFrom]() ```go func DependenciesFrom(data string) ([]Dependency, error) @@ -73,7 +73,7 @@ func DependenciesFrom(data string) ([]Dependency, error) DependenciesFrom returns a slice of dependencies from the given string. -## type [EnvFrom]() +## type [EnvFrom]() @@ -82,7 +82,7 @@ type EnvFrom []string ``` -### func [EnvFromFrom]() +### func [EnvFromFrom]() ```go func EnvFromFrom(data string) (EnvFrom, error) @@ -91,7 +91,7 @@ func EnvFromFrom(data string) (EnvFrom, error) EnvFromFrom returns a EnvFrom from the given string. -## type [ExchangeVolume]() +## type [ExchangeVolume]() @@ -105,7 +105,7 @@ type ExchangeVolume struct { ``` -### func [NewExchangeVolumes]() +### func [NewExchangeVolumes]() ```go func NewExchangeVolumes(data string) ([]*ExchangeVolume, error) @@ -114,7 +114,7 @@ func NewExchangeVolumes(data string) ([]*ExchangeVolume, error) -## type [HealthCheck]() +## type [HealthCheck]() @@ -126,7 +126,7 @@ type HealthCheck struct { ``` -### func [ProbeFrom]() +### func [ProbeFrom]() ```go func ProbeFrom(data string) (*HealthCheck, error) @@ -135,7 +135,7 @@ func ProbeFrom(data string) (*HealthCheck, error) -## type [Ingress]() +## type [Ingress]() @@ -152,7 +152,7 @@ type Ingress struct { ``` -### func [IngressFrom]() +### func [IngressFrom]() ```go func IngressFrom(data string) (*Ingress, error) @@ -161,7 +161,7 @@ func IngressFrom(data string) (*Ingress, error) IngressFrom creates a new Ingress from a compose service. -## type [MapEnv]() +## type [MapEnv]() @@ -170,7 +170,7 @@ type MapEnv map[string]string ``` -### func [MapEnvFrom]() +### func [MapEnvFrom]() ```go func MapEnvFrom(data string) (MapEnv, error) @@ -179,7 +179,7 @@ func MapEnvFrom(data string) (MapEnv, error) MapEnvFrom returns a MapEnv from the given string. -## type [Ports]() +## type [Ports]() @@ -188,7 +188,7 @@ type Ports []uint32 ``` -### func [PortsFrom]() +### func [PortsFrom]() ```go func PortsFrom(data string) (Ports, error) @@ -197,7 +197,7 @@ func PortsFrom(data string) (Ports, error) PortsFrom returns a Ports from the given string. -## type [Secrets]() +## type [Secrets]() @@ -206,7 +206,7 @@ type Secrets []string ``` -### func [SecretsFrom]() +### func [SecretsFrom]() ```go func SecretsFrom(data string) (Secrets, error) @@ -215,7 +215,7 @@ func SecretsFrom(data string) (Secrets, error) -## type [TLS]() +## type [TLS]() @@ -226,7 +226,7 @@ type TLS struct { ``` -## type [ValueFrom]() +## type [ValueFrom]() @@ -235,7 +235,7 @@ type ValueFrom map[string]string ``` -### func [GetValueFrom]() +### func [GetValueFrom]() ```go func GetValueFrom(data string) (*ValueFrom, error) diff --git a/doc/docs/packages/internal/parser.md b/doc/docs/packages/internal/parser.md index 358e2db..9877f74 100644 --- a/doc/docs/packages/internal/parser.md +++ b/doc/docs/packages/internal/parser.md @@ -3,12 +3,12 @@ # parser ```go -import "github.com/katenary/katenary/internal/parser" +import "repo.katenary.io/katenary/katenary/internal/parser" ``` Package parser is a wrapper around compose\-go to parse compose files. -## func [Parse]() +## func [Parse]() ```go func Parse(profiles []string, envFiles []string, dockerComposeFile ...string) (*types.Project, error) diff --git a/doc/docs/packages/internal/utils.md b/doc/docs/packages/internal/utils.md index bb73567..672be05 100644 --- a/doc/docs/packages/internal/utils.md +++ b/doc/docs/packages/internal/utils.md @@ -3,7 +3,7 @@ # utils ```go -import "github.com/katenary/katenary/internal/utils" +import "repo.katenary.io/katenary/katenary/internal/utils" ``` Package utils provides some utility functions used in katenary. It defines some constants and functions used in the whole project. @@ -17,7 +17,7 @@ const DirectoryPermission = 0o755 ``` -## func [AsResourceName]() +## func [AsResourceName]() ```go func AsResourceName(name string) string @@ -26,7 +26,7 @@ func AsResourceName(name string) string AsResourceName returns a resource name with underscores to respect the kubernetes naming convention. It's the opposite of FixedResourceName. -## func [Confirm]() +## func [Confirm]() ```go func Confirm(question string, icon ...Icon) bool @@ -35,7 +35,7 @@ func Confirm(question string, icon ...Icon) bool Confirm asks a question and returns true if the answer is y. -## func [CountStartingSpaces]() +## func [CountStartingSpaces]() ```go func CountStartingSpaces(line string) int @@ -44,7 +44,7 @@ func CountStartingSpaces(line string) int CountStartingSpaces counts the number of spaces at the beginning of a string. -## func [EncodeBasicYaml]() +## func [EncodeBasicYaml]() ```go func EncodeBasicYaml(data any) ([]byte, error) @@ -53,7 +53,7 @@ func EncodeBasicYaml(data any) ([]byte, error) EncodeBasicYaml encodes a basic yaml from an interface. -## func [FixedResourceName]() +## func [FixedResourceName]() ```go func FixedResourceName(name string) string @@ -62,7 +62,7 @@ func FixedResourceName(name string) string FixedResourceName returns a resource name without underscores to respect the kubernetes naming convention. -## func [GetContainerByName]() +## func [GetContainerByName]() ```go func GetContainerByName(name string, containers []corev1.Container) (*corev1.Container, int) @@ -71,7 +71,7 @@ func GetContainerByName(name string, containers []corev1.Container) (*corev1.Con GetContainerByName returns a container by name and its index in the array. It returns nil, \-1 if not found. -## func [GetKind]() +## func [GetKind]() ```go func GetKind(path string) (kind string) @@ -80,7 +80,7 @@ func GetKind(path string) (kind string) GetKind returns the kind of the resource from the file path. -## func [GetServiceNameByPort]() +## func [GetServiceNameByPort]() ```go func GetServiceNameByPort(port int) string @@ -89,7 +89,7 @@ func GetServiceNameByPort(port int) string GetServiceNameByPort returns the service name for a port. It the service name is not found, it returns an empty string. -## func [GetValuesFromLabel]() +## func [GetValuesFromLabel]() ```go func GetValuesFromLabel(service types.ServiceConfig, LabelValues string) map[string]*EnvConfig @@ -98,7 +98,7 @@ func GetValuesFromLabel(service types.ServiceConfig, LabelValues string) map[str GetValuesFromLabel returns a map of values from a label. -## func [HashComposefiles]() +## func [HashComposefiles]() ```go func HashComposefiles(files []string) (string, error) @@ -107,7 +107,7 @@ func HashComposefiles(files []string) (string, error) HashComposefiles returns a hash of the compose files. -## func [Int32Ptr]() +## func [Int32Ptr]() ```go func Int32Ptr(i int32) *int32 @@ -116,7 +116,7 @@ func Int32Ptr(i int32) *int32 Int32Ptr returns a pointer to an int32. -## func [PathToName]() +## func [PathToName]() ```go func PathToName(path string) string @@ -125,7 +125,7 @@ func PathToName(path string) string PathToName converts a path to a kubernetes complient name. -## func [StrPtr]() +## func [StrPtr]() ```go func StrPtr(s string) *string @@ -134,7 +134,7 @@ func StrPtr(s string) *string StrPtr returns a pointer to a string. -## func [TplName]() +## func [TplName]() ```go func TplName(serviceName, appname string, suffix ...string) string @@ -143,7 +143,7 @@ func TplName(serviceName, appname string, suffix ...string) string TplName returns the name of the kubernetes resource as a template string. It is used in the templates and defined in \_helper.tpl file. -## func [TplValue]() +## func [TplValue]() ```go func TplValue(serviceName, variable string, pipes ...string) string @@ -152,7 +152,7 @@ func TplValue(serviceName, variable string, pipes ...string) string TplValue returns a string that can be used in a template to access a value from the values file. -## func [Warn]() +## func [Warn]() ```go func Warn(msg ...any) @@ -161,7 +161,7 @@ func Warn(msg ...any) Warn prints a warning message -## func [WordWrap]() +## func [WordWrap]() ```go func WordWrap(text string, lineWidth int) string @@ -170,7 +170,7 @@ func WordWrap(text string, lineWidth int) string WordWrap wraps a string to a given line width. Warning: it may break the string. You need to check the result. -## func [Wrap]() +## func [Wrap]() ```go func Wrap(src, above, below string) string @@ -179,7 +179,7 @@ func Wrap(src, above, below string) string Wrap wraps a string with a string above and below. It will respect the indentation of the src string. -## type [EnvConfig]() +## type [EnvConfig]() EnvConfig is a struct to hold the description of an environment variable. @@ -191,7 +191,7 @@ type EnvConfig struct { ``` -## type [Icon]() +## type [Icon]() Icon is a unicode icon diff --git a/doc/mkdocs.yml b/doc/mkdocs.yml index f81b11c..3cee2a4 100644 --- a/doc/mkdocs.yml +++ b/doc/mkdocs.yml @@ -52,7 +52,7 @@ extra: generator: false social: - icon: fontawesome/brands/github - link: https://github.com/katenary/katenary + link: https://repo.katenary.io/katenary/katenary nav: - "Home": index.md - usage.md diff --git a/go.mod b/go.mod index fe4c6e0..7f0c8c3 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/katenary/katenary +module repo.katenary.io/katenary/katenary go 1.25 diff --git a/internal/generator/chart.go b/internal/generator/chart.go index 39512a6..988560e 100644 --- a/internal/generator/chart.go +++ b/internal/generator/chart.go @@ -9,9 +9,9 @@ import ( "slices" "strings" - "github.com/katenary/katenary/internal/generator/labels" - "github.com/katenary/katenary/internal/generator/labels/labelstructs" - "github.com/katenary/katenary/internal/utils" + "repo.katenary.io/katenary/katenary/internal/generator/labels" + "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" + "repo.katenary.io/katenary/katenary/internal/utils" "github.com/compose-spec/compose-go/types" corev1 "k8s.io/api/core/v1" diff --git a/internal/generator/chart_test.go b/internal/generator/chart_test.go index 0b9b209..80eeaf4 100644 --- a/internal/generator/chart_test.go +++ b/internal/generator/chart_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/katenary/katenary/internal/generator/labels" + "repo.katenary.io/katenary/katenary/internal/generator/labels" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" diff --git a/internal/generator/configMap.go b/internal/generator/configMap.go index 804cdba..83a8f0c 100644 --- a/internal/generator/configMap.go +++ b/internal/generator/configMap.go @@ -2,9 +2,6 @@ package generator import ( "fmt" - "github.com/katenary/katenary/internal/generator/labels" - "github.com/katenary/katenary/internal/generator/labels/labelstructs" - "github.com/katenary/katenary/internal/utils" "log" "os" "path/filepath" @@ -12,6 +9,10 @@ import ( "strings" "unicode/utf8" + "repo.katenary.io/katenary/katenary/internal/generator/labels" + "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" + "repo.katenary.io/katenary/katenary/internal/utils" + "github.com/compose-spec/compose-go/types" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/generator/configMap_test.go b/internal/generator/configMap_test.go index 3efd83a..11c837c 100644 --- a/internal/generator/configMap_test.go +++ b/internal/generator/configMap_test.go @@ -3,11 +3,12 @@ package generator import ( "fmt" "io" - "github.com/katenary/katenary/internal/generator/labels" "os" "regexp" "testing" + "repo.katenary.io/katenary/katenary/internal/generator/labels" + "github.com/compose-spec/compose-go/types" v1 "k8s.io/api/core/v1" "sigs.k8s.io/yaml" diff --git a/internal/generator/converter.go b/internal/generator/converter.go index 274fc71..ea3b69c 100644 --- a/internal/generator/converter.go +++ b/internal/generator/converter.go @@ -12,12 +12,12 @@ import ( "strings" "time" - "github.com/katenary/katenary/internal/generator/extrafiles" - "github.com/katenary/katenary/internal/generator/katenaryfile" - "github.com/katenary/katenary/internal/generator/labels" - "github.com/katenary/katenary/internal/generator/labels/labelstructs" - "github.com/katenary/katenary/internal/parser" - "github.com/katenary/katenary/internal/utils" + "repo.katenary.io/katenary/katenary/internal/generator/extrafiles" + "repo.katenary.io/katenary/katenary/internal/generator/katenaryfile" + "repo.katenary.io/katenary/katenary/internal/generator/labels" + "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" + "repo.katenary.io/katenary/katenary/internal/parser" + "repo.katenary.io/katenary/katenary/internal/utils" "github.com/compose-spec/compose-go/types" ) diff --git a/internal/generator/cronJob.go b/internal/generator/cronJob.go index a762733..11aed11 100644 --- a/internal/generator/cronJob.go +++ b/internal/generator/cronJob.go @@ -1,12 +1,13 @@ package generator import ( - "github.com/katenary/katenary/internal/generator/labels" - "github.com/katenary/katenary/internal/generator/labels/labelstructs" - "github.com/katenary/katenary/internal/utils" "log" "strings" + "repo.katenary.io/katenary/katenary/internal/generator/labels" + "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" + "repo.katenary.io/katenary/katenary/internal/utils" + "github.com/compose-spec/compose-go/types" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" diff --git a/internal/generator/deployment.go b/internal/generator/deployment.go index 6cf03cb..ab0e9fc 100644 --- a/internal/generator/deployment.go +++ b/internal/generator/deployment.go @@ -2,9 +2,6 @@ package generator import ( "fmt" - "github.com/katenary/katenary/internal/generator/labels" - "github.com/katenary/katenary/internal/generator/labels/labelstructs" - "github.com/katenary/katenary/internal/utils" "log" "os" "path/filepath" @@ -12,6 +9,10 @@ import ( "strings" "time" + "repo.katenary.io/katenary/katenary/internal/generator/labels" + "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" + "repo.katenary.io/katenary/katenary/internal/utils" + "github.com/compose-spec/compose-go/types" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/internal/generator/deployment_test.go b/internal/generator/deployment_test.go index d16123f..23b22e7 100644 --- a/internal/generator/deployment_test.go +++ b/internal/generator/deployment_test.go @@ -2,11 +2,12 @@ package generator import ( "fmt" - "github.com/katenary/katenary/internal/generator/labels" "os" "strings" "testing" + "repo.katenary.io/katenary/katenary/internal/generator/labels" + yaml3 "gopkg.in/yaml.v3" v1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/internal/generator/generator.go b/internal/generator/generator.go index fdbd0d6..5197e1f 100644 --- a/internal/generator/generator.go +++ b/internal/generator/generator.go @@ -7,9 +7,9 @@ import ( "regexp" "strings" - "github.com/katenary/katenary/internal/generator/labels" - "github.com/katenary/katenary/internal/generator/labels/labelstructs" - "github.com/katenary/katenary/internal/utils" + "repo.katenary.io/katenary/katenary/internal/generator/labels" + "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" + "repo.katenary.io/katenary/katenary/internal/utils" "github.com/compose-spec/compose-go/types" corev1 "k8s.io/api/core/v1" diff --git a/internal/generator/globals.go b/internal/generator/globals.go index 5751682..08822bb 100644 --- a/internal/generator/globals.go +++ b/internal/generator/globals.go @@ -3,7 +3,7 @@ package generator import ( "regexp" - "github.com/katenary/katenary/internal/generator/labels" + "repo.katenary.io/katenary/katenary/internal/generator/labels" ) var ( diff --git a/internal/generator/helper.go b/internal/generator/helper.go index 5c43bce..4effcda 100644 --- a/internal/generator/helper.go +++ b/internal/generator/helper.go @@ -2,8 +2,9 @@ package generator import ( _ "embed" - "github.com/katenary/katenary/internal/generator/labels" "strings" + + "repo.katenary.io/katenary/katenary/internal/generator/labels" ) // helmHelper is a template for the _helpers.tpl file in the chart templates directory. diff --git a/internal/generator/ingress.go b/internal/generator/ingress.go index 0831fa1..07ada79 100644 --- a/internal/generator/ingress.go +++ b/internal/generator/ingress.go @@ -4,9 +4,9 @@ import ( "log" "strings" - "github.com/katenary/katenary/internal/generator/labels" - "github.com/katenary/katenary/internal/generator/labels/labelstructs" - "github.com/katenary/katenary/internal/utils" + "repo.katenary.io/katenary/katenary/internal/generator/labels" + "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" + "repo.katenary.io/katenary/katenary/internal/utils" "github.com/compose-spec/compose-go/types" networkv1 "k8s.io/api/networking/v1" diff --git a/internal/generator/ingress_test.go b/internal/generator/ingress_test.go index be4a341..751a5df 100644 --- a/internal/generator/ingress_test.go +++ b/internal/generator/ingress_test.go @@ -2,10 +2,11 @@ package generator import ( "fmt" - "github.com/katenary/katenary/internal/generator/labels" "os" "testing" + "repo.katenary.io/katenary/katenary/internal/generator/labels" + v1 "k8s.io/api/networking/v1" "sigs.k8s.io/yaml" ) diff --git a/internal/generator/katenaryfile/main.go b/internal/generator/katenaryfile/main.go index 909d681..56a16eb 100644 --- a/internal/generator/katenaryfile/main.go +++ b/internal/generator/katenaryfile/main.go @@ -4,14 +4,15 @@ import ( "bytes" "encoding/json" "fmt" - "github.com/katenary/katenary/internal/generator/labels" - "github.com/katenary/katenary/internal/generator/labels/labelstructs" - "github.com/katenary/katenary/internal/utils" "log" "os" "reflect" "strings" + "repo.katenary.io/katenary/katenary/internal/generator/labels" + "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" + "repo.katenary.io/katenary/katenary/internal/utils" + "github.com/compose-spec/compose-go/types" "github.com/invopop/jsonschema" "gopkg.in/yaml.v3" diff --git a/internal/generator/katenaryfile/main_test.go b/internal/generator/katenaryfile/main_test.go index d84e283..bf7397f 100644 --- a/internal/generator/katenaryfile/main_test.go +++ b/internal/generator/katenaryfile/main_test.go @@ -1,12 +1,13 @@ package katenaryfile import ( - "github.com/katenary/katenary/internal/generator/labels" "log" "os" "path/filepath" "testing" + "repo.katenary.io/katenary/katenary/internal/generator/labels" + "github.com/compose-spec/compose-go/cli" ) diff --git a/internal/generator/labels.go b/internal/generator/labels.go index 7a83595..1589100 100644 --- a/internal/generator/labels.go +++ b/internal/generator/labels.go @@ -2,7 +2,8 @@ package generator import ( "fmt" - "github.com/katenary/katenary/internal/generator/labels" + + "repo.katenary.io/katenary/katenary/internal/generator/labels" ) var componentLabel = labels.LabelName("component") diff --git a/internal/generator/labels/katenaryLabels.go b/internal/generator/labels/katenaryLabels.go index 32b66ce..8834afb 100644 --- a/internal/generator/labels/katenaryLabels.go +++ b/internal/generator/labels/katenaryLabels.go @@ -4,7 +4,6 @@ import ( "bytes" _ "embed" "fmt" - "github.com/katenary/katenary/internal/utils" "log" "regexp" "sort" @@ -12,6 +11,8 @@ import ( "text/tabwriter" "text/template" + "repo.katenary.io/katenary/katenary/internal/utils" + "sigs.k8s.io/yaml" ) diff --git a/internal/generator/labels/labelstructs/configMap_test.go b/internal/generator/labels/labelstructs/configMap_test.go index 22efabe..1e2bb3f 100644 --- a/internal/generator/labels/labelstructs/configMap_test.go +++ b/internal/generator/labels/labelstructs/configMap_test.go @@ -1,8 +1,9 @@ package labelstructs_test import ( - "github.com/katenary/katenary/internal/generator/labels/labelstructs" "testing" + + "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" ) func TestConfigMapFileFrom(t *testing.T) { diff --git a/internal/generator/labels/labelstructs/ingress.go b/internal/generator/labels/labelstructs/ingress.go index 30ba0fa..a9f3e02 100644 --- a/internal/generator/labels/labelstructs/ingress.go +++ b/internal/generator/labels/labelstructs/ingress.go @@ -2,7 +2,8 @@ package labelstructs import ( "fmt" - "github.com/katenary/katenary/internal/utils" + + "repo.katenary.io/katenary/katenary/internal/utils" "gopkg.in/yaml.v3" ) diff --git a/internal/generator/rbac.go b/internal/generator/rbac.go index 1dbd52f..73d75e7 100644 --- a/internal/generator/rbac.go +++ b/internal/generator/rbac.go @@ -1,7 +1,7 @@ package generator import ( - "github.com/katenary/katenary/internal/utils" + "repo.katenary.io/katenary/katenary/internal/utils" "github.com/compose-spec/compose-go/types" corev1 "k8s.io/api/core/v1" diff --git a/internal/generator/secret.go b/internal/generator/secret.go index 588a3ea..f7ba22d 100644 --- a/internal/generator/secret.go +++ b/internal/generator/secret.go @@ -2,10 +2,11 @@ package generator import ( "encoding/base64" - "github.com/katenary/katenary/internal/generator/labels" - "github.com/katenary/katenary/internal/utils" "strings" + "repo.katenary.io/katenary/katenary/internal/generator/labels" + "repo.katenary.io/katenary/katenary/internal/utils" + "github.com/compose-spec/compose-go/types" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/generator/secret_test.go b/internal/generator/secret_test.go index 3a43cdf..dbaf8c6 100644 --- a/internal/generator/secret_test.go +++ b/internal/generator/secret_test.go @@ -3,10 +3,11 @@ package generator import ( "bytes" "fmt" - "github.com/katenary/katenary/internal/generator/labels" "os" "testing" + "repo.katenary.io/katenary/katenary/internal/generator/labels" + v1 "k8s.io/api/core/v1" "sigs.k8s.io/yaml" ) diff --git a/internal/generator/service.go b/internal/generator/service.go index 9290006..866d3dc 100644 --- a/internal/generator/service.go +++ b/internal/generator/service.go @@ -2,10 +2,11 @@ package generator import ( "fmt" - "github.com/katenary/katenary/internal/utils" "regexp" "strings" + "repo.katenary.io/katenary/katenary/internal/utils" + "github.com/compose-spec/compose-go/types" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/generator/tools_test.go b/internal/generator/tools_test.go index 232ef84..13e292b 100644 --- a/internal/generator/tools_test.go +++ b/internal/generator/tools_test.go @@ -6,7 +6,7 @@ import ( "os/exec" "testing" - "github.com/katenary/katenary/internal/parser" + "repo.katenary.io/katenary/katenary/internal/parser" ) const unmarshalError = "Failed to unmarshal the output: %s" diff --git a/internal/generator/utils.go b/internal/generator/utils.go index 73198d1..39a55ed 100644 --- a/internal/generator/utils.go +++ b/internal/generator/utils.go @@ -5,9 +5,9 @@ import ( "strconv" "strings" - "github.com/katenary/katenary/internal/generator/labels" - "github.com/katenary/katenary/internal/generator/labels/labelstructs" - "github.com/katenary/katenary/internal/utils" + "repo.katenary.io/katenary/katenary/internal/generator/labels" + "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" + "repo.katenary.io/katenary/katenary/internal/utils" "github.com/compose-spec/compose-go/types" corev1 "k8s.io/api/core/v1" diff --git a/internal/generator/utils_test.go b/internal/generator/utils_test.go index 97399b6..d3937dc 100644 --- a/internal/generator/utils_test.go +++ b/internal/generator/utils_test.go @@ -2,12 +2,13 @@ package generator import ( "fmt" - "github.com/katenary/katenary/internal/generator/labels" - "github.com/katenary/katenary/internal/utils" "os" "path/filepath" "testing" + "repo.katenary.io/katenary/katenary/internal/generator/labels" + "repo.katenary.io/katenary/katenary/internal/utils" + "github.com/compose-spec/compose-go/cli" ) diff --git a/internal/generator/volume.go b/internal/generator/volume.go index 3585a4e..d9e53e6 100644 --- a/internal/generator/volume.go +++ b/internal/generator/volume.go @@ -1,9 +1,10 @@ package generator import ( - "github.com/katenary/katenary/internal/utils" "strings" + "repo.katenary.io/katenary/katenary/internal/utils" + "github.com/compose-spec/compose-go/types" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/internal/generator/volume_test.go b/internal/generator/volume_test.go index cc63a0d..d42ed5d 100644 --- a/internal/generator/volume_test.go +++ b/internal/generator/volume_test.go @@ -5,13 +5,14 @@ import ( "image" "image/color" "image/png" - "github.com/katenary/katenary/internal/generator/labels" - "github.com/katenary/katenary/internal/utils" "log" "os" "path/filepath" "testing" + "repo.katenary.io/katenary/katenary/internal/generator/labels" + "repo.katenary.io/katenary/katenary/internal/utils" + v1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/yaml" diff --git a/makefiles/build.mk b/makefiles/build.mk index 12c9c26..4aac20f 100644 --- a/makefiles/build.mk +++ b/makefiles/build.mk @@ -1,5 +1,5 @@ ## BUILD -GO_BUILD=go build -ldflags="-X 'github.com/katenary/katenary/internal/generator.Version=$(VERSION)'" -trimpath -o $(OUTPUT) ./cmd/katenary +GO_BUILD=go build -ldflags="-X 'repo.katenary.io/katenary/katenary/internal/generator.Version=$(VERSION)'" -trimpath -o $(OUTPUT) ./cmd/katenary # Simply build the binary for the current OS and architecture build: pull katenary diff --git a/makefiles/packager.mk b/makefiles/packager.mk index 9079456..155e6f6 100644 --- a/makefiles/packager.mk +++ b/makefiles/packager.mk @@ -3,7 +3,7 @@ DESCRIPTION := $(shell cat oci/description | sed ':a;N;$$!ba;s/\n/\\n/g') FPM_OPTS=--name katenary \ - --url https://katenary.org \ + --url https://katenary.io \ --vendor "Katenary Project" \ --maintainer "Patrice Ferlet " \ --license "MIT" \ diff --git a/oci/katenary/Containerfile b/oci/katenary/Containerfile index 9837c7b..56fc3da 100644 --- a/oci/katenary/Containerfile +++ b/oci/katenary/Containerfile @@ -7,20 +7,20 @@ RUN \ echo "You must set VERSION build argument"; \ exit 1; \ fi -COPY go.mod go.sum /go/src/github.com/katenary/katenary/ -COPY cmd /go/src/github.com/katenary/katenary/cmd -COPY internal /go/src/github.com/katenary/katenary/internal -WORKDIR /go/src/github.com/katenary/katenary +COPY go.mod go.sum /go/src/repo.katenary.io/katenary/katenary/ +COPY cmd /go/src/repo.katenary.io/katenary/katenary/cmd +COPY internal /go/src/repo.katenary.io/katenary/katenary/internal +WORKDIR /go/src/repo.katenary.io/katenary/katenary ENV CGO_ENABLED=0 RUN set -xe; \ - go build -ldflags="-X 'github.com/katenary/katenary/internal/generator.Version=v${VERSION}'" -trimpath -o katenary ./cmd/katenary + go build -ldflags="-X 'repo.katenary.io/katenary/katenary/internal/generator.Version=v${VERSION}'" -trimpath -o katenary ./cmd/katenary FROM scratch -LABEL org.opencontainers.image.source=https://github.com/katenary/katenary +LABEL org.opencontainers.image.source=https://repo.katenary.io/katenary/katenary LABEL org.opencontainers.image.description="Katenary converts compose files to Helm Chart" LABEL org.opencontainers.image.licenses=MIT -COPY --from=builder /go/src/github.com/katenary/katenary/katenary /katenary +COPY --from=builder /go/src/repo.katenary.io/katenary/katenary/katenary /katenary VOLUME /project WORKDIR /project ENTRYPOINT ["/katenary"] From ef1ff2737f4da11f031104fd14923ae8033f8447 Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Tue, 19 Aug 2025 23:36:48 +0200 Subject: [PATCH 2/4] feat(repo): Change references to katenary repository --- doc/docs/index.md | 8 ++++---- doc/mkdocs.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/docs/index.md b/doc/docs/index.md index f1b4d3a..72c56ff 100644 --- a/doc/docs/index.md +++ b/doc/docs/index.md @@ -39,10 +39,10 @@ share it with the community. ![](./statics/klee.svg) -The main developer is [Patrice FERLET](https://github.com/metal3d). +The main developer is [Patrice FERLET](https://repo.katenary.io/metal3d). The project source -code is hosted on the [:fontawesome-brands-github: Katenary GitHub Repository](https://github.com/Katenary/katenary). +code is hosted on the [:fontawesome-brands-git: Katenary Repository](https://repo.katenary.io/Katenary/katenary). ## Install Katenary @@ -57,7 +57,7 @@ If you are a Linux user, you can use the "one line installation command" which w `$HOME/.local/bin` directory if it exists. ```bash -sh <(curl -sSL https://raw.githubusercontent.com/Katenary/katenary/master/install.sh) +sh <(curl -sSL https://repo.katenary.io/Katenary/katenary/raw/branch/master/install.sh) ``` !!! Info "Upgrading is integrated to the `katenary` command" @@ -77,7 +77,7 @@ You can also build and install it yourself, the provided Makefile has got a `bui To compile it, you can use the following commands: ```bash -git clone https://github.com/Katenary/katenary.git +git clone https://repo.katenary.io/Katenary/katenary.git cd katenary make build make install diff --git a/doc/mkdocs.yml b/doc/mkdocs.yml index 3cee2a4..9e8a66c 100644 --- a/doc/mkdocs.yml +++ b/doc/mkdocs.yml @@ -51,7 +51,7 @@ copyright: Copyright © 2021 - 2024 - Katenary authors extra: generator: false social: - - icon: fontawesome/brands/github + - icon: fontawesome/brands/git link: https://repo.katenary.io/katenary/katenary nav: - "Home": index.md From 8e54d611ebd4c2b70eafdba537849adc8f7918f9 Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Tue, 19 Aug 2025 23:58:26 +0200 Subject: [PATCH 3/4] feat(doc): Remove other github references --- README.md | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 60f6d0b..79809b8 100644 --- a/README.md +++ b/README.md @@ -33,22 +33,27 @@ Today, it's partially developed in collaboration with [Klee Group](https://www.k and **will stay an open source and free (as freedom) project**. We are convinced that the best way to make it better is to share it with the community. -The main developer is [Patrice FERLET](https://github.com/metal3d). +The main developer is [Patrice FERLET](https://repo.katenary.io/metal3d). ## Install -You can download the binaries from the [Release](https://github.com/Katenary/katenary/releases) section. Copy the binary +You can download the binaries from the [Release](https://repo.katenary.io/Katenary/katenary/releases) section. Copy the binary and rename it to `katenary`. Place the binary inside your `PATH`. You should now be able to call the `katenary` command. -You can of course get the binary with `go install -u github.com/Katenary/katenary/cmd/katenary/...` but the `main` branch -is continuously updated. It's preferable to use releases. - -You can use this commands on Linux: +On Linux, you can use the `install.sh` from the repository to install it in your `$HOME/.local/bin` directory: ```bash sh <(curl -sSL https://repo.katenary.io/Katenary/katenary/raw/branch/master/install.sh) ``` +All OS, if you've installed Go on your computer, you can install using: + +```bash +go install -u katenary.io/cmd@latest +# or use a release +go install -u katenary.io/cmd@v3.0.0 +``` + ## Or, build yourself If you've got `podman` or `docker`, you can build `katenary` by using: @@ -252,7 +257,7 @@ web: To validate the `katenary.yaml` file, you can use the JSON schema using the "master" raw content: -`https://raw.githubusercontent.com/Katenary/katenary/refs/heads/master/katenary.json` +`https://repo.katenary.io/Katenary/katenary/raw/branch/master/katenary.json` It's easy to configure in [LazyVim](https://www.lazyvim.org/), using `nvim-lspconfig`, create a Lua file in your `plugins` directory, or apply the settings as the example below: From 95609a3092e26db235a02864d01ccbf54b37d01f Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Tue, 19 Aug 2025 23:58:51 +0200 Subject: [PATCH 4/4] feat(repo): use the katenary.io URL --- cmd/katenary/main.go | 8 ++++---- go.mod | 2 +- internal/generator/chart.go | 6 +++--- internal/generator/chart_test.go | 2 +- internal/generator/configMap.go | 6 +++--- internal/generator/configMap_test.go | 2 +- internal/generator/converter.go | 12 ++++++------ internal/generator/cronJob.go | 6 +++--- internal/generator/deployment.go | 6 +++--- internal/generator/deployment_test.go | 2 +- internal/generator/generator.go | 6 +++--- internal/generator/globals.go | 2 +- internal/generator/helper.go | 2 +- internal/generator/ingress.go | 6 +++--- internal/generator/ingress_test.go | 2 +- internal/generator/katenaryfile/main.go | 6 +++--- internal/generator/katenaryfile/main_test.go | 2 +- internal/generator/labels.go | 2 +- internal/generator/labels/katenaryLabels.go | 2 +- .../generator/labels/labelstructs/configMap_test.go | 2 +- internal/generator/labels/labelstructs/ingress.go | 2 +- internal/generator/rbac.go | 2 +- internal/generator/secret.go | 4 ++-- internal/generator/secret_test.go | 2 +- internal/generator/service.go | 2 +- internal/generator/tools_test.go | 2 +- internal/generator/utils.go | 6 +++--- internal/generator/utils_test.go | 4 ++-- internal/generator/volume.go | 2 +- internal/generator/volume_test.go | 4 ++-- 30 files changed, 57 insertions(+), 57 deletions(-) diff --git a/cmd/katenary/main.go b/cmd/katenary/main.go index 375ab8a..79d6861 100644 --- a/cmd/katenary/main.go +++ b/cmd/katenary/main.go @@ -10,10 +10,10 @@ import ( "os" "strings" - "repo.katenary.io/katenary/katenary/internal/generator" - "repo.katenary.io/katenary/katenary/internal/generator/katenaryfile" - "repo.katenary.io/katenary/katenary/internal/generator/labels" - "repo.katenary.io/katenary/katenary/internal/utils" + "katenary.io/internal/generator" + "katenary.io/internal/generator/katenaryfile" + "katenary.io/internal/generator/labels" + "katenary.io/internal/utils" "github.com/compose-spec/compose-go/cli" "github.com/spf13/cobra" diff --git a/go.mod b/go.mod index 7f0c8c3..74bf7b1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module repo.katenary.io/katenary/katenary +module katenary.io go 1.25 diff --git a/internal/generator/chart.go b/internal/generator/chart.go index 988560e..804c165 100644 --- a/internal/generator/chart.go +++ b/internal/generator/chart.go @@ -9,9 +9,9 @@ import ( "slices" "strings" - "repo.katenary.io/katenary/katenary/internal/generator/labels" - "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" - "repo.katenary.io/katenary/katenary/internal/utils" + "katenary.io/internal/generator/labels" + "katenary.io/internal/generator/labels/labelstructs" + "katenary.io/internal/utils" "github.com/compose-spec/compose-go/types" corev1 "k8s.io/api/core/v1" diff --git a/internal/generator/chart_test.go b/internal/generator/chart_test.go index 80eeaf4..e8cd7af 100644 --- a/internal/generator/chart_test.go +++ b/internal/generator/chart_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "repo.katenary.io/katenary/katenary/internal/generator/labels" + "katenary.io/internal/generator/labels" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" diff --git a/internal/generator/configMap.go b/internal/generator/configMap.go index 83a8f0c..ca7438b 100644 --- a/internal/generator/configMap.go +++ b/internal/generator/configMap.go @@ -9,9 +9,9 @@ import ( "strings" "unicode/utf8" - "repo.katenary.io/katenary/katenary/internal/generator/labels" - "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" - "repo.katenary.io/katenary/katenary/internal/utils" + "katenary.io/internal/generator/labels" + "katenary.io/internal/generator/labels/labelstructs" + "katenary.io/internal/utils" "github.com/compose-spec/compose-go/types" corev1 "k8s.io/api/core/v1" diff --git a/internal/generator/configMap_test.go b/internal/generator/configMap_test.go index 11c837c..48e3ae0 100644 --- a/internal/generator/configMap_test.go +++ b/internal/generator/configMap_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "repo.katenary.io/katenary/katenary/internal/generator/labels" + "katenary.io/internal/generator/labels" "github.com/compose-spec/compose-go/types" v1 "k8s.io/api/core/v1" diff --git a/internal/generator/converter.go b/internal/generator/converter.go index ea3b69c..c0243e1 100644 --- a/internal/generator/converter.go +++ b/internal/generator/converter.go @@ -12,12 +12,12 @@ import ( "strings" "time" - "repo.katenary.io/katenary/katenary/internal/generator/extrafiles" - "repo.katenary.io/katenary/katenary/internal/generator/katenaryfile" - "repo.katenary.io/katenary/katenary/internal/generator/labels" - "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" - "repo.katenary.io/katenary/katenary/internal/parser" - "repo.katenary.io/katenary/katenary/internal/utils" + "katenary.io/internal/generator/extrafiles" + "katenary.io/internal/generator/katenaryfile" + "katenary.io/internal/generator/labels" + "katenary.io/internal/generator/labels/labelstructs" + "katenary.io/internal/parser" + "katenary.io/internal/utils" "github.com/compose-spec/compose-go/types" ) diff --git a/internal/generator/cronJob.go b/internal/generator/cronJob.go index 11aed11..e5fbee4 100644 --- a/internal/generator/cronJob.go +++ b/internal/generator/cronJob.go @@ -4,9 +4,9 @@ import ( "log" "strings" - "repo.katenary.io/katenary/katenary/internal/generator/labels" - "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" - "repo.katenary.io/katenary/katenary/internal/utils" + "katenary.io/internal/generator/labels" + "katenary.io/internal/generator/labels/labelstructs" + "katenary.io/internal/utils" "github.com/compose-spec/compose-go/types" batchv1 "k8s.io/api/batch/v1" diff --git a/internal/generator/deployment.go b/internal/generator/deployment.go index ab0e9fc..e18bdb2 100644 --- a/internal/generator/deployment.go +++ b/internal/generator/deployment.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "repo.katenary.io/katenary/katenary/internal/generator/labels" - "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" - "repo.katenary.io/katenary/katenary/internal/utils" + "katenary.io/internal/generator/labels" + "katenary.io/internal/generator/labels/labelstructs" + "katenary.io/internal/utils" "github.com/compose-spec/compose-go/types" appsv1 "k8s.io/api/apps/v1" diff --git a/internal/generator/deployment_test.go b/internal/generator/deployment_test.go index 23b22e7..a802391 100644 --- a/internal/generator/deployment_test.go +++ b/internal/generator/deployment_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "repo.katenary.io/katenary/katenary/internal/generator/labels" + "katenary.io/internal/generator/labels" yaml3 "gopkg.in/yaml.v3" v1 "k8s.io/api/apps/v1" diff --git a/internal/generator/generator.go b/internal/generator/generator.go index 5197e1f..7fa5b9e 100644 --- a/internal/generator/generator.go +++ b/internal/generator/generator.go @@ -7,9 +7,9 @@ import ( "regexp" "strings" - "repo.katenary.io/katenary/katenary/internal/generator/labels" - "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" - "repo.katenary.io/katenary/katenary/internal/utils" + "katenary.io/internal/generator/labels" + "katenary.io/internal/generator/labels/labelstructs" + "katenary.io/internal/utils" "github.com/compose-spec/compose-go/types" corev1 "k8s.io/api/core/v1" diff --git a/internal/generator/globals.go b/internal/generator/globals.go index 08822bb..e76831b 100644 --- a/internal/generator/globals.go +++ b/internal/generator/globals.go @@ -3,7 +3,7 @@ package generator import ( "regexp" - "repo.katenary.io/katenary/katenary/internal/generator/labels" + "katenary.io/internal/generator/labels" ) var ( diff --git a/internal/generator/helper.go b/internal/generator/helper.go index 4effcda..fbde8c5 100644 --- a/internal/generator/helper.go +++ b/internal/generator/helper.go @@ -4,7 +4,7 @@ import ( _ "embed" "strings" - "repo.katenary.io/katenary/katenary/internal/generator/labels" + "katenary.io/internal/generator/labels" ) // helmHelper is a template for the _helpers.tpl file in the chart templates directory. diff --git a/internal/generator/ingress.go b/internal/generator/ingress.go index 07ada79..2ae2c54 100644 --- a/internal/generator/ingress.go +++ b/internal/generator/ingress.go @@ -4,9 +4,9 @@ import ( "log" "strings" - "repo.katenary.io/katenary/katenary/internal/generator/labels" - "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" - "repo.katenary.io/katenary/katenary/internal/utils" + "katenary.io/internal/generator/labels" + "katenary.io/internal/generator/labels/labelstructs" + "katenary.io/internal/utils" "github.com/compose-spec/compose-go/types" networkv1 "k8s.io/api/networking/v1" diff --git a/internal/generator/ingress_test.go b/internal/generator/ingress_test.go index 751a5df..122a71c 100644 --- a/internal/generator/ingress_test.go +++ b/internal/generator/ingress_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "repo.katenary.io/katenary/katenary/internal/generator/labels" + "katenary.io/internal/generator/labels" v1 "k8s.io/api/networking/v1" "sigs.k8s.io/yaml" diff --git a/internal/generator/katenaryfile/main.go b/internal/generator/katenaryfile/main.go index 56a16eb..de120c3 100644 --- a/internal/generator/katenaryfile/main.go +++ b/internal/generator/katenaryfile/main.go @@ -9,9 +9,9 @@ import ( "reflect" "strings" - "repo.katenary.io/katenary/katenary/internal/generator/labels" - "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" - "repo.katenary.io/katenary/katenary/internal/utils" + "katenary.io/internal/generator/labels" + "katenary.io/internal/generator/labels/labelstructs" + "katenary.io/internal/utils" "github.com/compose-spec/compose-go/types" "github.com/invopop/jsonschema" diff --git a/internal/generator/katenaryfile/main_test.go b/internal/generator/katenaryfile/main_test.go index bf7397f..7df48a5 100644 --- a/internal/generator/katenaryfile/main_test.go +++ b/internal/generator/katenaryfile/main_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "repo.katenary.io/katenary/katenary/internal/generator/labels" + "katenary.io/internal/generator/labels" "github.com/compose-spec/compose-go/cli" ) diff --git a/internal/generator/labels.go b/internal/generator/labels.go index 1589100..275c5b7 100644 --- a/internal/generator/labels.go +++ b/internal/generator/labels.go @@ -3,7 +3,7 @@ package generator import ( "fmt" - "repo.katenary.io/katenary/katenary/internal/generator/labels" + "katenary.io/internal/generator/labels" ) var componentLabel = labels.LabelName("component") diff --git a/internal/generator/labels/katenaryLabels.go b/internal/generator/labels/katenaryLabels.go index 8834afb..ac8dc30 100644 --- a/internal/generator/labels/katenaryLabels.go +++ b/internal/generator/labels/katenaryLabels.go @@ -11,7 +11,7 @@ import ( "text/tabwriter" "text/template" - "repo.katenary.io/katenary/katenary/internal/utils" + "katenary.io/internal/utils" "sigs.k8s.io/yaml" ) diff --git a/internal/generator/labels/labelstructs/configMap_test.go b/internal/generator/labels/labelstructs/configMap_test.go index 1e2bb3f..264d9ba 100644 --- a/internal/generator/labels/labelstructs/configMap_test.go +++ b/internal/generator/labels/labelstructs/configMap_test.go @@ -3,7 +3,7 @@ package labelstructs_test import ( "testing" - "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" + "katenary.io/internal/generator/labels/labelstructs" ) func TestConfigMapFileFrom(t *testing.T) { diff --git a/internal/generator/labels/labelstructs/ingress.go b/internal/generator/labels/labelstructs/ingress.go index a9f3e02..93ddc61 100644 --- a/internal/generator/labels/labelstructs/ingress.go +++ b/internal/generator/labels/labelstructs/ingress.go @@ -3,7 +3,7 @@ package labelstructs import ( "fmt" - "repo.katenary.io/katenary/katenary/internal/utils" + "katenary.io/internal/utils" "gopkg.in/yaml.v3" ) diff --git a/internal/generator/rbac.go b/internal/generator/rbac.go index 73d75e7..5f02a34 100644 --- a/internal/generator/rbac.go +++ b/internal/generator/rbac.go @@ -1,7 +1,7 @@ package generator import ( - "repo.katenary.io/katenary/katenary/internal/utils" + "katenary.io/internal/utils" "github.com/compose-spec/compose-go/types" corev1 "k8s.io/api/core/v1" diff --git a/internal/generator/secret.go b/internal/generator/secret.go index f7ba22d..dda895e 100644 --- a/internal/generator/secret.go +++ b/internal/generator/secret.go @@ -4,8 +4,8 @@ import ( "encoding/base64" "strings" - "repo.katenary.io/katenary/katenary/internal/generator/labels" - "repo.katenary.io/katenary/katenary/internal/utils" + "katenary.io/internal/generator/labels" + "katenary.io/internal/utils" "github.com/compose-spec/compose-go/types" corev1 "k8s.io/api/core/v1" diff --git a/internal/generator/secret_test.go b/internal/generator/secret_test.go index dbaf8c6..171a0c6 100644 --- a/internal/generator/secret_test.go +++ b/internal/generator/secret_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "repo.katenary.io/katenary/katenary/internal/generator/labels" + "katenary.io/internal/generator/labels" v1 "k8s.io/api/core/v1" "sigs.k8s.io/yaml" diff --git a/internal/generator/service.go b/internal/generator/service.go index 866d3dc..a9dc13e 100644 --- a/internal/generator/service.go +++ b/internal/generator/service.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "repo.katenary.io/katenary/katenary/internal/utils" + "katenary.io/internal/utils" "github.com/compose-spec/compose-go/types" v1 "k8s.io/api/core/v1" diff --git a/internal/generator/tools_test.go b/internal/generator/tools_test.go index 13e292b..fa22caa 100644 --- a/internal/generator/tools_test.go +++ b/internal/generator/tools_test.go @@ -6,7 +6,7 @@ import ( "os/exec" "testing" - "repo.katenary.io/katenary/katenary/internal/parser" + "katenary.io/internal/parser" ) const unmarshalError = "Failed to unmarshal the output: %s" diff --git a/internal/generator/utils.go b/internal/generator/utils.go index 39a55ed..940bf7c 100644 --- a/internal/generator/utils.go +++ b/internal/generator/utils.go @@ -5,9 +5,9 @@ import ( "strconv" "strings" - "repo.katenary.io/katenary/katenary/internal/generator/labels" - "repo.katenary.io/katenary/katenary/internal/generator/labels/labelstructs" - "repo.katenary.io/katenary/katenary/internal/utils" + "katenary.io/internal/generator/labels" + "katenary.io/internal/generator/labels/labelstructs" + "katenary.io/internal/utils" "github.com/compose-spec/compose-go/types" corev1 "k8s.io/api/core/v1" diff --git a/internal/generator/utils_test.go b/internal/generator/utils_test.go index d3937dc..98d59d4 100644 --- a/internal/generator/utils_test.go +++ b/internal/generator/utils_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "repo.katenary.io/katenary/katenary/internal/generator/labels" - "repo.katenary.io/katenary/katenary/internal/utils" + "katenary.io/internal/generator/labels" + "katenary.io/internal/utils" "github.com/compose-spec/compose-go/cli" ) diff --git a/internal/generator/volume.go b/internal/generator/volume.go index d9e53e6..fd06db1 100644 --- a/internal/generator/volume.go +++ b/internal/generator/volume.go @@ -3,7 +3,7 @@ package generator import ( "strings" - "repo.katenary.io/katenary/katenary/internal/utils" + "katenary.io/internal/utils" "github.com/compose-spec/compose-go/types" v1 "k8s.io/api/core/v1" diff --git a/internal/generator/volume_test.go b/internal/generator/volume_test.go index d42ed5d..8357504 100644 --- a/internal/generator/volume_test.go +++ b/internal/generator/volume_test.go @@ -10,8 +10,8 @@ import ( "path/filepath" "testing" - "repo.katenary.io/katenary/katenary/internal/generator/labels" - "repo.katenary.io/katenary/katenary/internal/utils" + "katenary.io/internal/generator/labels" + "katenary.io/internal/utils" v1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1"