use fork of upload artifact

* feat(oci): Build using pure Buildah

.github/dependabot.yml

@@ -9,3 +9,4 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+    target-branch: develop

.github/workflows/build-oci.yaml

@@ -0,0 +1,43 @@
+name: Build and push OCI image
+
+on:
+  push:
+    tags:
+      - "**"
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+  VERSION: ${{ github.ref_name }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install Buildah
+        run: |-
+          if ! comamnd -v buildah 2>/dev/null; then
+            echo "Install Buildah"
+            sudo apt-get update
+            sudo apt-get install -y buildah
+          else
+            echo "Buildah already installed"
+          fi
+
+      - name: Build and tag
+        run: |-
+          buildah build --build-arg VERSION=$VERSION -t katenary -f ./oci/katenary/Containerfile .
+          buildah tag katenary $REGISTRY/${IMAGE_NAME,,}:$VERSION
+          buildah tag katenary $REGISTRY/${IMAGE_NAME,,}:latest
+
+      - name: Push image
+        run: |-
+          buildah login $REGISTRY -u ${{ github.actor }} -p ${{ secrets.GITHUB_TOKEN }}
+          buildah push $REGISTRY/${IMAGE_NAME,,}:$VERSION
+          buildah push $REGISTRY/${IMAGE_NAME,,}:latest

.github/workflows/go-test.yaml

@@ -1,32 +1,52 @@
 name: Go-Tests
 
 on:
-  pull_request:
-    branches:
-      - develop
   push:
     branches:
-      - master
-      - develop
+      - "**"
 jobs:
-  test:
+  tests:
+    permissions:
+      contents: read
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23
-      - name: Install Helm
+          go-version: 1.25
+      - name: Install helm
         run: |
-          curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3
-          chmod 700 get_helm.sh
-          ./get_helm.sh
+          command -v helm || curl -sSL https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
+
+      - name: Tidy
+        run: |
+          export GOPROXY='https://proxy.golang.org,direct'
+          go mod tidy
       - name: Launch Test
         run: |
-          go vet ./... && go test -coverprofile=coverprofile.out -json -v ./... > gotest.json
-      - name: SonarCloud Scan
-        uses: SonarSource/sonarcloud-github-action@master
+          go vet ./...
+          go test -coverprofile=coverprofile.out -json -v ./... > gotest.json
+      # - uses: actions/upload-artifact@v4
+      - uses: christopherhx/gitea-upload-artifact@v4
+        with:
+          name: tests-results
+          path: |
+            coverprofile.out
+            gotest.json
+  sonar:
+    permissions:
+      contents: read
+      pull-requests: read
+    runs-on: ubuntu-latest
+    needs: tests
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
+        with:
+          name: tests-results
+      - name: SonarQube Scan
+        uses: SonarSource/sonarqube-scan-action@v5.2.0
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_HOST_URL: ${{ vars.SONAR_HOST_URL }}

.gitignore

@@ -13,8 +13,21 @@ cover*
 .config/
 */venv
 
-# local binary
-./katenary
 
 # will be treated later
 /examples/*
+
+# nsis
+nsis/*.dll
+nsis/*.exe
+
+doc/share
+__pycache__
+
+.rpmmacros
+*.gpg
+
+# local binaries
+katenary
+!cmd/katenary
+!oci/katenary

.golangci.yml

@@ -0,0 +1,26 @@
+version: "2"
+run:
+  issues-exit-code: 1
+linters:
+  enabled:
+  - unused
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+      - "(.+)_test.go"
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+      - "(.+)_test.go"

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022-2024 Patrice Ferlet
+Copyright (c) 2022-2025 The Katenary authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,42 +1,64 @@
-CUR_SHA=$(shell git log -n1 --pretty='%h')
-CUR_BRANCH=$(shell git branch --show-current)
-VERSION=$(shell git describe --exact-match --tags $(CUR_SHA) 2>/dev/null || echo $(CUR_BRANCH)-$(CUR_SHA))
-CTN:=$(shell which podman 2>&1 1>/dev/null && echo "podman" || echo "docker")
-PREFIX=~/.local
-
-GOVERSION=1.23
-GO=container
-OUT=katenary
-RELEASE=""
-BLD_CMD=go build -ldflags="-X 'katenary/generator.Version=$(RELEASE)$(VERSION)'" -o $(OUT)  ./cmd/katenary
-GOOS=linux
-GOARCH=amd64
-SIGNER=metal3d@gmail.com
-
-BUILD_IMAGE=docker.io/golang:$(GOVERSION)-alpine
-# SHELL=/bin/bash
-
-# List of source files
-SOURCES=$(wildcard ./*.go ./*/*.go ./*/*/*.go)
-# List of binaries to build and sign
-BINARIES=dist/katenary-linux-amd64 dist/katenary-linux-arm64 dist/katenary.exe dist/katenary-darwin-amd64 dist/katenary-freebsd-amd64 dist/katenary-freebsd-arm64
-# List of signatures to build
-ASC_BINARIES=$(patsubst %,%.asc,$(BINARIES))
-
-# defaults
-BROWSER=$(shell command -v epiphany || echo xdg-open)
+# Strict mode
 SHELL := bash
-# strict mode
 .SHELLFLAGS := -eu -o pipefail -c
-# One session per target
 .ONESHELL:
 .DELETE_ON_ERROR:
+.PHONY: all binaries build check-dist-all check-dist-archlinux check-dist-debian check-dist-fedora check-dist-rocky check-dist-ubuntu check-sign clean-all clean-dist clean-go-cache clean-package-signer cover deb dist dist-full doc freebsd gpg-sign help install install-gomarkdoc katenary manpage packager-oci-image packages pacman prepare pull rpm rpm-sign sast serve-doc show-cover tar test uninstall upx warn-docker
 MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
-.PHONY: help clean build install tests test
+
+# Get a version string from git
+CUR_SHA=$(shell git log -n1 --pretty='%h')
+CUR_BRANCH=$(shell git branch --show-current)
+VERSION=$(shell git describe --exact-match --tags $(CUR_SHA) 2>/dev/null || echo $(CUR_BRANCH)-$(CUR_SHA))# use by golang flags
+
+# Go build command and environment variables for target OS and architecture
+GOVERSION=1.24
+GO=container# container, local
+OUTPUT=katenary
+GOOS=linux
+GOARCH=amd64
+CGO_ENABLED=0
+PREFIX=~/.local
+
+# UPX compression
+UPX_OPTS =
+UPX ?= upx $(UPX_OPTS)
+
+# List of source files
+SOURCES=$(shell find -name "*.go" -or -name "*.tpl" -type f | grep -v -P "^./example|^./vendor")
+# List of binaries to build and sign
+BINARIES=\
+	dist/katenary-linux-amd64\
+	dist/katenary-linux-arm64\
+	dist/katenary-darwin-amd64\
+	dist/katenary-freebsd-amd64\
+	dist/katenary-freebsd-arm64\
+	dist/katenary.exe\
+	dist/katenary-windows-setup.exe
+
+## GPG
+# List of signatures to build
+ASC_BINARIES=$(patsubst %,%.asc,$(BINARIES))
+# GPG signer
+SIGNER=metal3d@gmail.com
+
+# Browser command to see coverage report after tests
+BROWSER=$(shell command -v epiphany || echo xdg-open)
+
+include makefiles/build.mk
+include makefiles/containers.mk
+include makefiles/doc.mk
+include makefiles/gpg.mk
+include makefiles/packager.mk
+include makefiles/test.mk
 
 all: build
 
+# if docker is used instead of podman, we warn the user
+warn-docker:
+	@echo -e "\033[1;31mWarning: Docker is not recommended, use Podman instead.\033[0m"
+	sleep 5
 
 help:
 	@cat <<EOF | fold -s -w 80
@@ -71,81 +93,11 @@ help:
 	This will build the binary for darwin amd64.
 	
 	Or you can build all versions:
-	$$ make build-all
+	$$ make binaries
 	EOF
 
 
-## Standard build
-build: pull katenary
-
-pull:
-ifneq ($(GO),local)
-	@echo -e "\033[1;32mPulling $(BUILD_IMAGE) docker image\033[0m"
-	@$(CTN) pull $(BUILD_IMAGE)
-endif
-
-katenary: $(SOURCES) Makefile go.mod go.sum
-ifeq ($(GO),local)
-	@echo "=> Build on host using go"
-else
-	@echo "=> Build in container using" $(CTN)
-endif
-	echo $(BLD_CMD)
-ifeq ($(GO),local)
-	$(BLD_CMD)
-else ifeq ($(CTN),podman)
-	@podman run -e CGO_ENABLED=0 -e GOOS=$(GOOS) -e GOARCH=$(GOARCH) \
-		--rm -v $(PWD):/go/src/katenary:z -w /go/src/katenary --userns keep-id -it $(BUILD_IMAGE) $(BLD_CMD)
-else
-	@docker run -e CGO_ENABLED=0 -e GOOS=$(GOOS) -e GOARCH=$(GOARCH) \
-		--rm -v $(PWD):/go/src/katenary:z -w /go/src/katenary --user $(shell id -u):$(shell id -g) -e HOME=/tmp -it $(BUILD_IMAGE) $(BLD_CMD)
-endif
-	echo "=> Stripping if possible"
-	strip $(OUT) 2>/dev/null || echo "=> No strip available"
-
-
-## Release build
-dist: prepare $(BINARIES) $(ASC_BINARIES)
-
-prepare: pull
-	mkdir -p dist
-
-dist/katenary-linux-amd64:
-	@echo
-	@echo -e "\033[1;32mBuilding katenary $(VERSION) for linux-amd64...\033[0m"
-	$(MAKE) katenary GOOS=linux GOARCH=amd64 OUT=$@
-
-dist/katenary-linux-arm64:
-	@echo
-	@echo -e "\033[1;32mBuilding katenary $(VERSION) for linux-arm...\033[0m"
-	$(MAKE) katenary GOOS=linux GOARCH=arm64 OUT=$@
-
-dist/katenary.exe:
-	@echo
-	@echo -e "\033[1;32mBuilding katenary $(VERSION) for windows...\033[0m"
-	$(MAKE) katenary GOOS=windows GOARCH=amd64 OUT=$@
-
-dist/katenary-darwin-amd64:
-	@echo
-	@echo -e "\033[1;32mBuilding katenary $(VERSION) for darwin...\033[0m"
-	$(MAKE) katenary GOOS=darwin GOARCH=amd64 OUT=$@
-
-dist/katenary-freebsd-amd64:
-	@echo
-	@echo -e "\033[1;32mBuilding katenary $(VERSION) for freebsd...\033[0m"
-	$(MAKE) katenary GOOS=freebsd GOARCH=amd64 OUT=$@
-
-dist/katenary-freebsd-arm64:
-	@echo
-	@echo -e "\033[1;32mBuilding katenary $(VERSION) for freebsd-arm64...\033[0m"
-	$(MAKE) katenary GOOS=freebsd GOARCH=arm64 OUT=$@
-	
-gpg-sign:
-	rm -f dist/*.asc
-	$(MAKE) $(ASC_BINARIES)
-
-dist/%.asc: dist/%
-	gpg --armor --detach-sign  --default-key $(SIGNER) $< &>/dev/null || exit 1
+## installation and uninstallation
 
 install: build
 	install -Dm755 katenary $(PREFIX)/bin/katenary
@@ -153,78 +105,17 @@ install: build
 uninstall:
 	rm -f $(PREFIX)/bin/katenary
 
-clean:
-	rm -rf katenary dist/* release.id 
+## Miscellaneous
 
+clean-all: clean-dist clean-package-signer clean-go-cache
 
-serve-doc: __label_doc
-	@cd doc && \
-		[ -d venv ] || python -m venv venv; \
-		source venv/bin/activate && \
-		echo "==> Installing requirements in the virtual env..."
-		pip install -qq -r requirements.txt && \
-		echo "==> Serving doc with mkdocs..." && \
-		mkdocs serve
+clean-dist:
+	rm -rf dist
+	rm -f katenary
 
-tests: test
-test:
-	@echo -e "\033[1;33mTesting katenary $(VERSION)...\033[0m"
-	go test -coverprofile=cover.out ./...
-	$(MAKE) cover
+clean-package-signer:
+	rm -f .secret.gpg .rpmmacros
 
-cover:
-	go tool cover -func=cover.out | grep "total:"
-	go tool cover -html=cover.out -o cover.html
-	if [ "$(BROWSER)" = "xdg-open" ]; then
-		xdg-open cover.html
-	else
-		$(BROWSER) -i --new-window cover.html
-	fi
+clean-go-cache:
+	$(CTN) volume rm -f go-cache
 
-push-release: build-all
-	@rm -f release.id
-	# read personal access token from .git-credentials
-	TOKEN=$(shell cat .credentials)
-	# create a new release based on current tag and get the release id
-	@curl -sSL -X POST \
-		-H "Accept: application/vnd.github.v3+json" \
-		-H "Authorization: token $$TOKEN" \
-		-d "{\"tag_name\": \"$(VERSION)\", \"target_commitish\": \"\", \"name\": \"$(VERSION)\", \"draft\": true, \"prerelease\": true}" \
-		https://api.github.com/repos/metal3d/katenary/releases | jq -r '.id' > release.id
-	@echo "Release id: $$(cat release.id) created"
-	@echo "Uploading assets..."
-	# push all dist binary as assets to the release
-	@for i in $$(find dist -type f -name "katenary*"); do
-		curl -sSL -H "Authorization: token $$TOKEN" \
-			-H "Accept: application/vnd.github.v3+json" \
-			-H "Content-Type: application/octet-stream" \
-			--data-binary @$$i \
-			https://uploads.github.com/repos/metal3d/katenary/releases/$$(cat release.id)/assets?name=$$(basename $$i)
-	done
-	@rm -f release.id
-
-
-__label_doc:
-	@command -v gomarkdoc || (echo "==> We need to install gomarkdoc..." && \
-		go install github.com/princjef/gomarkdoc/cmd/gomarkdoc@latest)
-	@echo "=> Generating labels doc..."
-	# short label doc
-	go run ./cmd/katenary help-labels -m | \
-		sed -i '
-			/START_LABEL_DOC/,/STOP_LABEL_DOC/{/<!--/!d};
-			/START_LABEL_DOC/,/STOP_LABEL_DOC/r/dev/stdin
-		' doc/docs/labels.md
-	# detailed label doc
-	go run ./cmd/katenary help-labels -am | sed 's/^##/###/' | \
-		sed -i '
-			/START_DETAILED_DOC/,/STOP_DETAILED_DOC/{/<!--/!d}; 
-			/START_DETAILED_DOC/,/STOP_DETAILED_DOC/r/dev/stdin
-		' doc/docs/labels.md
-	
-	echo "=> Generating Code documentation..."
-	PACKAGES=$$(for f in $$(find . -name "*.go" -type f); do dirname $$f; done | sort -u)
-	for pack in $$PACKAGES; do
-		echo "-> Generating doc for $$pack"
-		gomarkdoc --repository.default-branch $(shell git branch --show-current) -o doc/docs/packages/$$pack.md $$pack
-		sed -i  '/^## Index/,/^##/ { /## Index/d; /^##/! d }' doc/docs/packages/$$pack.md
-	done

README.md

@@ -2,11 +2,22 @@
 <img src="./doc/docs/statics/logo-vertical.svg" alt="Katenary Logo" style="max-width: 90%" align="center"/>
 </div>
 
-[![Documentation Status](https://readthedocs.org/projects/katenary/badge/?version=latest)](https://katenary.readthedocs.io/en/latest/?badge=latest)
-[![Go Report Card](https://goreportcard.com/badge/github.com/metal3d/katenary)](https://goreportcard.com/report/github.com/metal3d/katenary)
-[![GitHub release](https://img.shields.io/github/v/release/metal3d/katenary)](https://github.com/metal3d/katenary/releases)
+<div style="text-align:center; margin: auto 0 4em 0" align="center">
 
-🚀 Unleash Productivity with Katenary! 🚀
+[![Documentation Status](https://readthedocs.org/projects/katenary/badge/?version=latest)](https://katenary.readthedocs.io/latest/?badge=latest)
+[![Go Report Card](https://goreportcard.com/badge/github.com/Katenary/katenary)](https://goreportcard.com/report/github.com/Katenary/katenary)
+[![GitHub release](https://img.shields.io/github/v/release/Katenary/katenary)](https://github.com/Katenary/katenary/releases)
+[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=metal3d_katenary&metric=coverage)](https://sonarcloud.io/summary/new_code?id=metal3d_katenary)
+[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=metal3d_katenary&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=metal3d_katenary)
+[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=metal3d_katenary&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=metal3d_katenary)
+
+[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=metal3d_katenary&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=metal3d_katenary)
+
+</div>
+
+<div style="text-align:center; margin: auto 0 4em 0" align="center">
+<h3>🚀 Unleash Productivity with Katenary! 🚀</h3>
+</div>
 
 Tired of manual conversions? Katenary harnesses the labels from your "`compose`" file to craft complete Helm Charts
 effortlessly, saving you time and energy.
@@ -30,16 +41,16 @@ The main developer is [Patrice FERLET](https://github.com/metal3d).
 
 ## Install
 
-You can download the binaries from the [Release](https://github.com/metal3d/katenary/releases) section. Copy the binary
+You can download the binaries from the [Release](https://github.com/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/metal3d/katenary/cmd/katenary/...` but the `main` branch
+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:
 
 ```bash
-sh <(curl -sSL https://raw.githubusercontent.com/metal3d/katenary/master/install.sh)
+sh <(curl -sSL https://raw.githubusercontent.com/Katenary/katenary/master/install.sh)
 ```
 
 ## Or, build yourself
@@ -100,6 +111,7 @@ katenary completion fish | source
 ## Usage
 
 ```text
+
 Katenary is a tool to convert compose files to Helm Charts.
 
 Each [command] and subcommand has got an "help" and "--help" flag to show more information.
@@ -126,68 +138,69 @@ Flags:
 Use "katenary [command] --help" for more information about a command.
 ```
 
-  Katenary will try to find a `docker-compose.yaml` or `docker-compose.yml` file inside the current directory. It will
-  check *the existence of the `chart` directory to create a new Helm Chart inside a named subdirectory. Katenary will ask
-  you if you want to delete it before recreating.
+Katenary will try to find a `docker-compose.yaml` or `docker-compose.yml` file inside the current directory. It will
+check \*the existence of the `chart` directory to create a new Helm Chart inside a named subdirectory. Katenary will ask
+you if you want to delete it before recreating.
 
 It creates a subdirectory inside `chart` that is named with the `appname` option (default is `MyApp`)
 
-  > To respect the ability to install the same application in the same namespace, Katenary will create variable names
-  > like `{{ .Release.Name }}-servicename`. So, you will need to use some labels inside your docker-compose file to help
-  > Katenary to build a correct helm chart.
+> To respect the ability to install the same application in the same namespace, Katenary will create variable names
+> like `{{ .Release.Name }}-servicename`. So, you will need to use some labels inside your docker-compose file to help
+> Katenary to build a correct helm chart.
 
-  Example of a possible `docker-compose.yaml` file:
+Example of a possible `docker-compose.yaml` file:
 
 ```yaml
 services:
-  webapp:
-    image: php:7-apache
-    environment:
-      # note that "database" is a "compose" service name
-      # so we need to adapt it with the map-env label
-      DB_HOST: database
-      # a pitty to repeat this values, isn't it?
-      # so, let's change them with "values-from" label
-      DB_USER: foo
-      DB_PASSWORD: bar
-    expose:
-      - 80
-    depends_on:
-      # this will create a init container waiting for 3306 port
-      # because it's the "exposed" port
-      - database
-    labels:
-      # expose the port 80 as an ingress
-      katenary.v3/ingress: |-
-        hostname: myapp.example.com
-        port: 80
-      katenary.v3/map-env: |-
-        # make adaptations, DB_HOST environment is actually the service name
-        DB_HOST: '{{ .Release.Name }}-database'
-      katenary.v3/values-from: |-
-        # get the values from the "database" service
-        # this will use the databas secret, see below
-        DB_USER: databse.MARIADB_USER
-        DB_PASSWORD: database.MARIADB_PASSWORD
+    webapp:
+        image: php:7-apache
+        environment:
+            # note that "database" is a "compose" service name
+            # so we need to adapt it with the map-env label
+            DB_HOST: database
+            # a pitty to repeat this values, isn't it?
+            # so, let's change them with "values-from" label
+            DB_USER: foo
+            DB_PASSWORD: bar
+        expose:
+            - 80
+        depends_on:
+            # this will create a init container waiting for 3306 port
+            # because it's the "exposed" port
+            - database
+        labels:
+            # expose the port 80 as an ingress
+            katenary.v3/ingress: |-
+                hostname: myapp.example.com
+                port: 80
+            # make adaptations, DB_HOST environment is actually the service name
+            katenary.v3/map-env: |-
+                DB_HOST: '{{ .Release.Name }}-database'
+            # get the values from the "database" service
+            # this will use the database secrets and environment,
+            # see the "database" service to see the values
+            katenary.v3/values-from: |-
+                DB_USER: database.MARIADB_USER
+                DB_PASSWORD: database.MARIADB_PASSWORD
 
     database:
-      image: mariadb:10
-      env_file:
-        # this valuse will be added in a configMap
-        - my_env.env
-      environment:
-        MARIADB_USER: foo
-        MARIADB_ROOT_PASSWORD: foobar
-        MARIADB_PASSWORD: bar
-      labels:
-        # no need to declare this port in docker-compose
-        # but katenary will need it
-        katenary.v3/ports: |-
-          - 3306
-        # these variables are secrets
-        katenary.v3/secrets: |-
-          - MARIADB_ROOT_PASSWORD
-          - MARIADB_PASSWORD
+        image: mariadb:10
+        env_file:
+            # this values will be added in a configMap
+            - my_env.env
+        environment:
+            MARIADB_USER: foo
+            MARIADB_ROOT_PASSWORD: foobar
+            MARIADB_PASSWORD: bar
+        labels:
+            # no need to declare this port in docker-compose
+            # but katenary will need it
+            katenary.v3/ports: |-
+                - 3306
+            # these variables are secrets
+            katenary.v3/secrets: |-
+                - MARIADB_ROOT_PASSWORD
+                - MARIADB_PASSWORD
 ```
 
 ## Labels
@@ -198,22 +211,22 @@ These labels could be found by `katenary help-labels`, and can be placed as labe
 To get more information about a label, use `katenary help-label <name_without_prefix>
 e.g. katenary help-label dependencies
 
-katenary.v3/configmap-files:	list of strings		Add files to the configmap.
-katenary.v3/cronjob:		object			Create a cronjob from the service.
-katenary.v3/dependencies:	list of objects		Add Helm dependencies to the service.
-katenary.v3/description:	string			Description of the service
-katenary.v3/env-from:		list of strings		Add environment variables from antoher service.
-katenary.v3/exchange-volumes:	list of objects		Add exchange volumes (empty directory on the node) to share data
-katenary.v3/health-check:	object			Health check to be added to the deployment.
-katenary.v3/ignore:		bool			Ignore the service
-katenary.v3/ingress:		object			Ingress rules to be added to the service.
-katenary.v3/main-app:		bool			Mark the service as the main app.
-katenary.v3/map-env:		object			Map env vars from the service to the deployment.
-katenary.v3/ports:		list of uint32		Ports to be added to the service.
-katenary.v3/same-pod:		string			Move the same-pod deployment to the target deployment.
-katenary.v3/secrets:		list of string		Env vars to be set as secrets.
-katenary.v3/values:		list of string or map	Environment variables to be added to the values.yaml
-katenary.v3/values-from:	map[string]string	Add values from another service.
+katenary.v3/configmap-files:	[]string			Inject files as Configmap.
+katenary.v3/cronjob:		object				Create a cronjob from the service.
+katenary.v3/dependencies:	[]object			Add Helm dependencies to the service.
+katenary.v3/description:	string				Description of the service
+katenary.v3/env-from:		[]string			Add environment variables from another service.
+katenary.v3/exchange-volumes:	[]object			Add exchange volumes (empty directory on the node) to share data
+katenary.v3/health-check:	object				Health check to be added to the deployment.
+katenary.v3/ignore:		bool				Ignore the service
+katenary.v3/ingress:		object				Ingress rules to be added to the service.
+katenary.v3/main-app:		bool				Mark the service as the main app.
+katenary.v3/map-env:		map[string]string		Map env vars from the service to the deployment.
+katenary.v3/ports:		[]uint32			Ports to be added to the service.
+katenary.v3/same-pod:		string				Move the same-pod deployment to the target deployment.
+katenary.v3/secrets:		[]string			Env vars to be set as secrets.
+katenary.v3/values:		[]string or map[string]string	Environment variables to be added to the values.yaml
+katenary.v3/values-from:	map[string]string		Add values from another service.
 ```
 
 ## Katenary.yaml file and schema validation
@@ -225,25 +238,25 @@ For example, instead of using this:
 
 ```yaml
 services:
-  web:
-    image: nginx:latest
-    katenary.v3/ingress: |-
-      hostname: myapp.example.com
-      port: 80
+    web:
+        image: nginx:latest
+        katenary.v3/ingress: |-
+            hostname: myapp.example.com
+            port: 80
 ```
 
-You can remove the labels, and use a kanetary.yaml file:
+You can remove the labels, and use a `katenary.yaml` file:
 
 ```yaml
 web:
-  ingress:
-    hostname: myapp.example.com
-    port: 80
+    ingress:
+        hostname: myapp.example.com
+        port: 80
 ```
 
 To validate the `katenary.yaml` file, you can use the JSON schema using the "master" raw content:
 
-`https://raw.githubusercontent.com/metal3d/katenary/refs/heads/master/katenary.json`
+`https://raw.githubusercontent.com/Katenary/katenary/refs/heads/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:
@@ -260,7 +273,7 @@ return {
           settings = {
             yaml = {
               schemas = {
-                ["https://raw.githubusercontent.com/metal3d/katenary/refs/heads/master/katenary.json"] = "katenary.yaml",
+                ["https://raw.githubusercontent.com/Katenary/katenary/master/katenary.json"] = "katenary.yaml",
               },
             },
           },
@@ -275,13 +288,13 @@ Use this address to validate the `katenary.yaml` file in VSCode:
 
 ```json
 {
-  "yaml.schemas": {
-    "https://raw.githubusercontent.com/metal3d/katenary/refs/heads/master/katenary.json": "katenary.yaml"
-  }
+    "yaml.schemas": {
+        "https://raw.githubusercontent.com/Katenary/katenary/master/katenary.json": "katenary.yaml"
+    }
 }
 ```
 
-> You can, of course, replace the `refs/heads/master` with a specific tag or branch.
+> You can, of course, replace the `master` with a specific tag or branch.
 
 ## What a name…
 

cmd/katenary/main.go

@@ -6,13 +6,15 @@ package main
 
 import (
 	"fmt"
-	"katenary/generator"
-	"katenary/generator/katenaryfile"
-	"katenary/generator/labels"
-	"katenary/utils"
+	"log"
 	"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"
+
 	"github.com/compose-spec/compose-go/cli"
 	"github.com/spf13/cobra"
 )
@@ -24,7 +26,10 @@ Each [command] and subcommand has got an "help" and "--help" flag to show more i
 
 func main() {
 	rootCmd := buildRootCmd()
-	rootCmd.Execute()
+
+	if err := rootCmd.Execute(); err != nil {
+		log.Fatal(err)
+	}
 }
 
 func buildRootCmd() *cobra.Command {
@@ -97,26 +102,26 @@ func generateCompletionCommand(name string) *cobra.Command {
 		Args:                  cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs),
 		Short:                 "Generates completion scripts",
 		Long:                  fmt.Sprintf(completionHelp, name),
-		Run: func(cmd *cobra.Command, args []string) {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) == 0 {
-				cmd.Help()
-				return
+				return cmd.Help()
 			}
 			switch args[0] {
 			case "bash":
 				// get the bash version
 				if cmd.Flags().Changed("bash-v1") {
-					cmd.Root().GenBashCompletion(os.Stdout)
-					return
+					return cmd.Root().GenBashCompletion(os.Stdout)
 				}
-				cmd.Root().GenBashCompletionV2(os.Stdout, true)
+				return cmd.Root().GenBashCompletionV2(os.Stdout, true)
 			case "zsh":
-				cmd.Root().GenZshCompletion(os.Stdout)
+				return cmd.Root().GenZshCompletion(os.Stdout)
 			case "fish":
-				cmd.Root().GenFishCompletion(os.Stdout, true)
+				return cmd.Root().GenFishCompletion(os.Stdout, true)
 			case "powershell":
-				cmd.Root().GenPowerShellCompletion(os.Stdout)
+				return cmd.Root().GenPowerShellCompletion(os.Stdout)
 			}
+
+			return fmt.Errorf("unknown completion type: %s", args[0])
 		},
 	}
 
@@ -141,11 +146,11 @@ func generateConvertCommand() *cobra.Command {
 	convertCmd := &cobra.Command{
 		Use:   "convert",
 		Short: "Converts a docker-compose file to a Helm Chart",
-		Run: func(cmd *cobra.Command, args []string) {
-			if givenAppVersion != "" {
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if len(strings.TrimSpace(givenAppVersion)) > 0 {
 				appVersion = &givenAppVersion
 			}
-			generator.Convert(generator.ConvertOptions{
+			return generator.Convert(generator.ConvertOptions{
 				Force:        force,
 				OutputDir:    outputDir,
 				Profiles:     profiles,

cmd/katenary/main_test.go

@@ -13,8 +13,7 @@ func TestBuildCommand(t *testing.T) {
 	rootCmd := buildRootCmd()
 	if rootCmd == nil {
 		t.Errorf("Expected rootCmd to be defined")
-	}
-	if rootCmd.Use != "katenary" {
+	} else if rootCmd.Use != "katenary" {
 		t.Errorf("Expected rootCmd.Use to be katenary, got %s", rootCmd.Use)
 	}
 	numCommands := 6
@@ -53,18 +52,27 @@ func TestSchemaCommand(t *testing.T) {
 	}
 	schema := generateSchemaCommand()
 	old := os.Stdout
-	r, w, _ := os.Pipe()
+	r, w, err := os.Pipe()
+	if err != nil {
+		t.Fatalf("Failed to create pipe: %v", err)
+	}
 	os.Stdout = w
-	schema.Run(cmd, nil)
-	w.Close()
-	os.Stdout = old
 	var buf bytes.Buffer
+
+	done := make(chan struct{})
+	go func() {
+		schema.Run(cmd, nil)
+		w.Close()
+		close(done)
+	}()
 	io.Copy(&buf, r)
-	output := buf.String()
+	<-done
+
+	os.Stdout = old
 
 	// try to parse json
-	schemaContent := make(map[string]interface{})
-	if err := json.Unmarshal([]byte(output), &schemaContent); err != nil {
-		t.Errorf("Expected valid json, got %s", output)
+	schemaContent := make(map[string]any)
+	if err := json.Unmarshal(buf.Bytes(), &schemaContent); err != nil {
+		t.Errorf("Expected valid json")
 	}
 }

doc/docs/.markdownlint.yaml

@@ -0,0 +1,9 @@
+MD012: false
+MD013: false
+MD022: false
+MD033: false
+MD041: false
+MD046: false
+# list indentation
+MD007:
+  indent: 4

doc/docs/dependencies.md

@@ -4,7 +4,7 @@ Katenary uses `compose-go` and several Kubernetes official packages.
 
 - `github.com/compose-spec/compose-go`: to parse compose files. It ensures :
     - that the project respects the "compose" specification
-    - that Katenary uses the "compose" struct exactly the same way `podman compose` or `docker copose` does
+    - that Katenary uses the "compose" struct exactly the same way `podman compose` or `docker compose` does
 - `github.com/spf13/cobra`: to parse command line arguments, sub-commands and flags. It also generates completion for
   bash, zsh, fish and PowerShell.
 - `github.com/thediveo/netdb`: to get the standard names of a service from its port number

doc/docs/faq.md

@@ -19,9 +19,10 @@ and flexibility.
 
 Kompose is able to generate Helm charts, but [it could be not the case in future releases](https://github.com/kubernetes/kompose/issues/1716) for several reasons[^2].
 
-[^2]: The author of Kompose explains that they have no bandwidth to maintain the Helm chart generation. It's a complex
-task, and we can confirm. Katenary takes a lot of time to be developed and maintained. This issue mentions Katenary as
-an alternative to Helm chart generation :smile:
+[^2]:
+    The author of Kompose explains that they have no bandwidth to maintain the Helm chart generation. It's a complex
+    task, and we can confirm. Katenary takes a lot of time to be developed and maintained. This issue mentions Katenary as
+    an alternative to Helm chart generation :smile:
 
 The project is focused on Kubernetes manifests and proposes to use "Kustomize" to adapt the manifests. Helm seems to be
 not the priority.
@@ -86,9 +87,9 @@ tested some concepts.
 You can help us in many ways.
 
 - The first things we really need, more than money, more than anything else, is to have feedback. If you use Katenary,
-if you have some issues, if you have some ideas, please open an issue on the [GitHub repository](https://github.com/metal3d/katenary).
+  if you have some issues, if you have some ideas, please open an issue on the [GitHub repository](https://github.com/Katenary/katenary).
 - The second thing is to help us to fix issues. If you're a Go developer, or if you want to fix the documentation,
-your help is greatly appreciated.
+  your help is greatly appreciated.
 - And then, of course, we need money, or sponsors.
 
 ### If you're a company
@@ -105,6 +106,7 @@ All main contributors[^3] will be listed on the website and in the documentation
 
 > If you want to be anonymous, please tell us.
 
-[^3]: Main contributors are the people who have made a significant contribution to the project. It could be code,
-documentation, or any other help. There is no defined rules, at this time, to evaluate the contribution.
-It's a subjective decision.
+[^3]:
+    Main contributors are the people who have made a significant contribution to the project. It could be code,
+    documentation, or any other help. There is no defined rules, at this time, to evaluate the contribution.
+    It's a subjective decision.

doc/docs/index.md

@@ -42,13 +42,13 @@ share it with the community.
 The main developer is [Patrice FERLET](https://github.com/metal3d).
 
 The project source
-code is hosted on the [:fontawesome-brands-github: Katenary GitHub Repository](https://github.com/metal3d/katenary).
+code is hosted on the [:fontawesome-brands-github: Katenary GitHub Repository](https://github.com/Katenary/katenary).
 
 ## Install Katenary
 
 Katenary is developed using the :fontawesome-brands-golang:{ .gopher } [Go](https://go.dev) language.
 The binary is statically linked, so you can simply download it from the [release
-page](https://github.com/metal3d/katenary/releases) of the project in GitHub.
+page](https://github.com/Katenary/katenary/releases) of the project in GitHub.
 
 You need to select the right binary for your operating system and architecture, and copy the binary in a directory
 that is in your `PATH`.
@@ -57,17 +57,17 @@ 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/metal3d/katenary/master/install.sh)
+sh <(curl -sSL https://raw.githubusercontent.com/Katenary/katenary/master/install.sh)
 ```
 
 !!! Info "Upgrading is integrated to the `katenary` command"
-    Katenary propose a `upgrade` sub-command to update the current binary to the latest stable release.
+Katenary propose a `upgrade` sub-command to update the current binary to the latest stable release.
 
     Of course, you need to install Katenary once :smile:
 
 !!! Note "You prefer to compile it, no need to install Go"
-    You can also build and install it yourself, the provided Makefile has got a `build` command that uses `podman` or
-    `docker` to build the binary.
+You can also build and install it yourself, the provided Makefile has got a `build` command that uses `podman` or
+`docker` to build the binary.
 
     So, you don't need to install Go compiler :+1:.
 
@@ -77,7 +77,7 @@ sh <(curl -sSL https://raw.githubusercontent.com/metal3d/katenary/master/install
 To compile it, you can use the following commands:
 
 ```bash
-git clone https://github.com/metal3d/katenary.git
+git clone https://github.com/Katenary/katenary.git
 cd katenary
 make build
 make install
@@ -127,7 +127,7 @@ thing! :heart:
 
 !!! Edit "Special thanks"
 
-    **Katenary is built with:** <br /> 
+    **Katenary is built with:** <br />
 
     <a href="https://go.dev" target="_blank">:fontawesome-brands-golang:{ .go-logo }</a>
 

doc/docs/labels.md

@@ -1,19 +1,28 @@
 # Labels documentation
 
-Katenary proposes labels to set in `compose.yaml` files (or override files) to configure the Helm Chart generation. Because it is sometimes needed to have structured values, it is necessary to use the Yaml syntax. While compose labels are string, we can use `|` to use Yaml multilines as value.
+Katenary proposes labels to set in `compose.yaml` files (or override files) to configure the Helm Chart generation.
+Because it is sometimes needed to have structured values, it is necessary to use the YAML syntax.
+While compose labels are string, we can use _here-doc_ syntax using `|` to use YAML multiline as value.
 
-Katenary will try to Unmarshal these labels.
+```yaml
+label-name: |-
+    # this is actually a multiline string here
+    key1: value1
+    key2: value2
+```
+
+Katenary will try to _Unmarshal_ these labels.
 
 ## Label list and types
 
 <!-- START_LABEL_DOC : do not remove this tag !-->
 | Label name                     | Description                                                      | Type                             |
 | ------------------------------ | ---------------------------------------------------------------- | -------------------------------- |
-| `katenary.v3/configmap-files`  | Add files to the configmap.                                      | `[]string`                       |
+| `katenary.v3/configmap-files`  | Inject files as Configmap.                                       | `[]string`                       |
 | `katenary.v3/cronjob`          | Create a cronjob from the service.                               | `object`                         |
 | `katenary.v3/dependencies`     | Add Helm dependencies to the service.                            | `[]object`                       |
 | `katenary.v3/description`      | Description of the service                                       | `string`                         |
-| `katenary.v3/env-from`         | Add environment variables from antoher service.                  | `[]string`                       |
+| `katenary.v3/env-from`         | Add environment variables from another service.                  | `[]string`                       |
 | `katenary.v3/exchange-volumes` | Add exchange volumes (empty directory on the node) to share data | `[]object`                       |
 | `katenary.v3/health-check`     | Health check to be added to the deployment.                      | `object`                         |
 | `katenary.v3/ignore`           | Ignore the service                                               | `bool`                           |
@@ -33,7 +42,7 @@ Katenary will try to Unmarshal these labels.
 <!-- START_DETAILED_DOC : do not remove this tag !-->
 ### katenary.v3/configmap-files
 
-Add files to the configmap.
+Inject files as Configmap.
 
 **Type**:  `[]string`
 
@@ -157,7 +166,7 @@ labels:
 
 ### katenary.v3/env-from
 
-Add environment variables from antoher service.
+Add environment variables from another service.
 
 **Type**:  `[]string`
 
@@ -460,9 +469,9 @@ database:
     MARIADB_USER: myuser
     MARIADB_PASSWORD: mypassword
   labels:
-    # it can be a secret
+    # we can declare secrets
     katenary.v3/secrets: |-
-      - DB_PASSWORD
+      - MARIADB_PASSWORD
 php:
   image: php:7.4-fpm
   environment:

doc/docs/packages/cmd/katenary.md

@@ -3,7 +3,7 @@
 # katenary
 
 ```go
-import "katenary/cmd/katenary"
+import "github.com/katenary/katenary/cmd/katenary"
 ```
 
 Katenary CLI, main package.

doc/docs/packages/generator/katenaryfile.md

@@ -1,67 +0,0 @@
-<!-- Code generated by gomarkdoc. DO NOT EDIT -->
-
-# katenaryfile
-
-```go
-import "katenary/generator/katenaryfile"
-```
-
-Package katenaryfile is a package for reading and writing katenary files.
-
-A katenary file, named "katenary.yml" or "katenary.yaml", is a file where you can define the configuration of the conversion avoiding the use of labels in the compose file.
-
-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](<https://github.com/metal3d/katenary/blob/develop/generator/katenaryfile/main.go#L131>)
-
-```go
-func GenerateSchema() string
-```
-
-GenerateSchema generates the schema for the katenary.yaml file.
-
-<a name="OverrideWithConfig"></a>
-## func [OverrideWithConfig](<https://github.com/metal3d/katenary/blob/develop/generator/katenaryfile/main.go#L49>)
-
-```go
-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.
-
-<a name="Service"></a>
-## type [Service](<https://github.com/metal3d/katenary/blob/develop/generator/katenaryfile/main.go#L27-L44>)
-
-Service is a struct that contains the service configuration for katenary
-
-```go
-type Service struct {
-    MainApp         *bool                          `json:"main-app,omitempty" jsonschema:"title=Is this service the main application"`
-    Values          []StringOrMap                  `json:"values,omitempty" jsonschema:"description=Environment variables to be set in values.yaml with or without a description"`
-    Secrets         *labelStructs.Secrets          `json:"secrets,omitempty" jsonschema:"title=Secrets,description=Environment variables to be set as secrets"`
-    Ports           *labelStructs.Ports            `json:"ports,omitempty" jsonschema:"title=Ports,description=Ports to be exposed in services"`
-    Ingress         *labelStructs.Ingress          `json:"ingress,omitempty" jsonschema:"title=Ingress,description=Ingress configuration"`
-    HealthCheck     *labelStructs.HealthCheck      `json:"health-check,omitempty" jsonschema:"title=Health Check,description=Health check configuration that respects the kubernetes api"`
-    SamePod         *string                        `json:"same-pod,omitempty" jsonschema:"title=Same Pod,description=Service that should be in the same pod"`
-    Description     *string                        `json:"description,omitempty" jsonschema:"title=Description,description=Description of the service that will be injected in the values.yaml file"`
-    Ignore          *bool                          `json:"ignore,omitempty" jsonschema:"title=Ignore,description=Ignore the service in the conversion"`
-    Dependencies    []labelStructs.Dependency      `json:"dependencies,omitempty" jsonschema:"title=Dependencies,description=Services that should be injected in the Chart.yaml file"`
-    ConfigMapFile   *labelStructs.ConfigMapFile    `json:"configmap-files,omitempty" jsonschema:"title=ConfigMap Files,description=Files that should be injected as ConfigMap"`
-    MapEnv          *labelStructs.MapEnv           `json:"map-env,omitempty" jsonschema:"title=Map Env,description=Map environment variables to another value"`
-    CronJob         *labelStructs.CronJob          `json:"cron-job,omitempty" jsonschema:"title=Cron Job,description=Cron Job configuration"`
-    EnvFrom         *labelStructs.EnvFrom          `json:"env-from,omitempty" jsonschema:"title=Env From,description=Inject environment variables from another service"`
-    ExchangeVolumes []*labelStructs.ExchangeVolume `json:"exchange-volumes,omitempty" jsonschema:"title=Exchange Volumes,description=Exchange volumes between services"`
-    ValuesFrom      *labelStructs.ValueFrom        `json:"values-from,omitempty" jsonschema:"title=Values From,description=Inject values from another service (secret or configmap environment variables)"`
-}
-```
-
-<a name="StringOrMap"></a>
-## type [StringOrMap](<https://github.com/metal3d/katenary/blob/develop/generator/katenaryfile/main.go#L24>)
-
-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
-
-```go
-type StringOrMap any
-```
-
-Generated by [gomarkdoc](<https://github.com/princjef/gomarkdoc>)

doc/docs/packages/internal/generator.md

@@ -3,10 +3,10 @@
 # generator
 
 ```go
-import "katenary/generator"
+import "github.com/katenary/katenary/internal/generator"
 ```
 
-The generator package generates kubernetes objects from a "compose" file and transforms them into a helm chart.
+Package generator generates kubernetes objects from a "compose" file and transforms them into a helm chart.
 
 The generator package is the core of katenary. It is responsible for generating kubernetes objects from a compose file and transforming them into a helm chart. Conversion manipulates Yaml representation of kubernetes object to add conditions, labels, annotations, etc. to the objects. It also create the values to be set to the values.yaml file.
 
@@ -35,16 +35,16 @@ var Version = "master" // changed at compile time
 ```
 
 <a name="Convert"></a>
-## func [Convert](<https://github.com/metal3d/katenary/blob/develop/generator/converter.go#L93>)
+## func [Convert](<https://github.com/katenary/katenary/blob/master/internal/generator/converter.go#L100>)
 
 ```go
-func Convert(config ConvertOptions, dockerComposeFile ...string)
+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.
 
 <a name="GetLabels"></a>
-## func [GetLabels](<https://github.com/metal3d/katenary/blob/develop/generator/labels.go#L12>)
+## func [GetLabels](<https://github.com/katenary/katenary/blob/master/internal/generator/labels.go#L12>)
 
 ```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.
 
 <a name="GetMatchLabels"></a>
-## func [GetMatchLabels](<https://github.com/metal3d/katenary/blob/develop/generator/labels.go#L25>)
+## func [GetMatchLabels](<https://github.com/katenary/katenary/blob/master/internal/generator/labels.go#L25>)
 
 ```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.
 
 <a name="GetVersion"></a>
-## func [GetVersion](<https://github.com/metal3d/katenary/blob/develop/generator/version.go#L14>)
+## func [GetVersion](<https://github.com/katenary/katenary/blob/master/internal/generator/version.go#L14>)
 
 ```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.
 
 <a name="Helper"></a>
-## func [Helper](<https://github.com/metal3d/katenary/blob/develop/generator/helper.go#L15>)
+## func [Helper](<https://github.com/katenary/katenary/blob/master/internal/generator/helper.go#L15>)
 
 ```go
 func Helper(name string) string
@@ -80,7 +80,7 @@ func Helper(name string) string
 Helper returns the \_helpers.tpl file for a chart.
 
 <a name="NewCronJob"></a>
-## func [NewCronJob](<https://github.com/metal3d/katenary/blob/develop/generator/cronJob.go#L28>)
+## func [NewCronJob](<https://github.com/katenary/katenary/blob/master/internal/generator/cronJob.go#L28>)
 
 ```go
 func NewCronJob(service types.ServiceConfig, chart *HelmChart, appName string) (*CronJob, *RBAC)
@@ -89,16 +89,16 @@ 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.
 
 <a name="ToK8SYaml"></a>
-## func [ToK8SYaml](<https://github.com/metal3d/katenary/blob/develop/generator/utils.go#L90>)
+## func [ToK8SYaml](<https://github.com/katenary/katenary/blob/master/internal/generator/utils.go#L91>)
 
 ```go
-func ToK8SYaml(obj interface{}) ([]byte, error)
+func ToK8SYaml(obj any) ([]byte, error)
 ```
 
 
 
 <a name="UnWrapTPL"></a>
-## func [UnWrapTPL](<https://github.com/metal3d/katenary/blob/develop/generator/utils.go#L86>)
+## func [UnWrapTPL](<https://github.com/katenary/katenary/blob/master/internal/generator/utils.go#L87>)
 
 ```go
 func UnWrapTPL(in []byte) []byte
@@ -107,7 +107,7 @@ func UnWrapTPL(in []byte) []byte
 UnWrapTPL removes the line wrapping from a template.
 
 <a name="ChartTemplate"></a>
-## type [ChartTemplate](<https://github.com/metal3d/katenary/blob/develop/generator/chart.go#L19-L22>)
+## type [ChartTemplate](<https://github.com/katenary/katenary/blob/master/internal/generator/chart.go#L22-L25>)
 
 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 {
 ```
 
 <a name="ConfigMap"></a>
-## type [ConfigMap](<https://github.com/metal3d/katenary/blob/develop/generator/configMap.go#L35-L40>)
+## type [ConfigMap](<https://github.com/katenary/katenary/blob/master/internal/generator/configMap.go#L37-L42>)
 
 ConfigMap is a kubernetes ConfigMap. Implements the DataMap interface.
 
@@ -131,7 +131,7 @@ type ConfigMap struct {
 ```
 
 <a name="NewConfigMap"></a>
-### func [NewConfigMap](<https://github.com/metal3d/katenary/blob/develop/generator/configMap.go#L44>)
+### func [NewConfigMap](<https://github.com/katenary/katenary/blob/master/internal/generator/configMap.go#L46>)
 
 ```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".
 
 <a name="NewConfigMapFromDirectory"></a>
-### func [NewConfigMapFromDirectory](<https://github.com/metal3d/katenary/blob/develop/generator/configMap.go#L117>)
+### func [NewConfigMapFromDirectory](<https://github.com/katenary/katenary/blob/master/internal/generator/configMap.go#L119>)
 
 ```go
 func NewConfigMapFromDirectory(service types.ServiceConfig, appName, path string) *ConfigMap
@@ -148,8 +148,17 @@ 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.
 
+<a name="ConfigMap.AddBinaryData"></a>
+### func \(\*ConfigMap\) [AddBinaryData](<https://github.com/katenary/katenary/blob/master/internal/generator/configMap.go#L157>)
+
+```go
+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.
+
 <a name="ConfigMap.AddData"></a>
-### func \(\*ConfigMap\) [AddData](<https://github.com/metal3d/katenary/blob/develop/generator/configMap.go#L148>)
+### func \(\*ConfigMap\) [AddData](<https://github.com/katenary/katenary/blob/master/internal/generator/configMap.go#L152>)
 
 ```go
 func (c *ConfigMap) AddData(key, value string)
@@ -158,25 +167,25 @@ 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.
 
 <a name="ConfigMap.AppendDir"></a>
-### func \(\*ConfigMap\) [AppendDir](<https://github.com/metal3d/katenary/blob/develop/generator/configMap.go#L154>)
+### func \(\*ConfigMap\) [AppendDir](<https://github.com/katenary/katenary/blob/master/internal/generator/configMap.go#L166>)
 
 ```go
-func (c *ConfigMap) AppendDir(path string)
+func (c *ConfigMap) AppendDir(path string) error
 ```
 
-AddFile 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.
+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.
 
 <a name="ConfigMap.AppendFile"></a>
-### func \(\*ConfigMap\) [AppendFile](<https://github.com/metal3d/katenary/blob/develop/generator/configMap.go#L189>)
+### func \(\*ConfigMap\) [AppendFile](<https://github.com/katenary/katenary/blob/master/internal/generator/configMap.go#L213>)
 
 ```go
-func (c *ConfigMap) AppendFile(path string)
+func (c *ConfigMap) AppendFile(path string) error
 ```
 
 
 
 <a name="ConfigMap.Filename"></a>
-### func \(\*ConfigMap\) [Filename](<https://github.com/metal3d/katenary/blob/develop/generator/configMap.go#L207>)
+### func \(\*ConfigMap\) [Filename](<https://github.com/katenary/katenary/blob/master/internal/generator/configMap.go#L237>)
 
 ```go
 func (c *ConfigMap) Filename() string
@@ -185,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.
 
 <a name="ConfigMap.SetData"></a>
-### func \(\*ConfigMap\) [SetData](<https://github.com/metal3d/katenary/blob/develop/generator/configMap.go#L217>)
+### func \(\*ConfigMap\) [SetData](<https://github.com/katenary/katenary/blob/master/internal/generator/configMap.go#L247>)
 
 ```go
 func (c *ConfigMap) SetData(data map[string]string)
@@ -194,7 +203,7 @@ func (c *ConfigMap) SetData(data map[string]string)
 SetData sets the data of the configmap. It replaces the entire data.
 
 <a name="ConfigMap.Yaml"></a>
-### func \(\*ConfigMap\) [Yaml](<https://github.com/metal3d/katenary/blob/develop/generator/configMap.go#L222>)
+### func \(\*ConfigMap\) [Yaml](<https://github.com/katenary/katenary/blob/master/internal/generator/configMap.go#L252>)
 
 ```go
 func (c *ConfigMap) Yaml() ([]byte, error)
@@ -203,7 +212,7 @@ func (c *ConfigMap) Yaml() ([]byte, error)
 Yaml returns the yaml representation of the configmap
 
 <a name="ConfigMapMount"></a>
-## type [ConfigMapMount](<https://github.com/metal3d/katenary/blob/develop/generator/deployment.go#L28-L31>)
+## type [ConfigMapMount](<https://github.com/katenary/katenary/blob/master/internal/generator/deployment.go#L28-L31>)
 
 
 
@@ -214,7 +223,7 @@ type ConfigMapMount struct {
 ```
 
 <a name="ConvertOptions"></a>
-## type [ConvertOptions](<https://github.com/metal3d/katenary/blob/develop/generator/chart.go#L25-L34>)
+## type [ConvertOptions](<https://github.com/katenary/katenary/blob/master/internal/generator/chart.go#L28-L37>)
 
 ConvertOptions are the options to convert a compose project to a helm chart.
 
@@ -232,7 +241,7 @@ type ConvertOptions struct {
 ```
 
 <a name="CronJob"></a>
-## type [CronJob](<https://github.com/metal3d/katenary/blob/develop/generator/cronJob.go#L22-L25>)
+## type [CronJob](<https://github.com/katenary/katenary/blob/master/internal/generator/cronJob.go#L22-L25>)
 
 CronJob is a kubernetes CronJob.
 
@@ -244,7 +253,7 @@ type CronJob struct {
 ```
 
 <a name="CronJob.Filename"></a>
-### func \(\*CronJob\) [Filename](<https://github.com/metal3d/katenary/blob/develop/generator/cronJob.go#L114>)
+### func \(\*CronJob\) [Filename](<https://github.com/katenary/katenary/blob/master/internal/generator/cronJob.go#L114>)
 
 ```go
 func (c *CronJob) Filename() string
@@ -255,7 +264,7 @@ Filename returns the filename of the cronjob.
 Implements the Yaml interface.
 
 <a name="CronJob.Yaml"></a>
-### func \(\*CronJob\) [Yaml](<https://github.com/metal3d/katenary/blob/develop/generator/cronJob.go#L121>)
+### func \(\*CronJob\) [Yaml](<https://github.com/katenary/katenary/blob/master/internal/generator/cronJob.go#L121>)
 
 ```go
 func (c *CronJob) Yaml() ([]byte, error)
@@ -266,7 +275,7 @@ Yaml returns the yaml representation of the cronjob.
 Implements the Yaml interface.
 
 <a name="CronJobValue"></a>
-## type [CronJobValue](<https://github.com/metal3d/katenary/blob/develop/generator/values.go#L113-L118>)
+## type [CronJobValue](<https://github.com/katenary/katenary/blob/master/internal/generator/values.go#L118-L123>)
 
 CronJobValue is a cronjob configuration that will be saved in values.yaml.
 
@@ -280,7 +289,7 @@ type CronJobValue struct {
 ```
 
 <a name="DataMap"></a>
-## type [DataMap](<https://github.com/metal3d/katenary/blob/develop/generator/types.go#L4-L7>)
+## type [DataMap](<https://github.com/katenary/katenary/blob/master/internal/generator/types.go#L4-L7>)
 
 DataMap is a kubernetes ConfigMap or Secret. It can be used to add data to the ConfigMap or Secret.
 
@@ -292,7 +301,7 @@ type DataMap interface {
 ```
 
 <a name="Deployment"></a>
-## type [Deployment](<https://github.com/metal3d/katenary/blob/develop/generator/deployment.go#L34-L44>)
+## type [Deployment](<https://github.com/katenary/katenary/blob/master/internal/generator/deployment.go#L34-L44>)
 
 Deployment is a kubernetes Deployment.
 
@@ -304,7 +313,7 @@ type Deployment struct {
 ```
 
 <a name="NewDeployment"></a>
-### func [NewDeployment](<https://github.com/metal3d/katenary/blob/develop/generator/deployment.go#L48>)
+### func [NewDeployment](<https://github.com/katenary/katenary/blob/master/internal/generator/deployment.go#L48>)
 
 ```go
 func NewDeployment(service types.ServiceConfig, chart *HelmChart) *Deployment
@@ -313,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.
 
 <a name="Deployment.AddContainer"></a>
-### func \(\*Deployment\) [AddContainer](<https://github.com/metal3d/katenary/blob/develop/generator/deployment.go#L115>)
+### func \(\*Deployment\) [AddContainer](<https://github.com/katenary/katenary/blob/master/internal/generator/deployment.go#L115>)
 
 ```go
 func (d *Deployment) AddContainer(service types.ServiceConfig)
@@ -322,7 +331,7 @@ func (d *Deployment) AddContainer(service types.ServiceConfig)
 AddContainer adds a container to the deployment.
 
 <a name="Deployment.AddHealthCheck"></a>
-### func \(\*Deployment\) [AddHealthCheck](<https://github.com/metal3d/katenary/blob/develop/generator/deployment.go#L160>)
+### func \(\*Deployment\) [AddHealthCheck](<https://github.com/katenary/katenary/blob/master/internal/generator/deployment.go#L161>)
 
 ```go
 func (d *Deployment) AddHealthCheck(service types.ServiceConfig, container *corev1.Container)
@@ -331,7 +340,7 @@ func (d *Deployment) AddHealthCheck(service types.ServiceConfig, container *core
 
 
 <a name="Deployment.AddIngress"></a>
-### func \(\*Deployment\) [AddIngress](<https://github.com/metal3d/katenary/blob/develop/generator/deployment.go#L189>)
+### func \(\*Deployment\) [AddIngress](<https://github.com/katenary/katenary/blob/master/internal/generator/deployment.go#L190>)
 
 ```go
 func (d *Deployment) AddIngress(service types.ServiceConfig, appName string) *Ingress
@@ -340,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.
 
 <a name="Deployment.AddLegacyVolume"></a>
-### func \(\*Deployment\) [AddLegacyVolume](<https://github.com/metal3d/katenary/blob/develop/generator/deployment.go#L219>)
+### func \(\*Deployment\) [AddLegacyVolume](<https://github.com/katenary/katenary/blob/master/internal/generator/deployment.go#L220>)
 
 ```go
 func (d *Deployment) AddLegacyVolume(name, kind string)
@@ -349,7 +358,7 @@ func (d *Deployment) AddLegacyVolume(name, kind string)
 
 
 <a name="Deployment.AddVolumes"></a>
-### func \(\*Deployment\) [AddVolumes](<https://github.com/metal3d/katenary/blob/develop/generator/deployment.go#L195>)
+### func \(\*Deployment\) [AddVolumes](<https://github.com/katenary/katenary/blob/master/internal/generator/deployment.go#L196>)
 
 ```go
 func (d *Deployment) AddVolumes(service types.ServiceConfig, appName string)
@@ -358,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.
 
 <a name="Deployment.BindFrom"></a>
-### func \(\*Deployment\) [BindFrom](<https://github.com/metal3d/katenary/blob/develop/generator/deployment.go#L240>)
+### func \(\*Deployment\) [BindFrom](<https://github.com/katenary/katenary/blob/master/internal/generator/deployment.go#L241>)
 
 ```go
 func (d *Deployment) BindFrom(service types.ServiceConfig, binded *Deployment)
@@ -367,7 +376,7 @@ func (d *Deployment) BindFrom(service types.ServiceConfig, binded *Deployment)
 
 
 <a name="Deployment.BindMapFilesToContainer"></a>
-### func \(\*Deployment\) [BindMapFilesToContainer](<https://github.com/metal3d/katenary/blob/develop/generator/deployment.go#L377>)
+### func \(\*Deployment\) [BindMapFilesToContainer](<https://github.com/katenary/katenary/blob/master/internal/generator/deployment.go#L375>)
 
 ```go
 func (d *Deployment) BindMapFilesToContainer(service types.ServiceConfig, secrets []string, appName string) (*corev1.Container, int)
@@ -376,7 +385,7 @@ func (d *Deployment) BindMapFilesToContainer(service types.ServiceConfig, secret
 
 
 <a name="Deployment.DependsOn"></a>
-### func \(\*Deployment\) [DependsOn](<https://github.com/metal3d/katenary/blob/develop/generator/deployment.go#L268>)
+### func \(\*Deployment\) [DependsOn](<https://github.com/katenary/katenary/blob/master/internal/generator/deployment.go#L269>)
 
 ```go
 func (d *Deployment) DependsOn(to *Deployment, servicename string) error
@@ -385,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.
 
 <a name="Deployment.Filename"></a>
-### func \(\*Deployment\) [Filename](<https://github.com/metal3d/katenary/blob/develop/generator/deployment.go#L299>)
+### func \(\*Deployment\) [Filename](<https://github.com/katenary/katenary/blob/master/internal/generator/deployment.go#L300>)
 
 ```go
 func (d *Deployment) Filename() string
@@ -394,7 +403,7 @@ func (d *Deployment) Filename() string
 Filename returns the filename of the deployment.
 
 <a name="Deployment.MountExchangeVolumes"></a>
-### func \(\*Deployment\) [MountExchangeVolumes](<https://github.com/metal3d/katenary/blob/develop/generator/deployment.go#L428>)
+### func \(\*Deployment\) [MountExchangeVolumes](<https://github.com/katenary/katenary/blob/master/internal/generator/deployment.go#L426>)
 
 ```go
 func (d *Deployment) MountExchangeVolumes()
@@ -403,7 +412,7 @@ func (d *Deployment) MountExchangeVolumes()
 
 
 <a name="Deployment.SetEnvFrom"></a>
-### func \(\*Deployment\) [SetEnvFrom](<https://github.com/metal3d/katenary/blob/develop/generator/deployment.go#L304>)
+### func \(\*Deployment\) [SetEnvFrom](<https://github.com/katenary/katenary/blob/master/internal/generator/deployment.go#L305>)
 
 ```go
 func (d *Deployment) SetEnvFrom(service types.ServiceConfig, appName string, samePod ...bool)
@@ -412,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.
 
 <a name="Deployment.Yaml"></a>
-### func \(\*Deployment\) [Yaml](<https://github.com/metal3d/katenary/blob/develop/generator/deployment.go#L452>)
+### func \(\*Deployment\) [Yaml](<https://github.com/katenary/katenary/blob/master/internal/generator/deployment.go#L450>)
 
 ```go
 func (d *Deployment) Yaml() ([]byte, error)
@@ -421,7 +430,7 @@ func (d *Deployment) Yaml() ([]byte, error)
 Yaml returns the yaml representation of the deployment.
 
 <a name="FileMapUsage"></a>
-## type [FileMapUsage](<https://github.com/metal3d/katenary/blob/develop/generator/configMap.go#L19>)
+## type [FileMapUsage](<https://github.com/katenary/katenary/blob/master/internal/generator/configMap.go#L21>)
 
 FileMapUsage is the usage of the filemap.
 
@@ -439,7 +448,7 @@ const (
 ```
 
 <a name="HelmChart"></a>
-## type [HelmChart](<https://github.com/metal3d/katenary/blob/develop/generator/chart.go#L38-L51>)
+## type [HelmChart](<https://github.com/katenary/katenary/blob/master/internal/generator/chart.go#L41-L54>)
 
 HelmChart is a Helm Chart representation. It contains all the templates, values, versions, helpers...
 
@@ -451,18 +460,18 @@ type HelmChart struct {
 
     Name         string                    `yaml:"name"`
     Icon         string                    `yaml:"icon,omitempty"`
-    ApiVersion   string                    `yaml:"apiVersion"`
+    APIVersion   string                    `yaml:"apiVersion"`
     Version      string                    `yaml:"version"`
     AppVersion   string                    `yaml:"appVersion"`
     Description  string                    `yaml:"description"`
     Helper       string                    `yaml:"-"`
-    Dependencies []labelStructs.Dependency `yaml:"dependencies,omitempty"`
+    Dependencies []labelstructs.Dependency `yaml:"dependencies,omitempty"`
     // contains filtered or unexported fields
 }
 ```
 
 <a name="Generate"></a>
-### func [Generate](<https://github.com/metal3d/katenary/blob/develop/generator/generator.go#L29>)
+### func [Generate](<https://github.com/katenary/katenary/blob/master/internal/generator/generator.go#L32>)
 
 ```go
 func Generate(project *types.Project) (*HelmChart, error)
@@ -482,7 +491,7 @@ The Generate function will create the HelmChart object this way:
 - Merge the same\-pod services.
 
 <a name="NewChart"></a>
-### func [NewChart](<https://github.com/metal3d/katenary/blob/develop/generator/chart.go#L54>)
+### func [NewChart](<https://github.com/katenary/katenary/blob/master/internal/generator/chart.go#L57>)
 
 ```go
 func NewChart(name string) *HelmChart
@@ -491,7 +500,7 @@ func NewChart(name string) *HelmChart
 NewChart creates a new empty chart with the given name.
 
 <a name="HelmChart.SaveTemplates"></a>
-### func \(\*HelmChart\) [SaveTemplates](<https://github.com/metal3d/katenary/blob/develop/generator/chart.go#L69>)
+### func \(\*HelmChart\) [SaveTemplates](<https://github.com/katenary/katenary/blob/master/internal/generator/chart.go#L72>)
 
 ```go
 func (chart *HelmChart) SaveTemplates(templateDir string)
@@ -500,7 +509,7 @@ func (chart *HelmChart) SaveTemplates(templateDir string)
 SaveTemplates the templates of the chart to the given directory.
 
 <a name="Ingress"></a>
-## type [Ingress](<https://github.com/metal3d/katenary/blob/develop/generator/ingress.go#L17-L20>)
+## type [Ingress](<https://github.com/katenary/katenary/blob/master/internal/generator/ingress.go#L18-L22>)
 
 
 
@@ -512,7 +521,7 @@ type Ingress struct {
 ```
 
 <a name="NewIngress"></a>
-### func [NewIngress](<https://github.com/metal3d/katenary/blob/develop/generator/ingress.go#L23>)
+### func [NewIngress](<https://github.com/katenary/katenary/blob/master/internal/generator/ingress.go#L25>)
 
 ```go
 func NewIngress(service types.ServiceConfig, Chart *HelmChart) *Ingress
@@ -521,7 +530,7 @@ func NewIngress(service types.ServiceConfig, Chart *HelmChart) *Ingress
 NewIngress creates a new Ingress from a compose service.
 
 <a name="Ingress.Filename"></a>
-### func \(\*Ingress\) [Filename](<https://github.com/metal3d/katenary/blob/develop/generator/ingress.go#L122>)
+### func \(\*Ingress\) [Filename](<https://github.com/katenary/katenary/blob/master/internal/generator/ingress.go#L129>)
 
 ```go
 func (ingress *Ingress) Filename() string
@@ -530,7 +539,7 @@ func (ingress *Ingress) Filename() string
 
 
 <a name="Ingress.Yaml"></a>
-### func \(\*Ingress\) [Yaml](<https://github.com/metal3d/katenary/blob/develop/generator/ingress.go#L126>)
+### func \(\*Ingress\) [Yaml](<https://github.com/katenary/katenary/blob/master/internal/generator/ingress.go#L133>)
 
 ```go
 func (ingress *Ingress) Yaml() ([]byte, error)
@@ -539,7 +548,7 @@ func (ingress *Ingress) Yaml() ([]byte, error)
 
 
 <a name="IngressValue"></a>
-## type [IngressValue](<https://github.com/metal3d/katenary/blob/develop/generator/values.go#L28-L35>)
+## type [IngressValue](<https://github.com/katenary/katenary/blob/master/internal/generator/values.go#L29-L36>)
 
 IngressValue is a ingress configuration that will be saved in values.yaml.
 
@@ -555,7 +564,7 @@ type IngressValue struct {
 ```
 
 <a name="PersistenceValue"></a>
-## type [PersistenceValue](<https://github.com/metal3d/katenary/blob/develop/generator/values.go#L16-L21>)
+## type [PersistenceValue](<https://github.com/katenary/katenary/blob/master/internal/generator/values.go#L16-L21>)
 
 PersistenceValue is a persistence configuration that will be saved in values.yaml.
 
@@ -569,7 +578,7 @@ type PersistenceValue struct {
 ```
 
 <a name="RBAC"></a>
-## type [RBAC](<https://github.com/metal3d/katenary/blob/develop/generator/rbac.go#L20-L24>)
+## type [RBAC](<https://github.com/katenary/katenary/blob/master/internal/generator/rbac.go#L20-L24>)
 
 RBAC is a kubernetes RBAC containing a role, a rolebinding and an associated serviceaccount.
 
@@ -582,7 +591,7 @@ type RBAC struct {
 ```
 
 <a name="NewRBAC"></a>
-### func [NewRBAC](<https://github.com/metal3d/katenary/blob/develop/generator/rbac.go#L27>)
+### func [NewRBAC](<https://github.com/katenary/katenary/blob/master/internal/generator/rbac.go#L27>)
 
 ```go
 func NewRBAC(service types.ServiceConfig, appName string) *RBAC
@@ -591,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.
 
 <a name="RepositoryValue"></a>
-## type [RepositoryValue](<https://github.com/metal3d/katenary/blob/develop/generator/values.go#L10-L13>)
+## type [RepositoryValue](<https://github.com/katenary/katenary/blob/master/internal/generator/values.go#L10-L13>)
 
 RepositoryValue is a docker repository image and tag that will be saved in values.yaml.
 
@@ -603,7 +612,7 @@ type RepositoryValue struct {
 ```
 
 <a name="Role"></a>
-## type [Role](<https://github.com/metal3d/katenary/blob/develop/generator/rbac.go#L114-L117>)
+## type [Role](<https://github.com/katenary/katenary/blob/master/internal/generator/rbac.go#L114-L117>)
 
 Role is a kubernetes Role.
 
@@ -615,7 +624,7 @@ type Role struct {
 ```
 
 <a name="Role.Filename"></a>
-### func \(\*Role\) [Filename](<https://github.com/metal3d/katenary/blob/develop/generator/rbac.go#L119>)
+### func \(\*Role\) [Filename](<https://github.com/katenary/katenary/blob/master/internal/generator/rbac.go#L119>)
 
 ```go
 func (r *Role) Filename() string
@@ -624,7 +633,7 @@ func (r *Role) Filename() string
 
 
 <a name="Role.Yaml"></a>
-### func \(\*Role\) [Yaml](<https://github.com/metal3d/katenary/blob/develop/generator/rbac.go#L123>)
+### func \(\*Role\) [Yaml](<https://github.com/katenary/katenary/blob/master/internal/generator/rbac.go#L123>)
 
 ```go
 func (r *Role) Yaml() ([]byte, error)
@@ -633,7 +642,7 @@ func (r *Role) Yaml() ([]byte, error)
 
 
 <a name="RoleBinding"></a>
-## type [RoleBinding](<https://github.com/metal3d/katenary/blob/develop/generator/rbac.go#L100-L103>)
+## type [RoleBinding](<https://github.com/katenary/katenary/blob/master/internal/generator/rbac.go#L100-L103>)
 
 RoleBinding is a kubernetes RoleBinding.
 
@@ -645,7 +654,7 @@ type RoleBinding struct {
 ```
 
 <a name="RoleBinding.Filename"></a>
-### func \(\*RoleBinding\) [Filename](<https://github.com/metal3d/katenary/blob/develop/generator/rbac.go#L105>)
+### func \(\*RoleBinding\) [Filename](<https://github.com/katenary/katenary/blob/master/internal/generator/rbac.go#L105>)
 
 ```go
 func (r *RoleBinding) Filename() string
@@ -654,7 +663,7 @@ func (r *RoleBinding) Filename() string
 
 
 <a name="RoleBinding.Yaml"></a>
-### func \(\*RoleBinding\) [Yaml](<https://github.com/metal3d/katenary/blob/develop/generator/rbac.go#L109>)
+### func \(\*RoleBinding\) [Yaml](<https://github.com/katenary/katenary/blob/master/internal/generator/rbac.go#L109>)
 
 ```go
 func (r *RoleBinding) Yaml() ([]byte, error)
@@ -663,7 +672,7 @@ func (r *RoleBinding) Yaml() ([]byte, error)
 
 
 <a name="Secret"></a>
-## type [Secret](<https://github.com/metal3d/katenary/blob/develop/generator/secret.go#L22-L25>)
+## type [Secret](<https://github.com/katenary/katenary/blob/master/internal/generator/secret.go#L22-L25>)
 
 Secret is a kubernetes Secret.
 
@@ -677,7 +686,7 @@ type Secret struct {
 ```
 
 <a name="NewSecret"></a>
-### func [NewSecret](<https://github.com/metal3d/katenary/blob/develop/generator/secret.go#L28>)
+### func [NewSecret](<https://github.com/katenary/katenary/blob/master/internal/generator/secret.go#L28>)
 
 ```go
 func NewSecret(service types.ServiceConfig, appName string) *Secret
@@ -686,7 +695,7 @@ func NewSecret(service types.ServiceConfig, appName string) *Secret
 NewSecret creates a new Secret from a compose service
 
 <a name="Secret.AddData"></a>
-### func \(\*Secret\) [AddData](<https://github.com/metal3d/katenary/blob/develop/generator/secret.go#L70>)
+### func \(\*Secret\) [AddData](<https://github.com/katenary/katenary/blob/master/internal/generator/secret.go#L70>)
 
 ```go
 func (s *Secret) AddData(key, value string)
@@ -695,7 +704,7 @@ func (s *Secret) AddData(key, value string)
 AddData adds a key value pair to the secret.
 
 <a name="Secret.Filename"></a>
-### func \(\*Secret\) [Filename](<https://github.com/metal3d/katenary/blob/develop/generator/secret.go#L86>)
+### func \(\*Secret\) [Filename](<https://github.com/katenary/katenary/blob/master/internal/generator/secret.go#L86>)
 
 ```go
 func (s *Secret) Filename() string
@@ -704,7 +713,7 @@ func (s *Secret) Filename() string
 Filename returns the filename of the secret.
 
 <a name="Secret.SetData"></a>
-### func \(\*Secret\) [SetData](<https://github.com/metal3d/katenary/blob/develop/generator/secret.go#L91>)
+### func \(\*Secret\) [SetData](<https://github.com/katenary/katenary/blob/master/internal/generator/secret.go#L91>)
 
 ```go
 func (s *Secret) SetData(data map[string]string)
@@ -713,7 +722,7 @@ func (s *Secret) SetData(data map[string]string)
 SetData sets the data of the secret.
 
 <a name="Secret.Yaml"></a>
-### func \(\*Secret\) [Yaml](<https://github.com/metal3d/katenary/blob/develop/generator/secret.go#L98>)
+### func \(\*Secret\) [Yaml](<https://github.com/katenary/katenary/blob/master/internal/generator/secret.go#L98>)
 
 ```go
 func (s *Secret) Yaml() ([]byte, error)
@@ -722,7 +731,7 @@ func (s *Secret) Yaml() ([]byte, error)
 Yaml returns the yaml representation of the secret.
 
 <a name="Service"></a>
-## type [Service](<https://github.com/metal3d/katenary/blob/develop/generator/service.go#L17-L20>)
+## type [Service](<https://github.com/katenary/katenary/blob/master/internal/generator/service.go#L18-L21>)
 
 Service is a kubernetes Service.
 
@@ -734,7 +743,7 @@ type Service struct {
 ```
 
 <a name="NewService"></a>
-### func [NewService](<https://github.com/metal3d/katenary/blob/develop/generator/service.go#L23>)
+### func [NewService](<https://github.com/katenary/katenary/blob/master/internal/generator/service.go#L24>)
 
 ```go
 func NewService(service types.ServiceConfig, appName string) *Service
@@ -743,7 +752,7 @@ func NewService(service types.ServiceConfig, appName string) *Service
 NewService creates a new Service from a compose service.
 
 <a name="Service.AddPort"></a>
-### func \(\*Service\) [AddPort](<https://github.com/metal3d/katenary/blob/develop/generator/service.go#L52>)
+### func \(\*Service\) [AddPort](<https://github.com/katenary/katenary/blob/master/internal/generator/service.go#L53>)
 
 ```go
 func (s *Service) AddPort(port types.ServicePortConfig, serviceName ...string)
@@ -752,7 +761,7 @@ func (s *Service) AddPort(port types.ServicePortConfig, serviceName ...string)
 AddPort adds a port to the service.
 
 <a name="Service.Filename"></a>
-### func \(\*Service\) [Filename](<https://github.com/metal3d/katenary/blob/develop/generator/service.go#L76>)
+### func \(\*Service\) [Filename](<https://github.com/katenary/katenary/blob/master/internal/generator/service.go#L74>)
 
 ```go
 func (s *Service) Filename() string
@@ -761,7 +770,7 @@ func (s *Service) Filename() string
 Filename returns the filename of the service.
 
 <a name="Service.Yaml"></a>
-### func \(\*Service\) [Yaml](<https://github.com/metal3d/katenary/blob/develop/generator/service.go#L81>)
+### func \(\*Service\) [Yaml](<https://github.com/katenary/katenary/blob/master/internal/generator/service.go#L79>)
 
 ```go
 func (s *Service) Yaml() ([]byte, error)
@@ -770,7 +779,7 @@ func (s *Service) Yaml() ([]byte, error)
 Yaml returns the yaml representation of the service.
 
 <a name="ServiceAccount"></a>
-## type [ServiceAccount](<https://github.com/metal3d/katenary/blob/develop/generator/rbac.go#L132-L135>)
+## type [ServiceAccount](<https://github.com/katenary/katenary/blob/master/internal/generator/rbac.go#L132-L135>)
 
 ServiceAccount is a kubernetes ServiceAccount.
 
@@ -782,7 +791,7 @@ type ServiceAccount struct {
 ```
 
 <a name="ServiceAccount.Filename"></a>
-### func \(\*ServiceAccount\) [Filename](<https://github.com/metal3d/katenary/blob/develop/generator/rbac.go#L137>)
+### func \(\*ServiceAccount\) [Filename](<https://github.com/katenary/katenary/blob/master/internal/generator/rbac.go#L137>)
 
 ```go
 func (r *ServiceAccount) Filename() string
@@ -791,7 +800,7 @@ func (r *ServiceAccount) Filename() string
 
 
 <a name="ServiceAccount.Yaml"></a>
-### func \(\*ServiceAccount\) [Yaml](<https://github.com/metal3d/katenary/blob/develop/generator/rbac.go#L141>)
+### func \(\*ServiceAccount\) [Yaml](<https://github.com/katenary/katenary/blob/master/internal/generator/rbac.go#L141>)
 
 ```go
 func (r *ServiceAccount) Yaml() ([]byte, error)
@@ -800,18 +809,19 @@ func (r *ServiceAccount) Yaml() ([]byte, error)
 
 
 <a name="TLS"></a>
-## type [TLS](<https://github.com/metal3d/katenary/blob/develop/generator/values.go#L23-L25>)
+## type [TLS](<https://github.com/katenary/katenary/blob/master/internal/generator/values.go#L23-L26>)
 
 
 
 ```go
 type TLS struct {
-    Enabled bool `yaml:"enabled"`
+    Enabled    bool   `yaml:"enabled"`
+    SecretName string `yaml:"secretName"`
 }
 ```
 
 <a name="Value"></a>
-## type [Value](<https://github.com/metal3d/katenary/blob/develop/generator/values.go#L38-L49>)
+## type [Value](<https://github.com/katenary/katenary/blob/master/internal/generator/values.go#L39-L50>)
 
 Value will be saved in values.yaml. It contains configuration for all deployment and services.
 
@@ -831,7 +841,7 @@ type Value struct {
 ```
 
 <a name="NewValue"></a>
-### func [NewValue](<https://github.com/metal3d/katenary/blob/develop/generator/values.go#L56>)
+### func [NewValue](<https://github.com/katenary/katenary/blob/master/internal/generator/values.go#L57>)
 
 ```go
 func NewValue(service types.ServiceConfig, main ...bool) *Value
@@ -842,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.
 
 <a name="Value.AddIngress"></a>
-### func \(\*Value\) [AddIngress](<https://github.com/metal3d/katenary/blob/develop/generator/values.go#L89>)
+### func \(\*Value\) [AddIngress](<https://github.com/katenary/katenary/blob/master/internal/generator/values.go#L90>)
 
 ```go
 func (v *Value) AddIngress(host, path string)
@@ -851,7 +861,7 @@ func (v *Value) AddIngress(host, path string)
 
 
 <a name="Value.AddPersistence"></a>
-### func \(\*Value\) [AddPersistence](<https://github.com/metal3d/katenary/blob/develop/generator/values.go#L99>)
+### func \(\*Value\) [AddPersistence](<https://github.com/katenary/katenary/blob/master/internal/generator/values.go#L104>)
 
 ```go
 func (v *Value) AddPersistence(volumeName string)
@@ -860,7 +870,7 @@ func (v *Value) AddPersistence(volumeName string)
 AddPersistence adds persistence configuration to the Value.
 
 <a name="VolumeClaim"></a>
-## type [VolumeClaim](<https://github.com/metal3d/katenary/blob/develop/generator/volume.go#L18-L23>)
+## type [VolumeClaim](<https://github.com/katenary/katenary/blob/master/internal/generator/volume.go#L18-L23>)
 
 VolumeClaim is a kubernetes VolumeClaim. This is a PersistentVolumeClaim.
 
@@ -872,7 +882,7 @@ type VolumeClaim struct {
 ```
 
 <a name="NewVolumeClaim"></a>
-### func [NewVolumeClaim](<https://github.com/metal3d/katenary/blob/develop/generator/volume.go#L26>)
+### func [NewVolumeClaim](<https://github.com/katenary/katenary/blob/master/internal/generator/volume.go#L26>)
 
 ```go
 func NewVolumeClaim(service types.ServiceConfig, volumeName, appName string) *VolumeClaim
@@ -881,7 +891,7 @@ func NewVolumeClaim(service types.ServiceConfig, volumeName, appName string) *Vo
 NewVolumeClaim creates a new VolumeClaim from a compose service.
 
 <a name="VolumeClaim.Filename"></a>
-### func \(\*VolumeClaim\) [Filename](<https://github.com/metal3d/katenary/blob/develop/generator/volume.go#L62>)
+### func \(\*VolumeClaim\) [Filename](<https://github.com/katenary/katenary/blob/master/internal/generator/volume.go#L62>)
 
 ```go
 func (v *VolumeClaim) Filename() string
@@ -890,7 +900,7 @@ func (v *VolumeClaim) Filename() string
 Filename returns the suggested filename for a VolumeClaim.
 
 <a name="VolumeClaim.Yaml"></a>
-### func \(\*VolumeClaim\) [Yaml](<https://github.com/metal3d/katenary/blob/develop/generator/volume.go#L67>)
+### func \(\*VolumeClaim\) [Yaml](<https://github.com/katenary/katenary/blob/master/internal/generator/volume.go#L67>)
 
 ```go
 func (v *VolumeClaim) Yaml() ([]byte, error)
@@ -899,7 +909,7 @@ func (v *VolumeClaim) Yaml() ([]byte, error)
 Yaml marshals a VolumeClaim into yaml.
 
 <a name="Yaml"></a>
-## type [Yaml](<https://github.com/metal3d/katenary/blob/develop/generator/types.go#L10-L13>)
+## type [Yaml](<https://github.com/katenary/katenary/blob/master/internal/generator/types.go#L10-L13>)
 
 Yaml is a kubernetes object that can be converted to yaml.
 

doc/docs/packages/internal/generator/extrafiles.md

@@ -3,12 +3,12 @@
 # extrafiles
 
 ```go
-import "katenary/generator/extrafiles"
+import "github.com/katenary/katenary/internal/generator/extrafiles"
 ```
 
-extrafiles package provides function to generate the Chart files that are not objects. Like README.md and notes.txt...
+Package extrafiles provides function to generate the Chart files that are not objects. Like README.md and notes.txt...
 
-## func [NotesFile](<https://github.com/metal3d/katenary/blob/develop/generator/extrafiles/notes.go#L13>)
+## func [NotesFile](<https://github.com/katenary/katenary/blob/master/internal/generator/extrafiles/notes.go#L13>)
 
 ```go
 func NotesFile(services []string) string
@@ -17,7 +17,7 @@ func NotesFile(services []string) string
 NotesFile returns the content of the note.txt file.
 
 <a name="ReadMeFile"></a>
-## func [ReadMeFile](<https://github.com/metal3d/katenary/blob/develop/generator/extrafiles/readme.go#L45>)
+## func [ReadMeFile](<https://github.com/katenary/katenary/blob/master/internal/generator/extrafiles/readme.go#L46>)
 
 ```go
 func ReadMeFile(charname, description string, values map[string]any) string

doc/docs/packages/internal/generator/katenaryfile.md

@@ -0,0 +1,67 @@
+<!-- Code generated by gomarkdoc. DO NOT EDIT -->
+
+# katenaryfile
+
+```go
+import "github.com/katenary/katenary/internal/generator/katenaryfile"
+```
+
+Package katenaryfile is a package for reading and writing katenary files.
+
+A katenary file, named "katenary.yml" or "katenary.yaml", is a file where you can define the configuration of the conversion avoiding the use of labels in the compose file.
+
+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](<https://github.com/katenary/katenary/blob/master/internal/generator/katenaryfile/main.go#L137>)
+
+```go
+func GenerateSchema() string
+```
+
+GenerateSchema generates the schema for the katenary.yaml file.
+
+<a name="OverrideWithConfig"></a>
+## func [OverrideWithConfig](<https://github.com/katenary/katenary/blob/master/internal/generator/katenaryfile/main.go#L49>)
+
+```go
+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.
+
+<a name="Service"></a>
+## type [Service](<https://github.com/katenary/katenary/blob/master/internal/generator/katenaryfile/main.go#L27-L44>)
+
+Service is a struct that contains the service configuration for katenary
+
+```go
+type Service struct {
+    MainApp         *bool                          `yaml:"main-app,omitempty" json:"main-app,omitempty" jsonschema:"title=Is this service the main application"`
+    Values          []StringOrMap                  `yaml:"values,omitempty" json:"values,omitempty" jsonschema:"description=Environment variables to be set in values.yaml with or without a description"`
+    Secrets         *labelstructs.Secrets          `yaml:"secrets,omitempty" json:"secrets,omitempty" jsonschema:"title=Secrets,description=Environment variables to be set as secrets"`
+    Ports           *labelstructs.Ports            `yaml:"ports,omitempty" json:"ports,omitempty" jsonschema:"title=Ports,description=Ports to be exposed in services"`
+    Ingress         *labelstructs.Ingress          `yaml:"ingress,omitempty" json:"ingress,omitempty" jsonschema:"title=Ingress,description=Ingress configuration"`
+    HealthCheck     *labelstructs.HealthCheck      `yaml:"health-check,omitempty" json:"health-check,omitempty" jsonschema:"title=Health Check,description=Health check configuration that respects the kubernetes api"`
+    SamePod         *string                        `yaml:"same-pod,omitempty" json:"same-pod,omitempty" jsonschema:"title=Same Pod,description=Service that should be in the same pod"`
+    Description     *string                        `yaml:"description,omitempty" json:"description,omitempty" jsonschema:"title=Description,description=Description of the service that will be injected in the values.yaml file"`
+    Ignore          *bool                          `yaml:"ignore,omitempty" json:"ignore,omitempty" jsonschema:"title=Ignore,description=Ignore the service in the conversion"`
+    Dependencies    []labelstructs.Dependency      `yaml:"dependencies,omitempty" json:"dependencies,omitempty" jsonschema:"title=Dependencies,description=Services that should be injected in the Chart.yaml file"`
+    ConfigMapFiles  *labelstructs.ConfigMapFiles   `yaml:"configmap-files,omitempty" json:"configmap-files,omitempty" jsonschema:"title=ConfigMap Files,description=Files that should be injected as ConfigMap"`
+    MapEnv          *labelstructs.MapEnv           `yaml:"map-env,omitempty" json:"map-env,omitempty" jsonschema:"title=Map Env,description=Map environment variables to another value"`
+    CronJob         *labelstructs.CronJob          `yaml:"cron-job,omitempty" json:"cron-job,omitempty" jsonschema:"title=Cron Job,description=Cron Job configuration"`
+    EnvFrom         *labelstructs.EnvFrom          `yaml:"env-from,omitempty" json:"env-from,omitempty" jsonschema:"title=Env From,description=Inject environment variables from another service"`
+    ExchangeVolumes []*labelstructs.ExchangeVolume `yaml:"exchange-volumes,omitempty" json:"exchange-volumes,omitempty" jsonschema:"title=Exchange Volumes,description=Exchange volumes between services"`
+    ValuesFrom      *labelstructs.ValueFrom        `yaml:"values-from,omitempty" json:"values-from,omitempty" jsonschema:"title=Values From,description=Inject values from another service (secret or configmap environment variables)"`
+}
+```
+
+<a name="StringOrMap"></a>
+## type [StringOrMap](<https://github.com/katenary/katenary/blob/master/internal/generator/katenaryfile/main.go#L24>)
+
+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
+
+```go
+type StringOrMap any
+```
+
+Generated by [gomarkdoc](<https://github.com/princjef/gomarkdoc>)

doc/docs/packages/internal/generator/labels.md

@@ -3,9 +3,11 @@
 # labels
 
 ```go
-import "katenary/generator/labels"
+import "github.com/katenary/katenary/internal/generator/labels"
 ```
 
+Package labels provides functionality to parse and manipulate labels.
+
 ## Constants
 
 <a name="KatenaryLabelPrefix"></a>
@@ -15,16 +17,16 @@ const KatenaryLabelPrefix = "katenary.v3"
 ```
 
 <a name="GetLabelHelp"></a>
-## func [GetLabelHelp](<https://github.com/metal3d/katenary/blob/develop/generator/labels/katenaryLabels.go#L87>)
+## func [GetLabelHelp](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/katenaryLabels.go#L88>)
 
 ```go
 func GetLabelHelp(asMarkdown bool) string
 ```
 
-Generate the help for the labels.
+GetLabelHelp return the help for the labels.
 
 <a name="GetLabelHelpFor"></a>
-## func [GetLabelHelpFor](<https://github.com/metal3d/katenary/blob/develop/generator/labels/katenaryLabels.go#L96>)
+## func [GetLabelHelpFor](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/katenaryLabels.go#L97>)
 
 ```go
 func GetLabelHelpFor(labelname string, asMarkdown bool) string
@@ -33,7 +35,7 @@ func GetLabelHelpFor(labelname string, asMarkdown bool) string
 GetLabelHelpFor returns the help for a specific label.
 
 <a name="GetLabelNames"></a>
-## func [GetLabelNames](<https://github.com/metal3d/katenary/blob/develop/generator/labels/katenaryLabels.go#L71>)
+## func [GetLabelNames](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/katenaryLabels.go#L72>)
 
 ```go
 func GetLabelNames() []string
@@ -42,7 +44,7 @@ func GetLabelNames() []string
 GetLabelNames returns a sorted list of all katenary label names.
 
 <a name="Prefix"></a>
-## func [Prefix](<https://github.com/metal3d/katenary/blob/develop/generator/labels/katenaryLabels.go#L224>)
+## func [Prefix](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/katenaryLabels.go#L235>)
 
 ```go
 func Prefix() string
@@ -51,7 +53,7 @@ func Prefix() string
 
 
 <a name="Help"></a>
-## type [Help](<https://github.com/metal3d/katenary/blob/develop/generator/labels/katenaryLabels.go#L63-L68>)
+## type [Help](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/katenaryLabels.go#L64-L69>)
 
 Help is the documentation of a label.
 
@@ -65,7 +67,7 @@ type Help struct {
 ```
 
 <a name="Label"></a>
-## type [Label](<https://github.com/metal3d/katenary/blob/develop/generator/labels/katenaryLabels.go#L56>)
+## type [Label](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/katenaryLabels.go#L57>)
 
 Label is a katenary label to find in compose files.
 
@@ -92,12 +94,12 @@ const (
     LabelCronJob        Label = KatenaryLabelPrefix + "/cronjob"
     LabelEnvFrom        Label = KatenaryLabelPrefix + "/env-from"
     LabelExchangeVolume Label = KatenaryLabelPrefix + "/exchange-volumes"
-    LabelValueFrom      Label = KatenaryLabelPrefix + "/values-from"
+    LabelValuesFrom     Label = KatenaryLabelPrefix + "/values-from"
 )
 ```
 
 <a name="LabelName"></a>
-### func [LabelName](<https://github.com/metal3d/katenary/blob/develop/generator/labels/katenaryLabels.go#L58>)
+### func [LabelName](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/katenaryLabels.go#L59>)
 
 ```go
 func LabelName(name string) Label

doc/docs/packages/internal/generator/labels/labelstructs.md

@@ -1,32 +1,32 @@
 <!-- Code generated by gomarkdoc. DO NOT EDIT -->
 
-# labelStructs
+# labelstructs
 
 ```go
-import "katenary/generator/labels/labelStructs"
+import "github.com/katenary/katenary/internal/generator/labels/labelstructs"
 ```
 
-labelStructs is a package that contains the structs used to represent the labels in the yaml files.
+Package labelstructs is a package that contains the structs used to represent the labels in the yaml files.
 
-## type [ConfigMapFile](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/configMap.go#L5>)
+## type [ConfigMapFiles](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/configMap.go#L5>)
 
 
 
 ```go
-type ConfigMapFile []string
+type ConfigMapFiles []string
 ```
 
 <a name="ConfigMapFileFrom"></a>
-### func [ConfigMapFileFrom](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/configMap.go#L7>)
+### func [ConfigMapFileFrom](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/configMap.go#L7>)
 
 ```go
-func ConfigMapFileFrom(data string) (ConfigMapFile, error)
+func ConfigMapFileFrom(data string) (ConfigMapFiles, error)
 ```
 
 
 
 <a name="CronJob"></a>
-## type [CronJob](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/cronJob.go#L5-L10>)
+## type [CronJob](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/cronJob.go#L5-L10>)
 
 
 
@@ -40,7 +40,7 @@ type CronJob struct {
 ```
 
 <a name="CronJobFrom"></a>
-### func [CronJobFrom](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/cronJob.go#L12>)
+### func [CronJobFrom](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/cronJob.go#L12>)
 
 ```go
 func CronJobFrom(data string) (*CronJob, error)
@@ -49,7 +49,7 @@ func CronJobFrom(data string) (*CronJob, error)
 
 
 <a name="Dependency"></a>
-## type [Dependency](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/dependencies.go#L6-L12>)
+## type [Dependency](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/dependencies.go#L6-L12>)
 
 Dependency is a dependency of a chart to other charts.
 
@@ -64,7 +64,7 @@ type Dependency struct {
 ```
 
 <a name="DependenciesFrom"></a>
-### func [DependenciesFrom](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/dependencies.go#L15>)
+### func [DependenciesFrom](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/dependencies.go#L15>)
 
 ```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.
 
 <a name="EnvFrom"></a>
-## type [EnvFrom](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/envFrom.go#L5>)
+## type [EnvFrom](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/envFrom.go#L5>)
 
 
 
@@ -82,7 +82,7 @@ type EnvFrom []string
 ```
 
 <a name="EnvFromFrom"></a>
-### func [EnvFromFrom](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/envFrom.go#L8>)
+### func [EnvFromFrom](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/envFrom.go#L8>)
 
 ```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.
 
 <a name="ExchangeVolume"></a>
-## type [ExchangeVolume](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/exchangeVolume.go#L5-L10>)
+## type [ExchangeVolume](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/exchangeVolume.go#L5-L10>)
 
 
 
@@ -105,7 +105,7 @@ type ExchangeVolume struct {
 ```
 
 <a name="NewExchangeVolumes"></a>
-### func [NewExchangeVolumes](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/exchangeVolume.go#L12>)
+### func [NewExchangeVolumes](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/exchangeVolume.go#L12>)
 
 ```go
 func NewExchangeVolumes(data string) ([]*ExchangeVolume, error)
@@ -114,7 +114,7 @@ func NewExchangeVolumes(data string) ([]*ExchangeVolume, error)
 
 
 <a name="HealthCheck"></a>
-## type [HealthCheck](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/probes.go#L11-L14>)
+## type [HealthCheck](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/probes.go#L11-L14>)
 
 
 
@@ -126,7 +126,7 @@ type HealthCheck struct {
 ```
 
 <a name="ProbeFrom"></a>
-### func [ProbeFrom](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/probes.go#L16>)
+### func [ProbeFrom](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/probes.go#L16>)
 
 ```go
 func ProbeFrom(data string) (*HealthCheck, error)
@@ -135,7 +135,7 @@ func ProbeFrom(data string) (*HealthCheck, error)
 
 
 <a name="Ingress"></a>
-## type [Ingress](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/ingress.go#L14-L22>)
+## type [Ingress](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/ingress.go#L14-L22>)
 
 
 
@@ -143,16 +143,16 @@ func ProbeFrom(data string) (*HealthCheck, error)
 type Ingress struct {
     Port        *int32            `yaml:"port,omitempty" json:"port,omitempty"`
     Annotations map[string]string `yaml:"annotations,omitempty" jsonschema:"nullable" json:"annotations,omitempty"`
-    Hostname    string            `yaml:"hostname" json:"hostname,omitempty"`
+    Hostname    string            `yaml:"hostname,omitempty" json:"hostname,omitempty"`
     Path        *string           `yaml:"path,omitempty" json:"path,omitempty"`
     Class       *string           `yaml:"class,omitempty" json:"class,omitempty" jsonschema:"default:-"`
-    Enabled     bool              `yaml:"enabled" json:"enabled,omitempty"`
+    Enabled     bool              `yaml:"enabled,omitempty" json:"enabled,omitempty"`
     TLS         *TLS              `yaml:"tls,omitempty" json:"tls,omitempty"`
 }
 ```
 
 <a name="IngressFrom"></a>
-### func [IngressFrom](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/ingress.go#L25>)
+### func [IngressFrom](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/ingress.go#L25>)
 
 ```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.
 
 <a name="MapEnv"></a>
-## type [MapEnv](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/mapenv.go#L5>)
+## type [MapEnv](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/mapenv.go#L5>)
 
 
 
@@ -170,7 +170,7 @@ type MapEnv map[string]string
 ```
 
 <a name="MapEnvFrom"></a>
-### func [MapEnvFrom](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/mapenv.go#L8>)
+### func [MapEnvFrom](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/mapenv.go#L8>)
 
 ```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.
 
 <a name="Ports"></a>
-## type [Ports](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/ports.go#L5>)
+## type [Ports](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/ports.go#L5>)
 
 
 
@@ -188,7 +188,7 @@ type Ports []uint32
 ```
 
 <a name="PortsFrom"></a>
-### func [PortsFrom](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/ports.go#L8>)
+### func [PortsFrom](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/ports.go#L8>)
 
 ```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.
 
 <a name="Secrets"></a>
-## type [Secrets](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/secrets.go#L5>)
+## type [Secrets](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/secrets.go#L5>)
 
 
 
@@ -206,7 +206,7 @@ type Secrets []string
 ```
 
 <a name="SecretsFrom"></a>
-### func [SecretsFrom](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/secrets.go#L7>)
+### func [SecretsFrom](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/secrets.go#L7>)
 
 ```go
 func SecretsFrom(data string) (Secrets, error)
@@ -215,7 +215,7 @@ func SecretsFrom(data string) (Secrets, error)
 
 
 <a name="TLS"></a>
-## type [TLS](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/ingress.go#L10-L12>)
+## type [TLS](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/ingress.go#L10-L12>)
 
 
 
@@ -226,7 +226,7 @@ type TLS struct {
 ```
 
 <a name="ValueFrom"></a>
-## type [ValueFrom](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/valueFrom.go#L5>)
+## type [ValueFrom](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/valueFrom.go#L5>)
 
 
 
@@ -235,7 +235,7 @@ type ValueFrom map[string]string
 ```
 
 <a name="GetValueFrom"></a>
-### func [GetValueFrom](<https://github.com/metal3d/katenary/blob/develop/generator/labels/labelStructs/valueFrom.go#L7>)
+### func [GetValueFrom](<https://github.com/katenary/katenary/blob/master/internal/generator/labels/labelstructs/valueFrom.go#L7>)
 
 ```go
 func GetValueFrom(data string) (*ValueFrom, error)

doc/docs/packages/internal/parser.md

@@ -3,12 +3,12 @@
 # parser
 
 ```go
-import "katenary/parser"
+import "github.com/katenary/katenary/internal/parser"
 ```
 
-Parser package is a wrapper around compose\-go to parse compose files.
+Package parser is a wrapper around compose\-go to parse compose files.
 
-## func [Parse](<https://github.com/metal3d/katenary/blob/develop/parser/main.go#L29>)
+## func [Parse](<https://github.com/katenary/katenary/blob/master/internal/parser/main.go#L29>)
 
 ```go
 func Parse(profiles []string, envFiles []string, dockerComposeFile ...string) (*types.Project, error)

doc/docs/packages/internal/utils.md

@@ -3,12 +3,21 @@
 # utils
 
 ```go
-import "katenary/utils"
+import "github.com/katenary/katenary/internal/utils"
 ```
 
-Utils package provides some utility functions used in katenary. It defines some constants and functions used in the whole project.
+Package utils provides some utility functions used in katenary. It defines some constants and functions used in the whole project.
 
-## func [AsResourceName](<https://github.com/metal3d/katenary/blob/develop/utils/utils.go#L191>)
+## Constants
+
+<a name="DirectoryPermission"></a>DirectoryPermission is the default values for permissions apply to created directories.
+
+```go
+const DirectoryPermission = 0o755
+```
+
+<a name="AsResourceName"></a>
+## func [AsResourceName](<https://github.com/katenary/katenary/blob/master/internal/utils/utils.go#L196>)
 
 ```go
 func AsResourceName(name string) string
@@ -17,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.
 
 <a name="Confirm"></a>
-## func [Confirm](<https://github.com/metal3d/katenary/blob/develop/utils/utils.go#L161>)
+## func [Confirm](<https://github.com/katenary/katenary/blob/master/internal/utils/utils.go#L164>)
 
 ```go
 func Confirm(question string, icon ...Icon) bool
@@ -26,7 +35,7 @@ func Confirm(question string, icon ...Icon) bool
 Confirm asks a question and returns true if the answer is y.
 
 <a name="CountStartingSpaces"></a>
-## func [CountStartingSpaces](<https://github.com/metal3d/katenary/blob/develop/utils/utils.go#L38>)
+## func [CountStartingSpaces](<https://github.com/katenary/katenary/blob/master/internal/utils/utils.go#L41>)
 
 ```go
 func CountStartingSpaces(line string) int
@@ -35,7 +44,7 @@ func CountStartingSpaces(line string) int
 CountStartingSpaces counts the number of spaces at the beginning of a string.
 
 <a name="EncodeBasicYaml"></a>
-## func [EncodeBasicYaml](<https://github.com/metal3d/katenary/blob/develop/utils/utils.go#L173>)
+## func [EncodeBasicYaml](<https://github.com/katenary/katenary/blob/master/internal/utils/utils.go#L178>)
 
 ```go
 func EncodeBasicYaml(data any) ([]byte, error)
@@ -44,7 +53,7 @@ func EncodeBasicYaml(data any) ([]byte, error)
 EncodeBasicYaml encodes a basic yaml from an interface.
 
 <a name="FixedResourceName"></a>
-## func [FixedResourceName](<https://github.com/metal3d/katenary/blob/develop/utils/utils.go#L185>)
+## func [FixedResourceName](<https://github.com/katenary/katenary/blob/master/internal/utils/utils.go#L190>)
 
 ```go
 func FixedResourceName(name string) string
@@ -53,7 +62,7 @@ func FixedResourceName(name string) string
 FixedResourceName returns a resource name without underscores to respect the kubernetes naming convention.
 
 <a name="GetContainerByName"></a>
-## func [GetContainerByName](<https://github.com/metal3d/katenary/blob/develop/utils/utils.go#L84>)
+## func [GetContainerByName](<https://github.com/katenary/katenary/blob/master/internal/utils/utils.go#L87>)
 
 ```go
 func GetContainerByName(name string, containers []corev1.Container) (*corev1.Container, int)
@@ -62,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.
 
 <a name="GetKind"></a>
-## func [GetKind](<https://github.com/metal3d/katenary/blob/develop/utils/utils.go#L51>)
+## func [GetKind](<https://github.com/katenary/katenary/blob/master/internal/utils/utils.go#L54>)
 
 ```go
 func GetKind(path string) (kind string)
@@ -71,7 +80,7 @@ func GetKind(path string) (kind string)
 GetKind returns the kind of the resource from the file path.
 
 <a name="GetServiceNameByPort"></a>
-## func [GetServiceNameByPort](<https://github.com/metal3d/katenary/blob/develop/utils/utils.go#L74>)
+## func [GetServiceNameByPort](<https://github.com/katenary/katenary/blob/master/internal/utils/utils.go#L77>)
 
 ```go
 func GetServiceNameByPort(port int) string
@@ -80,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.
 
 <a name="GetValuesFromLabel"></a>
-## func [GetValuesFromLabel](<https://github.com/metal3d/katenary/blob/develop/utils/utils.go#L126>)
+## func [GetValuesFromLabel](<https://github.com/katenary/katenary/blob/master/internal/utils/utils.go#L129>)
 
 ```go
 func GetValuesFromLabel(service types.ServiceConfig, LabelValues string) map[string]*EnvConfig
@@ -89,7 +98,7 @@ func GetValuesFromLabel(service types.ServiceConfig, LabelValues string) map[str
 GetValuesFromLabel returns a map of values from a label.
 
 <a name="HashComposefiles"></a>
-## func [HashComposefiles](<https://github.com/metal3d/katenary/blob/develop/utils/hash.go#L12>)
+## func [HashComposefiles](<https://github.com/katenary/katenary/blob/master/internal/utils/hash.go#L12>)
 
 ```go
 func HashComposefiles(files []string) (string, error)
@@ -98,7 +107,7 @@ func HashComposefiles(files []string) (string, error)
 HashComposefiles returns a hash of the compose files.
 
 <a name="Int32Ptr"></a>
-## func [Int32Ptr](<https://github.com/metal3d/katenary/blob/develop/utils/utils.go#L32>)
+## func [Int32Ptr](<https://github.com/katenary/katenary/blob/master/internal/utils/utils.go#L35>)
 
 ```go
 func Int32Ptr(i int32) *int32
@@ -107,7 +116,7 @@ func Int32Ptr(i int32) *int32
 Int32Ptr returns a pointer to an int32.
 
 <a name="PathToName"></a>
-## func [PathToName](<https://github.com/metal3d/katenary/blob/develop/utils/utils.go#L103>)
+## func [PathToName](<https://github.com/katenary/katenary/blob/master/internal/utils/utils.go#L106>)
 
 ```go
 func PathToName(path string) string
@@ -116,7 +125,7 @@ func PathToName(path string) string
 PathToName converts a path to a kubernetes complient name.
 
 <a name="StrPtr"></a>
-## func [StrPtr](<https://github.com/metal3d/katenary/blob/develop/utils/utils.go#L35>)
+## func [StrPtr](<https://github.com/katenary/katenary/blob/master/internal/utils/utils.go#L38>)
 
 ```go
 func StrPtr(s string) *string
@@ -125,7 +134,7 @@ func StrPtr(s string) *string
 StrPtr returns a pointer to a string.
 
 <a name="TplName"></a>
-## func [TplName](<https://github.com/metal3d/katenary/blob/develop/utils/utils.go#L19>)
+## func [TplName](<https://github.com/katenary/katenary/blob/master/internal/utils/utils.go#L22>)
 
 ```go
 func TplName(serviceName, appname string, suffix ...string) string
@@ -134,25 +143,25 @@ 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.
 
 <a name="TplValue"></a>
-## func [TplValue](<https://github.com/metal3d/katenary/blob/develop/utils/utils.go#L94>)
+## func [TplValue](<https://github.com/katenary/katenary/blob/master/internal/utils/utils.go#L97>)
 
 ```go
 func TplValue(serviceName, variable string, pipes ...string) string
 ```
 
-GetContainerByName returns a container by name and its index in the array.
+TplValue returns a string that can be used in a template to access a value from the values file.
 
 <a name="Warn"></a>
-## func [Warn](<https://github.com/metal3d/katenary/blob/develop/utils/icons.go#L25>)
+## func [Warn](<https://github.com/katenary/katenary/blob/master/internal/utils/icons.go#L25>)
 
 ```go
-func Warn(msg ...interface{})
+func Warn(msg ...any)
 ```
 
 Warn prints a warning message
 
 <a name="WordWrap"></a>
-## func [WordWrap](<https://github.com/metal3d/katenary/blob/develop/utils/utils.go#L156>)
+## func [WordWrap](<https://github.com/katenary/katenary/blob/master/internal/utils/utils.go#L159>)
 
 ```go
 func WordWrap(text string, lineWidth int) string
@@ -161,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.
 
 <a name="Wrap"></a>
-## func [Wrap](<https://github.com/metal3d/katenary/blob/develop/utils/utils.go#L68>)
+## func [Wrap](<https://github.com/katenary/katenary/blob/master/internal/utils/utils.go#L71>)
 
 ```go
 func Wrap(src, above, below string) string
@@ -170,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.
 
 <a name="EnvConfig"></a>
-## type [EnvConfig](<https://github.com/metal3d/katenary/blob/develop/utils/utils.go#L120-L123>)
+## type [EnvConfig](<https://github.com/katenary/katenary/blob/master/internal/utils/utils.go#L123-L126>)
 
 EnvConfig is a struct to hold the description of an environment variable.
 
@@ -182,7 +191,7 @@ type EnvConfig struct {
 ```
 
 <a name="Icon"></a>
-## type [Icon](<https://github.com/metal3d/katenary/blob/develop/utils/icons.go#L6>)
+## type [Icon](<https://github.com/katenary/katenary/blob/master/internal/utils/icons.go#L6>)
 
 Icon is a unicode icon
 
@@ -196,13 +205,13 @@ type Icon string
 const (
     IconSuccess    Icon = "✅"
     IconFailure    Icon = "❌"
-    IconWarning    Icon = "⚠️'"
+    IconWarning    Icon = "❕"
     IconNote       Icon = "📝"
     IconWorld      Icon = "🌐"
     IconPlug       Icon = "🔌"
     IconPackage    Icon = "📦"
     IconCabinet    Icon = "🗄️"
-    IconInfo       Icon = "❕"
+    IconInfo       Icon = "🔵"
     IconSecret     Icon = "🔒"
     IconConfig     Icon = "🔧"
     IconDependency Icon = "🔗"

doc/docs/packages/update.md

@@ -1,60 +0,0 @@
-<!-- Code generated by gomarkdoc. DO NOT EDIT -->
-
-# update
-
-```go
-import "katenary/update"
-```
-
-Update package is used to check if a new version of katenary is available.
-
-## Variables
-
-<a name="Version"></a>
-
-```go
-var (
-    Version = "master" // reset by cmd/main.go
-)
-```
-
-<a name="DownloadFile"></a>
-## func [DownloadFile](<https://github.com/metal3d/katenary/blob/develop/update/main.go#L134>)
-
-```go
-func DownloadFile(url, exe string) error
-```
-
-DownloadFile will download a url to a local file. It also ensure that the file is executable.
-
-<a name="DownloadLatestVersion"></a>
-## func [DownloadLatestVersion](<https://github.com/metal3d/katenary/blob/develop/update/main.go#L80>)
-
-```go
-func DownloadLatestVersion(assets []Asset) error
-```
-
-DownloadLatestVersion will download the latest version of katenary.
-
-<a name="Asset"></a>
-## type [Asset](<https://github.com/metal3d/katenary/blob/develop/update/main.go#L23-L26>)
-
-Asset is a github asset from release url.
-
-```go
-type Asset struct {
-    Name string `json:"name"`
-    URL  string `json:"browser_download_url"`
-}
-```
-
-<a name="CheckLatestVersion"></a>
-### func [CheckLatestVersion](<https://github.com/metal3d/katenary/blob/develop/update/main.go#L29>)
-
-```go
-func CheckLatestVersion() (string, []Asset, error)
-```
-
-CheckLatestVersion check katenary latest version from release and propose to download it
-
-Generated by [gomarkdoc](<https://github.com/princjef/gomarkdoc>)

doc/docs/usage.md

@@ -13,7 +13,7 @@ katenary convert
 
 This will create a `chart` directory with the helm chart inside.
 
-But, in general, you will need to add a few configuration to help Katenary to transpose the compose file to a working
+But, in general, you will need to add a few configurations to help Katenary to transpose the compose file to a working
 helm chart.
 
 There are two ways to configure Katenary:
@@ -25,7 +25,7 @@ The Katenary file `katenary.yaml` has benefits over the labels in the compose fi
 
 - you can validate the configuration with a schema, and use completion in your editor
 - you separate the configuration and leave the compose file "intact"
-- the syntax is a bit simpler, instead of using `katenary.v3/xxx: |-" you can use`xxx: ...`
+- the syntax is a bit simpler, instead of using `katenary.v3/xxx: |-` you can use `xxx: ...`
 
 But: **this implies that you have to maintain two files if the compose file changes.**
 
@@ -34,19 +34,18 @@ For example. With "labels", you should do:
 ```yaml
 # in compose file
 services:
-  webapp:
-    image: php:7-apache
-    ports:
-    - 8080:80
-    environment:
-      DB_HOST: database
-    labels:
-    katenary.v3/ingress: |-
-        hostname: myapp.example.com
-        port: 8080
-    katenary.v3/map-env: |-
-        DB_HOST: "{{ .Release.Name }}-database"
-
+    webapp:
+        image: php:7-apache
+        ports:
+            - 8080:80
+        environment:
+            DB_HOST: database
+        labels:
+        katenary.v3/ingress: |-
+            hostname: myapp.example.com
+            port: 8080
+        katenary.v3/map-env: |-
+            DB_HOST: "{{ .Release.Name }}-database"
 ```
 
 Using a Katenary file, you can do:
@@ -54,26 +53,26 @@ Using a Katenary file, you can do:
 ```yaml
 # in compose file, no need to add labels
 services:
-  webapp:
-    image: php:7-apache
-    ports:
-    - 8080:80
-    environment:
-      DB_HOST: database
+    webapp:
+        image: php:7-apache
+        ports:
+            - 8080:80
+        environment:
+            DB_HOST: database
 
 # in katenary.yaml
 webapp:
-  ingress:
-    hostname: myapp.example.com
-    port: 8080
-    
-  map-env:
-    DB_HOST: "{{ .Release.Name }}-database"
+    ingress:
+        hostname: myapp.example.com
+        port: 8080
+
+    map-env:
+        DB_HOST: "{{ .Release.Name }}-database"
 ```
 
 !!! Warning "YAML in multiline label"
 
-    Compose only accept text label. So, to put a complete YAML content in the target label, 
+    Compose only accept text label. So, to put a complete YAML content in the target label,
     you need to use a pipe char (`|` or `|-`) and to **indent** your content.
 
     For example :
@@ -130,8 +129,8 @@ After having installed `katenary`, the standard usage is to call:
 It will search standard compose files in the current directory and try to create a helm chart in "chart" directory.
 
 !!! Info
-    Katenary uses the compose-go library which respects the Docker and Docker-Compose specification. Keep in mind that
-    it will find files exactly the same way as `docker-compose` and `podman-compose` do it.
+Katenary uses the compose-go library which respects the Docker and Docker-Compose specification. Keep in mind that
+it will find files exactly the same way as `docker-compose` and `podman-compose` do it.
 
 Of course, you can provide others files than the default with (cumulative) `-c` options:
 
@@ -142,11 +141,11 @@ Of course, you can provide others files than the default with (cumulative) `-c`
 Katenary proposes a lot of labels to configure the helm chart generation, but some are very important.
 
 !!! Info
-    For more complete label usage, see [the labels page](labels.md).
+For more complete label usage, see [the labels page](labels.md).
 
 ### Work with Depends On?
 
-Kubernetes does not provide service or pod starting detection from others pods. But katenary will create init containers
+Kubernetes does not provide service or pod starting detection from others pods. But Katenary will create `initContainer`
 to make you able to wait for a service to respond. But you'll probably need to adapt a bit the compose file.
 
 See this compose file:
@@ -155,15 +154,15 @@ See this compose file:
 version: "3"
 
 services:
-  webapp:
-    image: php:8-apache
-    depends_on:
-      - database
+    webapp:
+        image: php:8-apache
+        depends_on:
+            - database
 
-  database:
-    image: mariadb
-    environment:
-      MYSQL_ROOT_PASSWORD: foobar
+    database:
+        image: mariadb
+        environment:
+            MYSQL_ROOT_PASSWORD: foobar
 ```
 
 In this case, `webapp` needs to know the `database` port because the `depends_on` points on it and Kubernetes has not
@@ -174,18 +173,18 @@ So, instead of exposing the port in the compose definition, let's declare this t
 version: "3"
 
 services:
-  webapp:
-    image: php:8-apache
-    depends_on:
-      - database
+    webapp:
+        image: php:8-apache
+        depends_on:
+            - database
 
-  database:
-    image: mariadb
-    environment:
-      MYSQL_ROOT_PASSWORD: foobar
-    labels:
-      katenary.v3/ports: |-
-        - 3306
+    database:
+        image: mariadb
+        environment:
+            MYSQL_ROOT_PASSWORD: foobar
+        labels:
+            katenary.v3/ports: |-
+                - 3306
 ```
 
 ### Declare ingresses
@@ -197,14 +196,14 @@ Katenary can create this resource for you. You just need to declare the hostname
 
 ```yaml
 services:
-  webapp:
-    image: ...
-    ports: 8080:5050
-    labels:
-      katenary.v3/ingress: |-
-        # the target port is 5050 wich is the "service" port
-        port: 5050
-        hostname: myapp.example.com
+    webapp:
+        image: ...
+        ports: 8080:5050
+        labels:
+            katenary.v3/ingress: |-
+                # the target port is 5050 wich is the "service" port
+                port: 5050
+                hostname: myapp.example.com
 ```
 
 Note that the port to bind is the one used by the container, not the used locally. This is because Katenary create a
@@ -219,13 +218,13 @@ With a compose file, there is no problem as Docker/Podman allows resolving the n
 
 ```yaml
 services:
-  webapp:
-    image: php:7-apache
-    environment:
-      DB_HOST: database
+    webapp:
+        image: php:7-apache
+        environment:
+            DB_HOST: database
 
-  database:
-    image: mariadb
+    database:
+        image: mariadb
 ```
 
 Katenary prefixes the services with `{{ .Release.Name }}` (to make it possible to install the application several times
@@ -233,16 +232,16 @@ in a namespace), so you need to "remap" the environment variable to the right on
 
 ```yaml
 services:
-  webapp:
-    image: php:7-apache
-    environment:
-      DB_HOST: database
-    labels:
-      katenary.v3/mapenv: |-
-        DB_HOST: "{{ .Release.Name }}-database"
+    webapp:
+        image: php:7-apache
+        environment:
+            DB_HOST: database
+        labels:
+            katenary.v3/mapenv: |-
+                DB_HOST: "{{ .Release.Name }}-database"
 
-  database:
-    image: mariadb
+    database:
+        image: mariadb
 ```
 
 This label can be used to map others environment for any others reason. E.g. to change an informational environment
@@ -250,13 +249,13 @@ variable.
 
 ```yaml
 services:
-  webapp:
-    #...
-    environment:
-      RUNNING: docker
-    labels:
-      katenary.v3/mapenv: |-
-        RUNNING: kubernetes
+    webapp:
+        #...
+        environment:
+            RUNNING: docker
+        labels:
+            katenary.v3/mapenv: |-
+                RUNNING: kubernetes
 ```
 
 In the above example, `RUNNING` will be set to `kubernetes` when you'll deploy the application with helm, and it's

doc/mkdocs.yml

@@ -1,8 +1,18 @@
 site_name: Katenary documentation
 docs_dir: ./docs
-plugins: 
+plugins:
   - search
   - inline-svg
+  - manpage:
+      enabled: !ENV [MANPAGE, false]
+      preprocess: preprocess.py
+      pages:
+        - title: Katenary
+          header: Katenary helm chart generator
+          output: share/man/man1/katenary.1
+          inputs:
+            - usage.md
+            - labels.md
 theme:
   name: material
   custom_dir: overrides
@@ -42,25 +52,23 @@ extra:
   generator: false
   social:
     - icon: fontawesome/brands/github
-      link: https://github.com/metal3d/katenary
+      link: https://github.com/katenary/katenary
 nav:
   - "Home": index.md
   - usage.md
   - labels.md
   - Behind the scene:
-    - coding.md
-    - dependencies.md
+      - coding.md
+      - dependencies.md
   - FAQ: faq.md
   - Go Packages:
-    - packages/cmd/katenary.md
-    - packages/parser.md
-    - packages/update.md
-    - packages/utils.md
-    - Generator: 
-      - Index: packages/generator.md
-      - ExtraFiles: packages/generator/extrafiles.md
-      - labels:
-        - packages/generator/labels.md
-        - LabelStructs: packages/generator/labels/labelStructs.md
-      - KatenaryFile: packages/generator/katenaryfile.md
-
+      - packages/cmd/katenary.md
+      - packages/internal/parser.md
+      - packages/internal/utils.md
+      - Generator:
+          - Index: packages/internal/generator.md
+          - ExtraFiles: packages/internal/generator/extrafiles.md
+          - labels:
+              - packages/internal/generator/labels.md
+              - Labelstructs: packages/internal/generator/labels/labelstructs.md
+          - KatenaryFile: packages/internal/generator/katenaryfile.md

doc/preprocess.py

@@ -0,0 +1,22 @@
+"""Called by mkdocs to preprocess files and build manpages"""
+
+from bs4 import BeautifulSoup, Tag
+
+
+def to_remove(tag: Tag) -> bool:
+    """Removes images, SVGs, links containing images or SVGs, and permalinks from the BeautifulSoup object."""
+    if tag.name in {"img", "svg"}:
+        return True
+    # remove links containing images or SVGs
+    if tag.name == "a" and tag.img and to_remove(tag.img):
+        return True
+    # remove permalinks
+    if tag.name == "a" and "headerlink" in tag.get("class", ()):
+        return True
+    return False
+
+
+def preprocess(soup: BeautifulSoup, output: str) -> None:
+    """Preprocess the BeautifulSoup object to remove unwanted elements."""
+    for element in soup.find_all(to_remove):
+        element.decompose()

doc/requirements.txt

@@ -5,3 +5,5 @@ pymdown-extensions==10.*
 mkdocs-material==9.*
 mkdocs-material-extensions==1.*
 mkdocs-plugin-inline-svg-mod
+beautifulsoup4==4.*
+mkdocs-manpage[preprocess]

generator/doc.go

@@ -1,14 +0,0 @@
-/*
-The generator package generates kubernetes objects from a "compose" file and transforms them into a helm chart.
-
-The generator package is the core of katenary. It is responsible for generating kubernetes objects from a compose file and transforming them into a helm chart.
-Conversion manipulates Yaml representation of kubernetes object to add conditions, labels, annotations, etc. to the objects. It also create the values to be set to
-the values.yaml file.
-
-The generate.Convert() create an HelmChart object and call "Generate()" method to convert from a compose file to a helm chart.
-It saves the helm chart in the given directory.
-
-If you want to change or override the write behavior, you can use the HelmChart.Generate() function and implement your own write function. This function returns
-the helm chart object containing all kubernetes objects and helm chart ingormation. It does not write the helm chart to the disk.
-*/
-package generator

generator/ingress_test.go

@@ -1,45 +0,0 @@
-package generator
-
-import (
-	"fmt"
-	"katenary/generator/labels"
-	"os"
-	"testing"
-
-	v1 "k8s.io/api/networking/v1"
-	"sigs.k8s.io/yaml"
-)
-
-func TestSimpleIngress(t *testing.T) {
-	composeFile := `
-services:
-    web:
-        image: nginx:1.29
-        ports:
-        - 80:80
-        - 443:443
-        labels:
-            %s/ingress: |-
-                hostname: my.test.tld
-                port: 80
-`
-	composeFile = fmt.Sprintf(composeFile, labels.KatenaryLabelPrefix)
-	tmpDir := setup(composeFile)
-	defer teardown(tmpDir)
-
-	currentDir, _ := os.Getwd()
-	os.Chdir(tmpDir)
-	defer os.Chdir(currentDir)
-
-	output := internalCompileTest(t, "-s", "templates/web/ingress.yaml", "--set", "web.ingress.enabled=true")
-	ingress := v1.Ingress{}
-	if err := yaml.Unmarshal([]byte(output), &ingress); err != nil {
-		t.Errorf(unmarshalError, err)
-	}
-	if len(ingress.Spec.Rules) != 1 {
-		t.Errorf("Expected 1 rule, got %d", len(ingress.Spec.Rules))
-	}
-	if ingress.Spec.Rules[0].Host != "my.test.tld" {
-		t.Errorf("Expected host to be my.test.tld, got %s", ingress.Spec.Rules[0].Host)
-	}
-}

generator/katenaryfile/main.go

@@ -1,159 +0,0 @@
-package katenaryfile
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"katenary/generator/labels"
-	"katenary/generator/labels/labelStructs"
-	"katenary/utils"
-	"log"
-	"os"
-	"reflect"
-	"strings"
-
-	"github.com/compose-spec/compose-go/types"
-	"github.com/invopop/jsonschema"
-	"gopkg.in/yaml.v3"
-)
-
-var allowedKatenaryYamlFileNames = []string{"katenary.yaml", "katenary.yml"}
-
-// 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
-type StringOrMap any
-
-// Service is a struct that contains the service configuration for katenary
-type Service struct {
-	MainApp         *bool                          `json:"main-app,omitempty" jsonschema:"title=Is this service the main application"`
-	Values          []StringOrMap                  `json:"values,omitempty" jsonschema:"description=Environment variables to be set in values.yaml with or without a description"`
-	Secrets         *labelStructs.Secrets          `json:"secrets,omitempty" jsonschema:"title=Secrets,description=Environment variables to be set as secrets"`
-	Ports           *labelStructs.Ports            `json:"ports,omitempty" jsonschema:"title=Ports,description=Ports to be exposed in services"`
-	Ingress         *labelStructs.Ingress          `json:"ingress,omitempty" jsonschema:"title=Ingress,description=Ingress configuration"`
-	HealthCheck     *labelStructs.HealthCheck      `json:"health-check,omitempty" jsonschema:"title=Health Check,description=Health check configuration that respects the kubernetes api"`
-	SamePod         *string                        `json:"same-pod,omitempty" jsonschema:"title=Same Pod,description=Service that should be in the same pod"`
-	Description     *string                        `json:"description,omitempty" jsonschema:"title=Description,description=Description of the service that will be injected in the values.yaml file"`
-	Ignore          *bool                          `json:"ignore,omitempty" jsonschema:"title=Ignore,description=Ignore the service in the conversion"`
-	Dependencies    []labelStructs.Dependency      `json:"dependencies,omitempty" jsonschema:"title=Dependencies,description=Services that should be injected in the Chart.yaml file"`
-	ConfigMapFile   *labelStructs.ConfigMapFile    `json:"configmap-files,omitempty" jsonschema:"title=ConfigMap Files,description=Files that should be injected as ConfigMap"`
-	MapEnv          *labelStructs.MapEnv           `json:"map-env,omitempty" jsonschema:"title=Map Env,description=Map environment variables to another value"`
-	CronJob         *labelStructs.CronJob          `json:"cron-job,omitempty" jsonschema:"title=Cron Job,description=Cron Job configuration"`
-	EnvFrom         *labelStructs.EnvFrom          `json:"env-from,omitempty" jsonschema:"title=Env From,description=Inject environment variables from another service"`
-	ExchangeVolumes []*labelStructs.ExchangeVolume `json:"exchange-volumes,omitempty" jsonschema:"title=Exchange Volumes,description=Exchange volumes between services"`
-	ValuesFrom      *labelStructs.ValueFrom        `json:"values-from,omitempty" jsonschema:"title=Values From,description=Inject values from another service (secret or configmap environment variables)"`
-}
-
-// 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.
-func OverrideWithConfig(project *types.Project) {
-	var yamlFile string
-	var err error
-	for _, yamlFile = range allowedKatenaryYamlFileNames {
-		_, err = os.Stat(yamlFile)
-		if err == nil {
-			break
-		}
-	}
-	if err != nil {
-		// no katenary file found
-		return
-	}
-	fmt.Println(utils.IconInfo, "Using katenary file", yamlFile)
-
-	services := make(map[string]Service)
-	fp, err := os.Open(yamlFile)
-	if err != nil {
-		return
-	}
-	if err := yaml.NewDecoder(fp).Decode(&services); err != nil {
-		log.Fatal(err)
-		return
-	}
-	for i, p := range project.Services {
-		name := p.Name
-		if project.Services[i].Labels == nil {
-			project.Services[i].Labels = make(map[string]string)
-		}
-
-		if s, ok := services[name]; ok {
-			getLabelContent(s.MainApp, &project.Services[i], labels.LabelMainApp)
-			getLabelContent(s.Values, &project.Services[i], labels.LabelValues)
-			getLabelContent(s.Secrets, &project.Services[i], labels.LabelSecrets)
-			getLabelContent(s.Ports, &project.Services[i], labels.LabelPorts)
-			getLabelContent(s.Ingress, &project.Services[i], labels.LabelIngress)
-			getLabelContent(s.HealthCheck, &project.Services[i], labels.LabelHealthCheck)
-			getLabelContent(s.SamePod, &project.Services[i], labels.LabelSamePod)
-			getLabelContent(s.Description, &project.Services[i], labels.LabelDescription)
-			getLabelContent(s.Ignore, &project.Services[i], labels.LabelIgnore)
-			getLabelContent(s.Dependencies, &project.Services[i], labels.LabelDependencies)
-			getLabelContent(s.ConfigMapFile, &project.Services[i], labels.LabelConfigMapFiles)
-			getLabelContent(s.MapEnv, &project.Services[i], labels.LabelMapEnv)
-			getLabelContent(s.CronJob, &project.Services[i], labels.LabelCronJob)
-			getLabelContent(s.EnvFrom, &project.Services[i], labels.LabelEnvFrom)
-			getLabelContent(s.ExchangeVolumes, &project.Services[i], labels.LabelExchangeVolume)
-			getLabelContent(s.ValuesFrom, &project.Services[i], labels.LabelValueFrom)
-		}
-	}
-	fmt.Println(utils.IconInfo, "Katenary file loaded successfully, the services are now configured.")
-}
-
-func getLabelContent(o any, service *types.ServiceConfig, labelName string) error {
-	if reflect.ValueOf(o).IsZero() {
-		return nil
-	}
-
-	c, err := yaml.Marshal(o)
-	if err != nil {
-		log.Println(err)
-		return err
-	}
-	val := strings.TrimSpace(string(c))
-	if labelName == labels.LabelIngress {
-		// special case, values must be set from some defaults
-		ing, err := labelStructs.IngressFrom(val)
-		if err != nil {
-			log.Fatal(err)
-			return err
-		}
-		c, err := yaml.Marshal(ing)
-		if err != nil {
-			return err
-		}
-		val = strings.TrimSpace(string(c))
-	}
-
-	service.Labels[labelName] = val
-	return nil
-}
-
-// GenerateSchema generates the schema for the katenary.yaml file.
-func GenerateSchema() string {
-	s := jsonschema.Reflect(map[string]Service{})
-
-	// redefine the IntOrString type from k8s
-	s.Definitions["IntOrString"] = &jsonschema.Schema{
-		OneOf: []*jsonschema.Schema{
-			{Type: "integer"},
-			{Type: "string"},
-		},
-	}
-
-	// same for the StringOrMap type, that can be either a string or a map of string:string
-	s.Definitions["StringOrMap"] = &jsonschema.Schema{
-		OneOf: []*jsonschema.Schema{
-			{Type: "string"},
-			{Type: "object", AdditionalProperties: &jsonschema.Schema{Type: "string"}},
-		},
-	}
-
-	c, _ := s.MarshalJSON()
-	// indent the json
-	var out bytes.Buffer
-	err := json.Indent(&out, c, "", "  ")
-	if err != nil {
-		return err.Error()
-	}
-
-	return string(out.Bytes())
-}

generator/labels/labelStructs/configMap.go

@@ -1,13 +0,0 @@
-package labelStructs
-
-import "gopkg.in/yaml.v3"
-
-type ConfigMapFile []string
-
-func ConfigMapFileFrom(data string) (ConfigMapFile, error) {
-	var mapping ConfigMapFile
-	if err := yaml.Unmarshal([]byte(data), &mapping); err != nil {
-		return nil, err
-	}
-	return mapping, nil
-}

generator/labels/labelStructs/doc.go

@@ -1,2 +0,0 @@
-// labelStructs is a package that contains the structs used to represent the labels in the yaml files.
-package labelStructs

generator/version_test.go

@@ -1,21 +0,0 @@
-package generator
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestVersion(t *testing.T) {
-	// we build on "devel" branch
-	v := GetVersion()
-	if strings.Contains(v, "(devel)") {
-		t.Errorf("Expected version to be set, got %s", v)
-	}
-
-	// now, imagine we are on a release branch
-	Version = "release-1.0.0"
-	v = GetVersion()
-	if !strings.Contains(v, "release-1.0.0") {
-		t.Errorf("Expected version to be set, got %s", v)
-	}
-}

go.mod

@@ -1,20 +1,19 @@
-module katenary // github.com/metal3d/katenary
+module github.com/katenary/katenary
 
-go 1.23
+go 1.24.0
 
-toolchain go1.23.2
+toolchain go1.24.3
 
 require (
 	github.com/compose-spec/compose-go v1.20.2
-	github.com/invopop/jsonschema v0.12.0
+	github.com/invopop/jsonschema v0.13.0
 	github.com/mitchellh/go-wordwrap v1.0.1
-	github.com/spf13/cobra v1.8.1
+	github.com/spf13/cobra v1.9.1
 	github.com/thediveo/netdb v1.1.2
-	golang.org/x/mod v0.22.0
 	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/api v0.31.2
-	k8s.io/apimachinery v0.31.2
-	sigs.k8s.io/yaml v1.4.0
+	k8s.io/api v0.33.3
+	k8s.io/apimachinery v0.33.3
+	sigs.k8s.io/yaml v1.6.0
 )
 
 require (
@@ -23,14 +22,15 @@ require (
 	github.com/distribution/reference v0.6.0 // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
-	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/mailru/easyjson v0.9.0 // indirect
 	github.com/mattn/go-shellwords v1.0.12 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -38,20 +38,22 @@ require (
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/pflag v1.0.7 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
-	golang.org/x/net v0.30.0 // indirect
-	golang.org/x/sync v0.9.0 // indirect
-	golang.org/x/sys v0.27.0 // indirect
-	golang.org/x/text v0.20.0 // indirect
+	go.yaml.in/yaml/v2 v2.4.2 // indirect
+	golang.org/x/exp v0.0.0-20250718183923-645b1fa84792 // indirect
+	golang.org/x/net v0.42.0 // indirect
+	golang.org/x/sync v0.16.0 // indirect
+	golang.org/x/sys v0.34.0 // indirect
+	golang.org/x/text v0.27.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078 // indirect
-	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
+	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
+	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
 )

go.sum

@@ -4,41 +4,37 @@ github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMU
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
 github.com/compose-spec/compose-go v1.20.2 h1:u/yfZHn4EaHGdidrZycWpxXgFffjYULlTbRfJ51ykjQ=
 github.com/compose-spec/compose-go v1.20.2/go.mod h1:+MdqXV4RA7wdFsahh/Kb8U0pAJqkg7mr4PM9tFKU8RM=
-github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
 github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
-github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
-github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
-github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
+github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
+github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
+github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
-github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM=
-github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
 github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/invopop/jsonschema v0.12.0 h1:6ovsNSuvn9wEQVOyc72aycBMVQFKz7cPdMJn10CvzRI=
-github.com/invopop/jsonschema v0.12.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/invopop/jsonschema v0.13.0 h1:KvpoAJWEjR3uD9Kbm2HWJmqsEaHt8lBUpd0qHcIi21E=
+github.com/invopop/jsonschema v0.13.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@@ -47,8 +43,8 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
+github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
 github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
 github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
 github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
@@ -60,31 +56,31 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=
-github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
-github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk=
-github.com/onsi/gomega v1.32.0/go.mod h1:a4x4gW6Pz2yK1MAmvluYme5lvYTn61afQ2ETw/8n4Lg=
+github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
+github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
+github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
+github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
-github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
-github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
+github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
+github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
+github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/thediveo/netdb v1.1.2 h1:XdLx/YJPutxrSkPYtmCAIY5sgAvxtkS1Tz+Z0UX2I+U=
 github.com/thediveo/netdb v1.1.2/go.mod h1:KJczM//7VIIiovQO1qDooHvM8+0pt6RdRt3rVDZxEGM=
 github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
@@ -100,42 +96,44 @@ github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
+go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
+go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE=
+go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY=
-golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8=
+golang.org/x/exp v0.0.0-20250718183923-645b1fa84792 h1:R9PFI6EUdfVKgwKjZef7QIwGcBKu86OEFpJ9nUEP2l4=
+golang.org/x/exp v0.0.0-20250718183923-645b1fa84792/go.mod h1:A+z0yzpGtvnG90cToK5n2tu8UJVP2XUATh+r+sfOOOc=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
-golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
-golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
+golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
+golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
-golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
+golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
-golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
+golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
+golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
+golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
-golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
+golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=
+golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -150,17 +148,21 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
 gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
-k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0=
-k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk=
-k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw=
-k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
+k8s.io/api v0.33.3 h1:SRd5t//hhkI1buzxb288fy2xvjubstenEKL9K51KBI8=
+k8s.io/api v0.33.3/go.mod h1:01Y/iLUjNBM3TAvypct7DIj0M0NIZc+PzAHCIo0CYGE=
+k8s.io/apimachinery v0.33.3 h1:4ZSrmNa0c/ZpZJhAgRdcsFcZOw1PQU1bALVQ0B3I5LA=
+k8s.io/apimachinery v0.33.3/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078 h1:jGnCPejIetjiy2gqaJ5V0NLwTpF4wbQ6cZIItJCSHno=
-k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
-sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
-sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
+k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
+k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
+sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
+sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
+sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
+sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
+sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
+sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
+sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
+sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=

install.sh

@@ -2,7 +2,7 @@
 
 # Install the latest version of the Katenary detecting the right OS and architecture.
 # Can be launched with the following command:
-# sh <(curl -sSL https://raw.githubusercontent.com/metal3d/katenary/master/install.sh)
+# sh <(curl -sSL https://raw.githubusercontent.com/Katenary/katenary/master/install.sh)
 
 set -e
 
@@ -18,36 +18,36 @@ COMON_INSTALL_PATHS="$HOME/.local/bin $HOME/.bin $HOME/bin"
 
 INSTALL_PATH=""
 for p in $COMON_INSTALL_PATHS; do
-    if [ -d $p ]; then
-        INSTALL_PATH=$p
-        break
-    fi
+	if [ -d $p ]; then
+		INSTALL_PATH=$p
+		break
+	fi
 done
 
 # check if the user has write access to the INSTALL_PATH
 if [ -z "$INSTALL_PATH" ]; then
-    INSTALL_PATH="/usr/local/bin"
-    if [ ! -w $INSTALL_PATH ]; then
-        echo "You don't have write access to $INSTALL_PATH"
-        echo "Please, run with sudo or install locally"
-        exit 1
-    fi
+	INSTALL_PATH="/usr/local/bin"
+	if [ ! -w $INSTALL_PATH ]; then
+		echo "You don't have write access to $INSTALL_PATH"
+		echo "Please, run with sudo or install locally"
+		exit 1
+	fi
 fi
 
 # ensure that $INSTALL_PATH is in the PATH
-if ! echo $PATH | grep -q $INSTALL_PATH; then
-    echo "Sorry, $INSTALL_PATH is not in the PATH"
-    echo "Please, add it to your PATH in your shell configuration file"
-    echo "then restart your shell and run this script again"
-    exit 1
+if ! echo "$PATH" | grep -q "$INSTALL_PATH"; then
+	echo "Sorry, ${INSTALL_PATH} is not in the PATH"
+	echo "Please, add it to your PATH in your shell configuration file"
+	echo "then restart your shell and run this script again"
+	exit 1
 fi
 
 # Where to download the binary
-BASE="https://github.com/metal3d/katenary/releases/latest/download/"
+BASE="https://github.com/Katenary/katenary/releases/latest/download/"
 
 # for compatibility with older ARM versions
 if [ $ARCH = "x86_64" ]; then
-    ARCH="amd64"
+	ARCH="amd64"
 fi
 
 BIN_URL="$BASE/katenary-$OS-$ARCH"
@@ -58,8 +58,8 @@ echo "Downloading $BIN_URL"
 T=$(mktemp -u)
 curl -SL -# $BIN_URL -o $T || (echo "Failed to download katenary" && rm -f $T && exit 1)
 
-mv $T $INSTALL_PATH/katenary
-chmod +x $INSTALL_PATH/katenary
+mv "$T" "${INSTALL_PATH}/katenary"
+chmod +x "${INSTALL_PATH}/katenary"
 echo
 echo "Installed to $INSTALL_PATH/katenary"
 echo "Installation complete! Run 'katenary help' to get started."

internal/generator/chart.go

@@ -2,14 +2,17 @@ package generator
 
 import (
 	"fmt"
-	"katenary/generator/labels"
-	"katenary/generator/labels/labelStructs"
-	"katenary/utils"
 	"log"
+	"maps"
 	"os"
 	"path/filepath"
+	"slices"
 	"strings"
 
+	"github.com/katenary/katenary/internal/generator/labels"
+	"github.com/katenary/katenary/internal/generator/labels/labelstructs"
+	"github.com/katenary/katenary/internal/utils"
+
 	"github.com/compose-spec/compose-go/types"
 	corev1 "k8s.io/api/core/v1"
 )
@@ -42,12 +45,12 @@ type HelmChart struct {
 	composeHash  *string                   `yaml:"-"`
 	Name         string                    `yaml:"name"`
 	Icon         string                    `yaml:"icon,omitempty"`
-	ApiVersion   string                    `yaml:"apiVersion"`
+	APIVersion   string                    `yaml:"apiVersion"`
 	Version      string                    `yaml:"version"`
 	AppVersion   string                    `yaml:"appVersion"`
 	Description  string                    `yaml:"description"`
 	Helper       string                    `yaml:"-"`
-	Dependencies []labelStructs.Dependency `yaml:"dependencies,omitempty"`
+	Dependencies []labelstructs.Dependency `yaml:"dependencies,omitempty"`
 }
 
 // NewChart creates a new empty chart with the given name.
@@ -56,7 +59,7 @@ func NewChart(name string) *HelmChart {
 		Name:        name,
 		Templates:   make(map[string]*ChartTemplate, 0),
 		Description: "A Helm chart for " + name,
-		ApiVersion:  "v2",
+		APIVersion:  "v2",
 		Version:     "",
 		AppVersion:  "", // set to 0.1.0 by default if no "main-app" label is found
 		Values: map[string]any{
@@ -93,7 +96,7 @@ func (chart *HelmChart) SaveTemplates(templateDir string) {
 		}
 
 		servicename := template.Servicename
-		if err := os.MkdirAll(filepath.Join(templateDir, servicename), 0o755); err != nil {
+		if err := os.MkdirAll(filepath.Join(templateDir, servicename), utils.DirectoryPermission); err != nil {
 			fmt.Println(utils.IconFailure, err)
 			os.Exit(1)
 		}
@@ -101,7 +104,7 @@ func (chart *HelmChart) SaveTemplates(templateDir string) {
 		// if the name is a path, create the directory
 		if strings.Contains(name, string(filepath.Separator)) {
 			name = filepath.Join(templateDir, name)
-			err := os.MkdirAll(filepath.Dir(name), 0o755)
+			err := os.MkdirAll(filepath.Dir(name), utils.DirectoryPermission)
 			if err != nil {
 				fmt.Println(utils.IconFailure, err)
 				os.Exit(1)
@@ -116,9 +119,11 @@ func (chart *HelmChart) SaveTemplates(templateDir string) {
 			fmt.Println(utils.IconFailure, err)
 			os.Exit(1)
 		}
+		defer f.Close()
+		if _, err := f.Write(t); err != nil {
+			log.Fatal("error writing template file:", err)
+		}
 
-		f.Write(t)
-		f.Close()
 	}
 }
 
@@ -126,7 +131,7 @@ func (chart *HelmChart) SaveTemplates(templateDir string) {
 func (chart *HelmChart) generateConfigMapsAndSecrets(project *types.Project) error {
 	appName := chart.Name
 	for _, s := range project.Services {
-		if s.Environment == nil || len(s.Environment) == 0 {
+		if len(s.Environment) == 0 {
 			continue
 		}
 
@@ -134,12 +139,10 @@ func (chart *HelmChart) generateConfigMapsAndSecrets(project *types.Project) err
 		secretsVar := types.MappingWithEquals{}
 
 		// copy env to originalEnv
-		for k, v := range s.Environment {
-			originalEnv[k] = v
-		}
+		maps.Copy(originalEnv, s.Environment)
 
 		if v, ok := s.Labels[labels.LabelSecrets]; ok {
-			list, err := labelStructs.SecretsFrom(v)
+			list, err := labelstructs.SecretsFrom(v)
 			if err != nil {
 				log.Fatal("error unmarshaling secrets label:", err)
 			}
@@ -212,7 +215,7 @@ func (chart *HelmChart) generateDeployment(service types.ServiceConfig, deployme
 
 	if exchange, ok := service.Labels[labels.LabelExchangeVolume]; ok {
 		// we need to add a volume and a mount point
-		ex, err := labelStructs.NewExchangeVolumes(exchange)
+		ex, err := labelstructs.NewExchangeVolumes(exchange)
 		if err != nil {
 			return err
 		}
@@ -296,7 +299,7 @@ func (chart *HelmChart) setCronJob(service types.ServiceConfig, appName string)
 func (chart *HelmChart) setDependencies(service types.ServiceConfig) (bool, error) {
 	// helm dependency
 	if v, ok := service.Labels[labels.LabelDependencies]; ok {
-		d, err := labelStructs.DependenciesFrom(v)
+		d, err := labelstructs.DependenciesFrom(v)
 		if err != nil {
 			return false, err
 		}
@@ -324,7 +327,7 @@ func (chart *HelmChart) setSharedConf(service types.ServiceConfig, deployments m
 	if _, ok := service.Labels[labels.LabelEnvFrom]; !ok {
 		return
 	}
-	fromservices, err := labelStructs.EnvFromFrom(service.Labels[labels.LabelEnvFrom])
+	fromservices, err := labelstructs.EnvFromFrom(service.Labels[labels.LabelEnvFrom])
 	if err != nil {
 		log.Fatal("error unmarshaling env-from label:", err)
 	}
@@ -346,10 +349,10 @@ func (chart *HelmChart) setSharedConf(service types.ServiceConfig, deployments m
 
 // setEnvironmentValuesFrom sets the environment values from another service.
 func (chart *HelmChart) setEnvironmentValuesFrom(service types.ServiceConfig, deployments map[string]*Deployment) {
-	if _, ok := service.Labels[labels.LabelValueFrom]; !ok {
+	if _, ok := service.Labels[labels.LabelValuesFrom]; !ok {
 		return
 	}
-	mapping, err := labelStructs.GetValueFrom(service.Labels[labels.LabelValueFrom])
+	mapping, err := labelstructs.GetValueFrom(service.Labels[labels.LabelValuesFrom])
 	if err != nil {
 		log.Fatal("error unmarshaling values-from label:", err)
 	}
@@ -372,7 +375,7 @@ func (chart *HelmChart) setEnvironmentValuesFrom(service types.ServiceConfig, de
 		if dep == nil || target == nil {
 			log.Fatalf("deployment %s or %s not found", depName[0], service.Name)
 		}
-		container, index := utils.GetContainerByName(target.service.Name, target.Spec.Template.Spec.Containers)
+		container, index := utils.GetContainerByName(target.service.ContainerName, target.Spec.Template.Spec.Containers)
 		if container == nil {
 			log.Fatalf("Container %s not found", target.GetName())
 		}
@@ -381,13 +384,10 @@ func (chart *HelmChart) setEnvironmentValuesFrom(service types.ServiceConfig, de
 
 		// is it a secret?
 		isSecret := false
-		secrets, err := labelStructs.SecretsFrom(dep.service.Labels[labels.LabelSecrets])
+		secrets, err := labelstructs.SecretsFrom(dep.service.Labels[labels.LabelSecrets])
 		if err == nil {
-			for _, secret := range secrets {
-				if secret == depName[1] {
-					isSecret = true
-					break
-				}
+			if slices.Contains(secrets, depName[1]) {
+				isSecret = true
 			}
 		}
 

internal/generator/chart_test.go

@@ -2,11 +2,12 @@ package generator
 
 import (
 	"fmt"
-	"katenary/generator/labels"
 	"os"
 	"strings"
 	"testing"
 
+	"github.com/katenary/katenary/internal/generator/labels"
+
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/yaml"

internal/generator/configMap.go

@@ -1,14 +1,16 @@
 package generator
 
 import (
-	"katenary/generator/labels"
-	"katenary/generator/labels/labelStructs"
-	"katenary/utils"
+	"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"
 	"regexp"
 	"strings"
+	"unicode/utf8"
 
 	"github.com/compose-spec/compose-go/types"
 	corev1 "k8s.io/api/core/v1"
@@ -63,7 +65,7 @@ func NewConfigMap(service types.ServiceConfig, appName string, forFile bool) *Co
 	}
 
 	// get the secrets from the labels
-	secrets, err := labelStructs.SecretsFrom(service.Labels[labels.LabelSecrets])
+	secrets, err := labelstructs.SecretsFrom(service.Labels[labels.LabelSecrets])
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -89,7 +91,7 @@ func NewConfigMap(service types.ServiceConfig, appName string, forFile bool) *Co
 		// do not bind env variables to the configmap
 		// remove the variables that are already defined in the environment
 		if l, ok := service.Labels[labels.LabelMapEnv]; ok {
-			envmap, err := labelStructs.MapEnvFrom(l)
+			envmap, err := labelstructs.MapEnvFrom(l)
 			if err != nil {
 				log.Fatal("Error parsing map-env", err)
 			}
@@ -140,7 +142,9 @@ func NewConfigMapFromDirectory(service types.ServiceConfig, appName, path string
 	// cumulate the path to the WorkingDir
 	path = filepath.Join(service.WorkingDir, path)
 	path = filepath.Clean(path)
-	cm.AppendDir(path)
+	if err := cm.AppendDir(path); err != nil {
+		log.Fatal("Error adding files to configmap:", err)
+	}
 	return cm
 }
 
@@ -149,58 +153,84 @@ func (c *ConfigMap) AddData(key, value string) {
 	c.Data[key] = value
 }
 
-// AddFile adds files from given path to the configmap. It is not recursive, to add all files in a directory,
+// AddBinaryData adds binary data to the configmap. Append or overwrite the value if the key already exists.
+func (c *ConfigMap) AddBinaryData(key string, value []byte) {
+	if c.BinaryData == nil {
+		c.BinaryData = make(map[string][]byte)
+	}
+	c.BinaryData[key] = value
+}
+
+// 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 (c *ConfigMap) AppendDir(path string) {
+func (c *ConfigMap) AppendDir(path string) error {
 	// read all files in the path and add them to the configmap
 	stat, err := os.Stat(path)
 	if err != nil {
-		log.Fatalf("Path %s does not exist\n", path)
+		return fmt.Errorf("path %s does not exist, %w", path, err)
 	}
 	// recursively read all files in the path and add them to the configmap
 	if stat.IsDir() {
 		files, err := os.ReadDir(path)
 		if err != nil {
-			log.Fatal(err)
+			return err
 		}
 		for _, file := range files {
 			if file.IsDir() {
+				utils.Warn("Subdirectories are ignored for the moment, skipping", filepath.Join(path, file.Name()))
 				continue
 			}
 			path := filepath.Join(path, file.Name())
 			content, err := os.ReadFile(path)
 			if err != nil {
-				log.Fatal(err)
+				return err
 			}
 			// remove the path from the file
 			filename := filepath.Base(path)
-			c.AddData(filename, string(content))
+			if utf8.Valid(content) {
+				c.AddData(filename, string(content))
+			} else {
+				c.AddBinaryData(filename, content)
+			}
+
 		}
 	} else {
 		// add the file to the configmap
 		content, err := os.ReadFile(path)
 		if err != nil {
-			log.Fatal(err)
+			return err
+		}
+		filename := filepath.Base(path)
+		if utf8.Valid(content) {
+			c.AddData(filename, string(content))
+		} else {
+			c.AddBinaryData(filename, content)
 		}
-		c.AddData(filepath.Base(path), string(content))
 	}
+	return nil
 }
 
-func (c *ConfigMap) AppendFile(path string) {
+func (c *ConfigMap) AppendFile(path string) error {
 	// read all files in the path and add them to the configmap
 	stat, err := os.Stat(path)
 	if err != nil {
-		log.Fatalf("Path %s does not exist\n", path)
+		return fmt.Errorf("path %s doesn not exists, %w", path, err)
 	}
 	// recursively read all files in the path and add them to the configmap
 	if !stat.IsDir() {
 		// add the file to the configmap
 		content, err := os.ReadFile(path)
 		if err != nil {
-			log.Fatal(err)
+			return err
 		}
-		c.AddData(filepath.Base(path), string(content))
+		if utf8.Valid(content) {
+			c.AddData(filepath.Base(path), string(content))
+		} else {
+			c.AddBinaryData(filepath.Base(path), content)
+		}
+
 	}
+	return nil
 }
 
 // Filename returns the filename of the configmap. If the configmap is used for files, the filename contains the path.

internal/generator/configMap_test.go

@@ -2,10 +2,13 @@ package generator
 
 import (
 	"fmt"
-	"katenary/generator/labels"
+	"io"
+	"github.com/katenary/katenary/internal/generator/labels"
 	"os"
+	"regexp"
 	"testing"
 
+	"github.com/compose-spec/compose-go/types"
 	v1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/yaml"
 )
@@ -73,3 +76,57 @@ services:
 		t.Errorf("Expected FOO to be baz, got %s", v)
 	}
 }
+
+func TestAppendBadFile(t *testing.T) {
+	cm := NewConfigMap(types.ServiceConfig{}, "app", true)
+	err := cm.AppendFile("foo")
+	if err == nil {
+		t.Errorf("Expected error, got nil")
+	}
+}
+
+func TestAppendBadDir(t *testing.T) {
+	cm := NewConfigMap(types.ServiceConfig{}, "app", true)
+	err := cm.AppendDir("foo")
+	if err == nil {
+		t.Errorf("Expected error, got nil")
+	}
+}
+
+func TestRootConfigmapfile(t *testing.T) {
+	composeFile := `
+services:
+  web:
+    image: nginx
+    volumes:
+      - ./foo.txt:/etc/foo.txt
+    labels:
+      %[1]s/configmap-files: |-
+        - ./foo.txt
+`
+	composeFile = fmt.Sprintf(composeFile, labels.KatenaryLabelPrefix)
+	tmpDir := setup(composeFile)
+	defer teardown(tmpDir)
+
+	currentDir, _ := os.Getwd()
+	os.Chdir(tmpDir)
+	defer os.Chdir(currentDir)
+	fooTxt := "foo content"
+	fooFp, _ := os.Create("foo.txt")
+	io.WriteString(fooFp, fooTxt)
+	fooFp.Close()
+
+	output := internalCompileTest(t, "-s", "templates/web/statics/configmap.yaml")
+	configMap := v1.ConfigMap{}
+	if err := yaml.Unmarshal([]byte(output), &configMap); err != nil {
+		t.Errorf(unmarshalError, err)
+	}
+	if configMap.Data == nil {
+		t.Error("Expected configmap data to not be nil")
+	}
+	// if the configmap.Name ends by anything that is not alphanumeric, there is a problem
+	valid := regexp.MustCompile(`.*[a-zA-Z0-9]+$`)
+	if !valid.MatchString(configMap.Name) {
+		t.Errorf("ConfigMap name %s is not valid", configMap.Name)
+	}
+}

internal/generator/converter.go

@@ -4,12 +4,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"katenary/generator/extrafiles"
-	"katenary/generator/katenaryfile"
-	"katenary/generator/labels"
-	"katenary/generator/labels/labelStructs"
-	"katenary/parser"
-	"katenary/utils"
 	"log"
 	"os"
 	"os/exec"
@@ -18,6 +12,13 @@ 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"
+
 	"github.com/compose-spec/compose-go/types"
 )
 
@@ -85,12 +86,18 @@ var unwantedLines = []string{
 	"status:",
 }
 
+var ingressTLSHelp = `# Ingress TLS configuration
+# If enabled, a secret containing the certificate and the key should be
+# created by the ingress controller. If the name if emtpy, so the secret
+# name is generated. You can specify the secret name to use your own secret.
+`
+
 // keyRegExp checks if the line starts by a #
 var keyRegExp = regexp.MustCompile(`^\s*[^#]+:.*`)
 
 // 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 Convert(config ConvertOptions, dockerComposeFile ...string) {
+func Convert(config ConvertOptions, dockerComposeFile ...string) error {
 	var (
 		templateDir = filepath.Join(config.OutputDir, "templates")
 		helpersPath = filepath.Join(config.OutputDir, "templates", "_helpers.tpl")
@@ -105,9 +112,13 @@ func Convert(config ConvertOptions, dockerComposeFile ...string) {
 	// go to the root of the project
 	if err := os.Chdir(filepath.Dir(dockerComposeFile[0])); err != nil {
 		fmt.Println(utils.IconFailure, err)
-		os.Exit(1)
+		return err
 	}
-	defer os.Chdir(currentDir) // after the generation, go back to the original directory
+	defer func() {
+		if err := os.Chdir(currentDir); err != nil { // after the generation, go back to the original directory
+			log.Fatal(err)
+		}
+	}()
 
 	// repove the directory part of the docker-compose files
 	for i, f := range dockerComposeFile {
@@ -118,13 +129,13 @@ func Convert(config ConvertOptions, dockerComposeFile ...string) {
 	project, err := parser.Parse(config.Profiles, config.EnvFiles, dockerComposeFile...)
 	if err != nil {
 		fmt.Println(err)
-		os.Exit(1)
+		return err
 	}
 
 	// check older version of labels
 	if err := checkOldLabels(project); err != nil {
 		fmt.Println(utils.IconFailure, err)
-		os.Exit(1)
+		return err
 	}
 
 	// TODO: use katenary.yaml file here to set the labels
@@ -140,7 +151,7 @@ func Convert(config ConvertOptions, dockerComposeFile ...string) {
 			)
 			if !overwrite {
 				fmt.Println("Aborting")
-				os.Exit(126) // 126 is the exit code for "Command invoked cannot execute"
+				return nil
 			}
 		}
 		fmt.Println() // clean line
@@ -150,7 +161,7 @@ func Convert(config ConvertOptions, dockerComposeFile ...string) {
 	chart, err := Generate(project)
 	if err != nil {
 		fmt.Println(err)
-		os.Exit(1)
+		return err
 	}
 
 	// if the app version is set from the command line, use it
@@ -163,9 +174,8 @@ func Convert(config ConvertOptions, dockerComposeFile ...string) {
 	os.RemoveAll(config.OutputDir)
 
 	// create the chart directory
-	if err := os.MkdirAll(templateDir, 0o755); err != nil {
-		fmt.Println(utils.IconFailure, err)
-		os.Exit(1)
+	if err := os.MkdirAll(templateDir, utils.DirectoryPermission); err != nil {
+		return err
 	}
 
 	// add icon from the command line
@@ -194,6 +204,7 @@ func Convert(config ConvertOptions, dockerComposeFile ...string) {
 
 	// call helm update if needed
 	callHelmUpdate(config)
+	return nil
 }
 
 func addChartDoc(values []byte, project *types.Project) []byte {
@@ -248,7 +259,7 @@ func addCommentsToValues(values []byte) []byte {
 	return []byte(strings.Join(lines, "\n"))
 }
 
-func addDependencyDescription(values []byte, dependencies []labelStructs.Dependency) []byte {
+func addDependencyDescription(values []byte, dependencies []labelstructs.Dependency) []byte {
 	for _, d := range dependencies {
 		name := d.Name
 		if d.Alias != "" {
@@ -485,6 +496,24 @@ func addYAMLSelectorPath(values []byte) []byte {
 	return []byte(strings.Join(toReturn, "\n"))
 }
 
+// addTLSHelp adds a comment to the values.yaml file to explain how to
+// use the tls option.
+func addTLSHelp(values []byte) []byte {
+	lines := strings.Split(string(values), "\n")
+	for i, line := range lines {
+		if strings.Contains(line, "tls:") {
+			spaces := utils.CountStartingSpaces(line)
+			spacesString := strings.Repeat(" ", spaces)
+			// indent ingressClassHelper comment
+			ingressTLSHelp := strings.ReplaceAll(ingressTLSHelp, "\n", "\n"+spacesString)
+			ingressTLSHelp = strings.TrimRight(ingressTLSHelp, " ")
+			ingressTLSHelp = spacesString + ingressTLSHelp
+			lines[i] = ingressTLSHelp + line
+		}
+	}
+	return []byte(strings.Join(lines, "\n"))
+}
+
 func buildCharYamlFile(chart *HelmChart, project *types.Project, chartPath string) {
 	// calculate the sha1 hash of the services
 	yamlChart, err := utils.EncodeBasicYaml(chart)
@@ -493,16 +522,16 @@ func buildCharYamlFile(chart *HelmChart, project *types.Project, chartPath strin
 		os.Exit(1)
 	}
 	// concat chart adding a comment with hash of services on top
-	yamlChart = append([]byte(fmt.Sprintf("# compose hash (sha1): %s\n", *chart.composeHash)), yamlChart...)
+	yamlChart = append(fmt.Appendf(nil, "# compose hash (sha1): %s\n", *chart.composeHash), yamlChart...)
 	// add the list of compose files
 	files := []string{}
 	for _, file := range project.ComposeFiles {
 		base := filepath.Base(file)
 		files = append(files, base)
 	}
-	yamlChart = append([]byte(fmt.Sprintf("# compose files: %s\n", strings.Join(files, ", "))), yamlChart...)
+	yamlChart = append(fmt.Appendf(nil, "# compose files: %s\n", strings.Join(files, ", ")), yamlChart...)
 	// add generated date
-	yamlChart = append([]byte(fmt.Sprintf("# generated at: %s\n", time.Now().Format(time.RFC3339))), yamlChart...)
+	yamlChart = append(fmt.Appendf(nil, "# generated at: %s\n", time.Now().Format(time.RFC3339)), yamlChart...)
 
 	// document Chart.yaml file
 	yamlChart = addChartDoc(yamlChart, project)
@@ -536,6 +565,7 @@ func buildValues(chart *HelmChart, project *types.Project, valuesPath string) {
 	values = addVariablesDoc(values, project)
 	values = addMainTagAppDoc(values, project)
 	values = addResourceHelp(values)
+	values = addTLSHelp(values)
 	values = addYAMLSelectorPath(values)
 	values = append([]byte(headerHelp), values...)
 
@@ -601,7 +631,11 @@ func writeContent(path string, content []byte) {
 		os.Exit(1)
 	}
 	defer f.Close()
-	f.Write(content)
+	defer func() {
+		if _, err := f.Write(content); err != nil {
+			log.Fatal(err)
+		}
+	}()
 }
 
 // helmLint runs "helm lint" on the output directory.

internal/generator/cronJob.go

@@ -1,9 +1,9 @@
 package generator
 
 import (
-	"katenary/generator/labels"
-	"katenary/generator/labels/labelStructs"
-	"katenary/utils"
+	"github.com/katenary/katenary/internal/generator/labels"
+	"github.com/katenary/katenary/internal/generator/labels/labelstructs"
+	"github.com/katenary/katenary/internal/utils"
 	"log"
 	"strings"
 
@@ -30,7 +30,7 @@ func NewCronJob(service types.ServiceConfig, chart *HelmChart, appName string) (
 	if !ok {
 		return nil, nil
 	}
-	mapping, err := labelStructs.CronJobFrom(labels)
+	mapping, err := labelstructs.CronJobFrom(labels)
 	if err != nil {
 		log.Fatalf("Error parsing cronjob labels: %s", err)
 		return nil, nil

internal/generator/deployment.go

@@ -2,9 +2,9 @@ package generator
 
 import (
 	"fmt"
-	"katenary/generator/labels"
-	"katenary/generator/labels/labelStructs"
-	"katenary/utils"
+	"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"
@@ -39,7 +39,7 @@ type Deployment struct {
 	service            *types.ServiceConfig                    `yaml:"-"`
 	defaultTag         string                                  `yaml:"-"`
 	isMainApp          bool                                    `yaml:"-"`
-	exchangesVolumes   map[string]*labelStructs.ExchangeVolume `yaml:"-"`
+	exchangesVolumes   map[string]*labelstructs.ExchangeVolume `yaml:"-"`
 	boundEnvVar        []string                                `yaml:"-"` // environement to remove
 }
 
@@ -94,7 +94,7 @@ func NewDeployment(service types.ServiceConfig, chart *HelmChart) *Deployment {
 		},
 		configMaps:       make(map[string]*ConfigMapMount),
 		volumeMap:        make(map[string]string),
-		exchangesVolumes: map[string]*labelStructs.ExchangeVolume{},
+		exchangesVolumes: map[string]*labelstructs.ExchangeVolume{},
 		boundEnvVar:      []string{},
 	}
 
@@ -131,11 +131,12 @@ func (d *Deployment) AddContainer(service types.ServiceConfig) {
 		Image: utils.TplValue(service.Name, "repository.image") + ":" +
 			utils.TplValue(service.Name, "repository.tag", d.defaultTag),
 		Ports:           ports,
-		Name:            service.Name,
+		Name:            service.ContainerName,
 		ImagePullPolicy: corev1.PullIfNotPresent,
 		Resources: corev1.ResourceRequirements{
 			Requests: corev1.ResourceList{},
 		},
+		Command: service.Command,
 	}
 	if _, ok := d.chart.Values[service.Name]; !ok {
 		d.chart.Values[service.Name] = NewValue(service, d.isMainApp)
@@ -160,7 +161,7 @@ func (d *Deployment) AddContainer(service types.ServiceConfig) {
 func (d *Deployment) AddHealthCheck(service types.ServiceConfig, container *corev1.Container) {
 	// get the label for healthcheck
 	if v, ok := service.Labels[labels.LabelHealthCheck]; ok {
-		probes, err := labelStructs.ProbeFrom(v)
+		probes, err := labelstructs.ProbeFrom(v)
 		if err != nil {
 			log.Fatal(err)
 		}
@@ -195,7 +196,7 @@ func (d *Deployment) AddIngress(service types.ServiceConfig, appName string) *In
 func (d *Deployment) AddVolumes(service types.ServiceConfig, appName string) {
 	tobind := map[string]bool{}
 	if v, ok := service.Labels[labels.LabelConfigMapFiles]; ok {
-		binds, err := labelStructs.ConfigMapFileFrom(v)
+		binds, err := labelstructs.ConfigMapFileFrom(v)
 		if err != nil {
 			log.Fatal(err)
 		}
@@ -253,8 +254,8 @@ func (d *Deployment) BindFrom(service types.ServiceConfig, binded *Deployment) {
 			// get the container
 		}
 		// add volume mount to the container
-		targetContainer, ti := utils.GetContainerByName(service.Name, d.Spec.Template.Spec.Containers)
-		sourceContainer, _ := utils.GetContainerByName(service.Name, binded.Spec.Template.Spec.Containers)
+		targetContainer, ti := utils.GetContainerByName(service.ContainerName, d.Spec.Template.Spec.Containers)
+		sourceContainer, _ := utils.GetContainerByName(service.ContainerName, binded.Spec.Template.Spec.Containers)
 		for _, bindedMount := range sourceContainer.VolumeMounts {
 			if bindedMount.Name == bindedVolume.Name {
 				targetContainer.VolumeMounts = append(targetContainer.VolumeMounts, bindedMount)
@@ -305,10 +306,7 @@ func (d *Deployment) SetEnvFrom(service types.ServiceConfig, appName string, sam
 	if len(service.Environment) == 0 {
 		return
 	}
-	inSamePod := false
-	if len(samePod) > 0 && samePod[0] {
-		inSamePod = true
-	}
+	inSamePod := len(samePod) > 0 && samePod[0]
 
 	drop := []string{}
 	secrets := []string{}
@@ -323,7 +321,7 @@ func (d *Deployment) SetEnvFrom(service types.ServiceConfig, appName string, sam
 	}()
 
 	// secrets from label
-	labelSecrets, err := labelStructs.SecretsFrom(service.Labels[labels.LabelSecrets])
+	labelSecrets, err := labelstructs.SecretsFrom(service.Labels[labels.LabelSecrets])
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -411,7 +409,7 @@ func (d *Deployment) BindMapFilesToContainer(service types.ServiceConfig, secret
 		})
 	}
 
-	container, index := utils.GetContainerByName(service.Name, d.Spec.Template.Spec.Containers)
+	container, index := utils.GetContainerByName(service.ContainerName, d.Spec.Template.Spec.Containers)
 	if container == nil {
 		utils.Warn("Container not found for service " + service.Name)
 		return nil, -1
@@ -637,12 +635,16 @@ func (d *Deployment) appendFileToConfigMap(service types.ServiceConfig, appName
 	// in generate.go
 	dirname := filepath.Dir(volume.Source)
 	pathname := utils.PathToName(dirname)
+	pathname = strings.TrimSpace(pathname)
+	if len(pathname) != 0 {
+		pathname += "-" + pathname
+	}
 	var cm *ConfigMap
 	if v, ok := d.configMaps[pathname]; !ok {
 		cm = NewConfigMap(*d.service, appName, true)
 		cm.usage = FileMapUsageFiles
 		cm.path = dirname
-		cm.Name = utils.TplName(service.Name, appName) + "-" + pathname
+		cm.Name = utils.TplName(service.Name, appName) + pathname
 		d.configMaps[pathname] = &ConfigMapMount{
 			configMap: cm,
 			mountPath: []mountPathConfig{{
@@ -660,11 +662,13 @@ func (d *Deployment) appendFileToConfigMap(service types.ServiceConfig, appName
 		d.configMaps[pathname].mountPath = mp
 
 	}
-	cm.AppendFile(volume.Source)
+	if err := cm.AppendFile(volume.Source); err != nil {
+		log.Fatal("Error adding file to configmap:", err)
+	}
 }
 
 func (d *Deployment) bindVolumes(volume types.ServiceVolumeConfig, isSamePod bool, tobind map[string]bool, service types.ServiceConfig, appName string) {
-	container, index := utils.GetContainerByName(service.Name, d.Spec.Template.Spec.Containers)
+	container, index := utils.GetContainerByName(service.ContainerName, d.Spec.Template.Spec.Containers)
 
 	defer func(d *Deployment, container *corev1.Container, index int) {
 		d.Spec.Template.Spec.Containers[index] = *container

internal/generator/deployment_test.go

@@ -2,10 +2,12 @@ package generator
 
 import (
 	"fmt"
-	"katenary/generator/labels"
+	"github.com/katenary/katenary/internal/generator/labels"
 	"os"
+	"strings"
 	"testing"
 
+	yaml3 "gopkg.in/yaml.v3"
 	v1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/yaml"
@@ -324,14 +326,208 @@ services:
 			Environment map[string]string `yaml:"environment"`
 		} `yaml:"web"`
 	}{}
-	if err := yaml.Unmarshal(valuesContent, &mapping); err != nil {
+	if err := yaml3.Unmarshal(valuesContent, &mapping); err != nil {
 		t.Errorf(unmarshalError, err)
 	}
 
-	if _, ok := mapping.Web.Environment["FOO"]; !ok {
+	if v, ok := mapping.Web.Environment["FOO"]; !ok {
 		t.Errorf("Expected FOO in web environment")
+		if v != "bar" {
+			t.Errorf("Expected FOO to be bar, got %s", v)
+		}
 	}
-	if _, ok := mapping.Web.Environment["BAZ"]; ok {
+	if v, ok := mapping.Web.Environment["BAZ"]; ok {
 		t.Errorf("Expected BAZ not in web environment")
+		if v != "qux" {
+			t.Errorf("Expected BAZ to be qux, got %s", v)
+		}
+	}
+}
+
+func TestWithUnderscoreInContainerName(t *testing.T) {
+	composeFile := `
+services:
+    web-app:
+        image: nginx:1.29
+        container_name: web_app_container
+        environment:
+            FOO: BAR
+        labels:
+            %s/values: |
+                - FOO
+`
+	composeFile = fmt.Sprintf(composeFile, labels.Prefix())
+	tmpDir := setup(composeFile)
+	defer teardown(tmpDir)
+
+	currentDir, _ := os.Getwd()
+	os.Chdir(tmpDir)
+	defer os.Chdir(currentDir)
+
+	output := internalCompileTest(t, "-s", "templates/web_app/deployment.yaml")
+	dt := v1.Deployment{}
+	if err := yaml.Unmarshal([]byte(output), &dt); err != nil {
+		t.Errorf(unmarshalError, err)
+	}
+	// find container.name
+	containerName := dt.Spec.Template.Spec.Containers[0].Name
+	if strings.Contains(containerName, "_") {
+		t.Errorf("Expected container name to not contain underscores, got %s", containerName)
+	}
+}
+
+func TestWithDashes(t *testing.T) {
+	composeFile := `
+services:
+    web-app:
+        image: nginx:1.29
+        environment:
+            FOO: BAR
+        labels:
+            %s/values: |
+                - FOO
+`
+
+	composeFile = fmt.Sprintf(composeFile, labels.Prefix())
+	tmpDir := setup(composeFile)
+	defer teardown(tmpDir)
+
+	currentDir, _ := os.Getwd()
+	os.Chdir(tmpDir)
+	defer os.Chdir(currentDir)
+
+	output := internalCompileTest(t, "-s", "templates/web_app/deployment.yaml")
+	dt := v1.Deployment{}
+	if err := yaml.Unmarshal([]byte(output), &dt); err != nil {
+		t.Errorf(unmarshalError, err)
+	}
+
+	valuesFile := "./chart/values.yaml"
+	if _, err := os.Stat(valuesFile); os.IsNotExist(err) {
+		t.Errorf("values.yaml does not exist")
+	}
+	valuesContent, err := os.ReadFile(valuesFile)
+	if err != nil {
+		t.Errorf("Error reading values.yaml: %s", err)
+	}
+	mapping := struct {
+		Web struct {
+			Environment map[string]string `yaml:"environment"`
+		} `yaml:"web_app"`
+	}{}
+	if err := yaml3.Unmarshal(valuesContent, &mapping); err != nil {
+		t.Errorf(unmarshalError, err)
+	}
+
+	// we must have FOO in web_app environment (not web-app)
+	// this validates that the service name is converted to a valid k8s name
+	if v, ok := mapping.Web.Environment["FOO"]; !ok {
+		t.Errorf("Expected FOO in web_app environment")
+		if v != "BAR" {
+			t.Errorf("Expected FOO to be BAR, got %s", v)
+		}
+	}
+}
+
+func TestDashesWithValueFrom(t *testing.T) {
+	composeFile := `
+services:
+    web-app:
+        image: nginx:1.29
+        environment:
+            FOO: BAR
+        labels:
+            %[1]s/values: |
+                - FOO
+    web2:
+        image: nginx:1.29
+        labels:
+            %[1]s/values-from: |
+                BAR: web-app.FOO
+`
+
+	composeFile = fmt.Sprintf(composeFile, labels.Prefix())
+	tmpDir := setup(composeFile)
+	defer teardown(tmpDir)
+
+	currentDir, _ := os.Getwd()
+	os.Chdir(tmpDir)
+	defer os.Chdir(currentDir)
+
+	output := internalCompileTest(t, "-s", "templates/web2/deployment.yaml")
+	dt := v1.Deployment{}
+	if err := yaml.Unmarshal([]byte(output), &dt); err != nil {
+		t.Errorf(unmarshalError, err)
+	}
+
+	valuesFile := "./chart/values.yaml"
+	if _, err := os.Stat(valuesFile); os.IsNotExist(err) {
+		t.Errorf("values.yaml does not exist")
+	}
+	valuesContent, err := os.ReadFile(valuesFile)
+	if err != nil {
+		t.Errorf("Error reading values.yaml: %s", err)
+	}
+	mapping := struct {
+		Web struct {
+			Environment map[string]string `yaml:"environment"`
+		} `yaml:"web_app"`
+	}{}
+	if err := yaml3.Unmarshal(valuesContent, &mapping); err != nil {
+		t.Errorf(unmarshalError, err)
+	}
+
+	// we must have FOO in web_app environment (not web-app)
+	// this validates that the service name is converted to a valid k8s name
+	if v, ok := mapping.Web.Environment["FOO"]; !ok {
+		t.Errorf("Expected FOO in web_app environment")
+		if v != "BAR" {
+			t.Errorf("Expected FOO to be BAR, got %s", v)
+		}
+	}
+
+	// ensure that the deployment has the value from the other service
+	barenv := dt.Spec.Template.Spec.Containers[0].Env[0]
+	if barenv.Value != "" {
+		t.Errorf("Expected value to be empty")
+	}
+	if barenv.ValueFrom == nil {
+		t.Errorf("Expected valueFrom to be set")
+	}
+}
+
+func TestCheckCommand(t *testing.T) {
+	composeFile := `
+services:
+    web-app:
+        image: nginx:1.29
+        command:
+            - sh
+            - -c
+            - |-
+                echo "Hello, World!"
+                echo "Done"
+`
+
+	// composeFile = fmt.Sprintf(composeFile, labels.Prefix())
+	tmpDir := setup(composeFile)
+	defer teardown(tmpDir)
+
+	currentDir, _ := os.Getwd()
+	os.Chdir(tmpDir)
+	defer os.Chdir(currentDir)
+
+	output := internalCompileTest(t, "-s", "templates/web_app/deployment.yaml")
+	dt := v1.Deployment{}
+	if err := yaml.Unmarshal([]byte(output), &dt); err != nil {
+		t.Errorf(unmarshalError, err)
+	}
+	// find the command in the container
+	command := dt.Spec.Template.Spec.Containers[0].Command
+	if len(command) != 3 {
+		t.Errorf("Expected command to have 3 elements, got %d", len(command))
+	}
+	if command[0] != "sh" || command[1] != "-c" {
+		t.Errorf("Expected command to be 'sh -c', got %s", strings.Join(command, " "))
 	}
 }

internal/generator/doc.go

@@ -0,0 +1,17 @@
+/*
+Package generator generates kubernetes objects from a "compose" file and transforms them into a helm chart.
+
+The generator package is the core of katenary. It is responsible for generating kubernetes objects from a compose file
+and transforming them into a helm chart.
+Conversion manipulates Yaml representation of kubernetes object to add conditions, labels, annotations, etc. to the
+objects. It also create the values to be set to the values.yaml file.
+
+The generate.Convert() create an HelmChart object and call "Generate()" method to convert from a compose file to a helm
+chart. It saves the helm chart in the given directory.
+
+If you want to change or override the write behavior, you can use the HelmChart.Generate() function and implement your
+own write function. This function returns
+the helm chart object containing all kubernetes objects and helm chart ingormation. It does not write the helm chart to
+the disk.
+*/
+package generator

internal/generator/extrafiles/doc.go

@@ -1,2 +1,2 @@
-/* extrafiles package provides function to generate the Chart files that are not objects. Like README.md and notes.txt... */
+/* Package extrafiles provides function to generate the Chart files that are not objects. Like README.md and notes.txt... */
 package extrafiles

internal/generator/extrafiles/notes_test.go

@@ -0,0 +1,40 @@
+package extrafiles
+
+import (
+	"strings"
+	"testing"
+)
+
+// override the embedded template for testing
+var testTemplate = `
+Some header
+{{ ingress_list }}
+Some footer
+`
+
+func init() {
+	notesTemplate = testTemplate
+}
+
+func TestNotesFile_NoServices(t *testing.T) {
+	result := NotesFile([]string{})
+	if !strings.Contains(result, "Some header") || !strings.Contains(result, "Some footer") {
+		t.Errorf("Expected template header/footer in output, got: %s", result)
+	}
+}
+
+func TestNotesFile_WithServices(t *testing.T) {
+	services := []string{"svc1", "svc2"}
+	result := NotesFile(services)
+
+	for _, svc := range services {
+		cond := "{{- if and .Values." + svc + ".ingress .Values." + svc + ".ingress.enabled }}"
+		line := "{{- $count = add1 $count -}}{{- $listOfURL = printf \"%s\\n- http://%s\" $listOfURL (tpl .Values." + svc + ".ingress.host .) -}}"
+		if !strings.Contains(result, cond) {
+			t.Errorf("Expected condition for service %s in output", svc)
+		}
+		if !strings.Contains(result, line) {
+			t.Errorf("Expected line for service %s in output", svc)
+		}
+	}
+}

internal/generator/extrafiles/readme.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	_ "embed"
 	"fmt"
+	"log"
 	"sort"
 	"strings"
 	"text/template"
@@ -20,7 +21,7 @@ type chart struct {
 	Values      []string
 }
 
-func parseValues(prefix string, values map[string]interface{}, result map[string]string) {
+func parseValues(prefix string, values map[string]any, result map[string]string) {
 	for key, value := range values {
 		path := key
 		if prefix != "" {
@@ -28,11 +29,11 @@ func parseValues(prefix string, values map[string]interface{}, result map[string
 		}
 
 		switch v := value.(type) {
-		case []interface{}:
+		case []any:
 			for i, u := range v {
-				parseValues(fmt.Sprintf("%s[%d]", path, i), map[string]interface{}{"value": u}, result)
+				parseValues(fmt.Sprintf("%s[%d]", path, i), map[string]any{"value": u}, result)
 			}
-		case map[string]interface{}:
+		case map[string]any:
 			parseValues(path, v, result)
 		default:
 			strValue := fmt.Sprintf("`%v`", value)
@@ -48,7 +49,9 @@ func ReadMeFile(charname, description string, values map[string]any) string {
 
 	vv := map[string]any{}
 	out, _ := yaml.Marshal(values)
-	yaml.Unmarshal(out, &vv)
+	if err := yaml.Unmarshal(out, &vv); err != nil {
+		log.Printf("Error parsing values: %s", err)
+	}
 
 	result := make(map[string]string)
 	parseValues("", vv, result)

internal/generator/extrafiles/readme_test.go

@@ -0,0 +1,33 @@
+package extrafiles
+
+import (
+	"regexp"
+	"testing"
+)
+
+func TestReadMeFile_Basic(t *testing.T) {
+	values := map[string]any{
+		"replicas": 2,
+		"image": map[string]any{
+			"repository": "nginx",
+			"tag":        "latest",
+		},
+	}
+
+	result := ReadMeFile("testchart", "A test chart", values)
+	t.Logf("Generated README content:\n%s", result)
+	paramerRegExp := regexp.MustCompile(`\|\s+` + "`" + `(.*?)` + "`" + `\s+\|\s+` + "`" + `(.*?)` + "`" + `\s+\|`)
+	matches := paramerRegExp.FindAllStringSubmatch(result, -1)
+	if len(matches) != 3 {
+		t.Errorf("Expected 5 lines in the table for headers and parameters, got %d", len(matches))
+	}
+	if matches[0][1] != "image.repository" || matches[0][2] != "nginx" {
+		t.Errorf("Expected third line to be image.repository, got %s", matches[1])
+	}
+	if matches[1][1] != "image.tag" || matches[1][2] != "latest" {
+		t.Errorf("Expected fourth line to be image.tag, got %s", matches[2])
+	}
+	if matches[2][1] != "replicas" || matches[2][2] != "2" {
+		t.Errorf("Expected second line to be replicas, got %s", matches[0])
+	}
+}

internal/generator/generator.go

@@ -3,14 +3,17 @@ package generator
 import (
 	"bytes"
 	"fmt"
-	"katenary/generator/labels"
-	"katenary/utils"
 	"log"
 	"regexp"
 	"strings"
 
+	"github.com/katenary/katenary/internal/generator/labels"
+	"github.com/katenary/katenary/internal/generator/labels/labelstructs"
+	"github.com/katenary/katenary/internal/utils"
+
 	"github.com/compose-spec/compose-go/types"
 	corev1 "k8s.io/api/core/v1"
+	"sigs.k8s.io/yaml"
 )
 
 // Generate a chart from a compose project.
@@ -43,6 +46,16 @@ func Generate(project *types.Project) (*HelmChart, error) {
 	Annotations[labels.LabelName("compose-hash")] = hash
 	chart.composeHash = &hash
 
+	// drop all services with the "ignore" label
+	dropIngoredServices(project)
+
+	fixContainerNames(project)
+
+	// rename all services name to remove dashes
+	if err := fixResourceNames(project); err != nil {
+		return nil, err
+	}
+
 	// find the "main-app" label, and set chart.AppVersion to the tag if exists
 	mainCount := 0
 	for _, service := range project.Services {
@@ -107,7 +120,10 @@ func Generate(project *types.Project) (*HelmChart, error) {
 	for _, s := range project.Services {
 		for _, d := range s.GetDependencies() {
 			if dep, ok := deployments[d]; ok {
-				deployments[s.Name].DependsOn(dep, d)
+				err := deployments[s.Name].DependsOn(dep, d)
+				if err != nil {
+					log.Printf("error creating init container for service %[1]s: %[2]s", s.Name, err)
+				}
 			} else {
 				log.Printf("service %[1]s depends on %[2]s, but %[2]s is not defined", s.Name, d)
 			}
@@ -119,7 +135,9 @@ func Generate(project *types.Project) (*HelmChart, error) {
 	}
 
 	// generate configmaps with environment variables
-	chart.generateConfigMapsAndSecrets(project)
+	if err := chart.generateConfigMapsAndSecrets(project); err != nil {
+		log.Fatalf("error generating configmaps and secrets: %s", err)
+	}
 
 	// if the env-from label is set, we need to add the env vars from the configmap
 	// to the environment of the service
@@ -187,6 +205,52 @@ func Generate(project *types.Project) (*HelmChart, error) {
 	return chart, nil
 }
 
+// dropIngoredServices removes all services with the "ignore" label set to true (or yes).
+func dropIngoredServices(project *types.Project) {
+	for i, service := range project.Services {
+		if isIgnored(service) {
+			project.Services = append(project.Services[:i], project.Services[i+1:]...)
+		}
+	}
+}
+
+// fixResourceNames renames all services and related resources to remove dashes.
+func fixResourceNames(project *types.Project) error {
+	// rename all services name to remove dashes
+	for i, service := range project.Services {
+		if service.Name != utils.AsResourceName(service.Name) {
+			fixed := utils.AsResourceName(service.Name)
+			for j, s := range project.Services {
+				// for the same-pod services, we need to keep the original name
+				if samepod, ok := s.Labels[labels.LabelSamePod]; ok && samepod == service.Name {
+					s.Labels[labels.LabelSamePod] = fixed
+					project.Services[j] = s
+				}
+				// also, the value-from label should be updated
+				if valuefrom, ok := s.Labels[labels.LabelValuesFrom]; ok {
+					vf, err := labelstructs.GetValueFrom(valuefrom)
+					if err != nil {
+						return err
+					}
+					for varname, bind := range *vf {
+						log.Printf("service %s, varname %s, bind %s", service.Name, varname, bind)
+						bind := strings.ReplaceAll(bind, service.Name, fixed)
+						(*vf)[varname] = bind
+					}
+					output, err := yaml.Marshal(vf)
+					if err != nil {
+						return err
+					}
+					s.Labels[labels.LabelValuesFrom] = string(output)
+				}
+			}
+			service.Name = fixed
+			project.Services[i] = service
+		}
+	}
+	return nil
+}
+
 // serviceIsMain returns true if the service is the main app.
 func serviceIsMain(service types.ServiceConfig) bool {
 	if main, ok := service.Labels[labels.LabelMainApp]; ok {
@@ -204,7 +268,7 @@ func addStaticVolumes(deployments map[string]*Deployment, service types.ServiceC
 		return
 	}
 
-	container, index := utils.GetContainerByName(service.Name, d.Spec.Template.Spec.Containers)
+	container, index := utils.GetContainerByName(service.ContainerName, d.Spec.Template.Spec.Containers)
 	if container == nil { // may append for the same-pod services
 		return
 	}
@@ -256,7 +320,7 @@ func computeNIndent(b []byte) []byte {
 			startSpaces = spaces[0]
 		}
 		line = []byte(startSpaces + strings.TrimLeft(string(line), " "))
-		line = bytes.ReplaceAll(line, []byte("__indent__"), []byte(fmt.Sprintf("%d", len(startSpaces))))
+		line = bytes.ReplaceAll(line, []byte("__indent__"), fmt.Appendf(nil, "%d", len(startSpaces)))
 		lines[i] = line
 	}
 	return bytes.Join(lines, []byte("\n"))
@@ -329,7 +393,7 @@ func samePodVolume(service types.ServiceConfig, v types.ServiceVolumeConfig, dep
 		return false
 	}
 
-	if service.Volumes == nil || len(service.Volumes) == 0 {
+	if len(service.Volumes) == 0 {
 		return false
 	}
 
@@ -355,3 +419,15 @@ func samePodVolume(service types.ServiceConfig, v types.ServiceVolumeConfig, dep
 	}
 	return false
 }
+
+func fixContainerNames(project *types.Project) {
+	// fix container names to be unique
+	for i, service := range project.Services {
+		if service.ContainerName == "" {
+			service.ContainerName = utils.FixedResourceName(service.Name)
+		} else {
+			service.ContainerName = utils.FixedResourceName(service.ContainerName)
+		}
+		project.Services[i] = service
+	}
+}

internal/generator/globals.go

@@ -1,8 +1,9 @@
 package generator
 
 import (
-	"katenary/generator/labels"
 	"regexp"
+
+	"github.com/katenary/katenary/internal/generator/labels"
 )
 
 var (

internal/generator/helper.go

@@ -2,7 +2,7 @@ package generator
 
 import (
 	_ "embed"
-	"katenary/generator/labels"
+	"github.com/katenary/katenary/internal/generator/labels"
 	"strings"
 )
 

internal/generator/ingress.go

@@ -1,12 +1,13 @@
 package generator
 
 import (
-	"katenary/generator/labels"
-	"katenary/generator/labels/labelStructs"
-	"katenary/utils"
 	"log"
 	"strings"
 
+	"github.com/katenary/katenary/internal/generator/labels"
+	"github.com/katenary/katenary/internal/generator/labels/labelstructs"
+	"github.com/katenary/katenary/internal/utils"
+
 	"github.com/compose-spec/compose-go/types"
 	networkv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -17,6 +18,7 @@ var _ Yaml = (*Ingress)(nil)
 type Ingress struct {
 	*networkv1.Ingress
 	service *types.ServiceConfig `yaml:"-"`
+	appName string               `yaml:"-"`
 }
 
 // NewIngress creates a new Ingress from a compose service.
@@ -32,7 +34,7 @@ func NewIngress(service types.ServiceConfig, Chart *HelmChart) *Ingress {
 		return nil
 	}
 
-	mapping, err := labelStructs.IngressFrom(label)
+	mapping, err := labelstructs.IngressFrom(label)
 	if err != nil {
 		log.Fatalf("Failed to parse ingress label: %s\n", err)
 	}
@@ -42,7 +44,11 @@ func NewIngress(service types.ServiceConfig, Chart *HelmChart) *Ingress {
 
 	// create the ingress
 	pathType := networkv1.PathTypeImplementationSpecific
-	serviceName := `{{ include "` + appName + `.fullname" . }}-` + service.Name
+
+	// fix the service name, and create the full name from variable name
+	// which is injected in the YAML() method
+	serviceName := strings.ReplaceAll(service.Name, "_", "-")
+	fullName := `{{ $fullname }}-` + serviceName
 
 	// Add the ingress host to the values.yaml
 	if Chart.Values[service.Name] == nil {
@@ -63,7 +69,7 @@ func NewIngress(service types.ServiceConfig, Chart *HelmChart) *Ingress {
 
 	servicePortName := utils.GetServiceNameByPort(int(*mapping.Port))
 	ingressService := &networkv1.IngressServiceBackend{
-		Name: serviceName,
+		Name: fullName,
 		Port: networkv1.ServiceBackendPort{},
 	}
 	if servicePortName != "" {
@@ -74,26 +80,27 @@ func NewIngress(service types.ServiceConfig, Chart *HelmChart) *Ingress {
 
 	ing := &Ingress{
 		service: &service,
+		appName: appName,
 		Ingress: &networkv1.Ingress{
 			TypeMeta: metav1.TypeMeta{
 				Kind:       "Ingress",
 				APIVersion: "networking.k8s.io/v1",
 			},
 			ObjectMeta: metav1.ObjectMeta{
-				Name:        utils.TplName(service.Name, appName),
-				Labels:      GetLabels(service.Name, appName),
+				Name:        fullName,
+				Labels:      GetLabels(serviceName, appName),
 				Annotations: Annotations,
 			},
 			Spec: networkv1.IngressSpec{
 				IngressClassName: &ingressClassName,
 				Rules: []networkv1.IngressRule{
 					{
-						Host: utils.TplValue(service.Name, "ingress.host"),
+						Host: utils.TplValue(serviceName, "ingress.host"),
 						IngressRuleValue: networkv1.IngressRuleValue{
 							HTTP: &networkv1.HTTPIngressRuleValue{
 								Paths: []networkv1.HTTPIngressPath{
 									{
-										Path:     utils.TplValue(service.Name, "ingress.path"),
+										Path:     utils.TplValue(serviceName, "ingress.path"),
 										PathType: &pathType,
 										Backend: networkv1.IngressBackend{
 											Service: ingressService,
@@ -107,9 +114,9 @@ func NewIngress(service types.ServiceConfig, Chart *HelmChart) *Ingress {
 				TLS: []networkv1.IngressTLS{
 					{
 						Hosts: []string{
-							`{{ tpl .Values.` + service.Name + `.ingress.host . }}`,
+							`{{ tpl .Values.` + serviceName + `.ingress.host . }}`,
 						},
-						SecretName: `{{ include "` + appName + `.fullname" . }}-` + service.Name + `-tls`,
+						SecretName: `{{ .Values.` + serviceName + `.ingress.tls.secretName | default $tlsname }}`,
 					},
 				},
 			},
@@ -131,9 +138,7 @@ func (ingress *Ingress) Yaml() ([]byte, error) {
 	}
 
 	serviceName := ingress.service.Name
-	if err != nil {
-		return nil, err
-	}
+
 	ret = UnWrapTPL(ret)
 
 	lines := strings.Split(string(ret), "\n")
@@ -141,9 +146,7 @@ func (ingress *Ingress) Yaml() ([]byte, error) {
 	// first pass, wrap the tls part with `{{- if .Values.serviceName.ingress.tlsEnabled -}}`
 	// and `{{- end -}}`
 
-	from := -1
-	to := -1
-	spaces := -1
+	from, to, spaces := -1, -1, -1
 	for i, line := range lines {
 		if strings.Contains(line, "tls:") {
 			from = i
@@ -167,6 +170,8 @@ func (ingress *Ingress) Yaml() ([]byte, error) {
 
 	out := []string{
 		`{{- if .Values.` + serviceName + `.ingress.enabled -}}`,
+		`{{- $fullname := include "` + ingress.appName + `.fullname" . -}}`,
+		`{{- $tlsname := printf "%s-%s-tls" $fullname "` + ingress.service.Name + `" -}}`,
 	}
 	for _, line := range lines {
 		if strings.Contains(line, "loadBalancer: ") {

internal/generator/ingress_test.go

@@ -0,0 +1,128 @@
+package generator
+
+import (
+	"fmt"
+	"github.com/katenary/katenary/internal/generator/labels"
+	"os"
+	"testing"
+
+	v1 "k8s.io/api/networking/v1"
+	"sigs.k8s.io/yaml"
+)
+
+func TestSimpleIngress(t *testing.T) {
+	composeFile := `
+services:
+    web:
+        image: nginx:1.29
+        ports:
+        - 80:80
+        - 443:443
+        labels:
+            %s/ingress: |-
+                hostname: my.test.tld
+                port: 80
+`
+	composeFile = fmt.Sprintf(composeFile, labels.KatenaryLabelPrefix)
+	tmpDir := setup(composeFile)
+	defer teardown(tmpDir)
+
+	currentDir, _ := os.Getwd()
+	os.Chdir(tmpDir)
+	defer os.Chdir(currentDir)
+
+	output := internalCompileTest(
+		t,
+		"-s", "templates/web/ingress.yaml",
+		"--set", "web.ingress.enabled=true",
+	)
+	ingress := v1.Ingress{}
+	if err := yaml.Unmarshal([]byte(output), &ingress); err != nil {
+		t.Errorf(unmarshalError, err)
+	}
+	if len(ingress.Spec.Rules) != 1 {
+		t.Errorf("Expected 1 rule, got %d", len(ingress.Spec.Rules))
+	}
+	if ingress.Spec.Rules[0].Host != "my.test.tld" {
+		t.Errorf("Expected host to be my.test.tld, got %s", ingress.Spec.Rules[0].Host)
+	}
+}
+
+func TestTLS(t *testing.T) {
+	composeFile := `
+services:
+    web:
+        image: nginx:1.29
+        ports:
+        - 80:80
+        - 443:443
+        labels:
+            %s/ingress: |-
+                hostname: my.test.tld
+                port: 80
+`
+	composeFile = fmt.Sprintf(composeFile, labels.KatenaryLabelPrefix)
+	tmpDir := setup(composeFile)
+	defer teardown(tmpDir)
+
+	currentDir, _ := os.Getwd()
+	os.Chdir(tmpDir)
+	defer os.Chdir(currentDir)
+
+	output := internalCompileTest(
+		t,
+		"-s", "templates/web/ingress.yaml",
+		"--set", "web.ingress.enabled=true",
+	)
+	ingress := v1.Ingress{}
+	if err := yaml.Unmarshal([]byte(output), &ingress); err != nil {
+		t.Errorf(unmarshalError, err)
+	}
+	// find the tls section
+	tls := ingress.Spec.TLS
+	if len(tls) != 1 {
+		t.Errorf("Expected 1 tls section, got %d", len(tls))
+	}
+}
+
+func TestTLSName(t *testing.T) {
+	composeFile := `
+services:
+    web:
+        image: nginx:1.29
+        ports:
+        - 80:80
+        - 443:443
+        labels:
+            %s/ingress: |-
+                hostname: my.test.tld
+                port: 80
+`
+	composeFile = fmt.Sprintf(composeFile, labels.KatenaryLabelPrefix)
+	tmpDir := setup(composeFile)
+	defer teardown(tmpDir)
+
+	currentDir, _ := os.Getwd()
+	os.Chdir(tmpDir)
+	defer os.Chdir(currentDir)
+
+	output := internalCompileTest(
+		t,
+		"-s",
+		"templates/web/ingress.yaml",
+		"--set", "web.ingress.enabled=true",
+		"--set", "web.ingress.tls.secretName=mysecret",
+	)
+	ingress := v1.Ingress{}
+	if err := yaml.Unmarshal([]byte(output), &ingress); err != nil {
+		t.Errorf(unmarshalError, err)
+	}
+	// find the tls section
+	tls := ingress.Spec.TLS
+	if len(tls) != 1 {
+		t.Errorf("Expected 1 tls section, got %d", len(tls))
+	}
+	if tls[0].SecretName != "mysecret" {
+		t.Errorf("Expected secretName to be mysecret, got %s", tls[0].SecretName)
+	}
+}

internal/generator/katenaryfile/main.go

@@ -0,0 +1,165 @@
+package katenaryfile
+
+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"
+
+	"github.com/compose-spec/compose-go/types"
+	"github.com/invopop/jsonschema"
+	"gopkg.in/yaml.v3"
+)
+
+var allowedKatenaryYamlFileNames = []string{"katenary.yaml", "katenary.yml"}
+
+// 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
+type StringOrMap any
+
+// Service is a struct that contains the service configuration for katenary
+type Service struct {
+	MainApp         *bool                          `yaml:"main-app,omitempty" json:"main-app,omitempty" jsonschema:"title=Is this service the main application"`
+	Values          []StringOrMap                  `yaml:"values,omitempty" json:"values,omitempty" jsonschema:"description=Environment variables to be set in values.yaml with or without a description"`
+	Secrets         *labelstructs.Secrets          `yaml:"secrets,omitempty" json:"secrets,omitempty" jsonschema:"title=Secrets,description=Environment variables to be set as secrets"`
+	Ports           *labelstructs.Ports            `yaml:"ports,omitempty" json:"ports,omitempty" jsonschema:"title=Ports,description=Ports to be exposed in services"`
+	Ingress         *labelstructs.Ingress          `yaml:"ingress,omitempty" json:"ingress,omitempty" jsonschema:"title=Ingress,description=Ingress configuration"`
+	HealthCheck     *labelstructs.HealthCheck      `yaml:"health-check,omitempty" json:"health-check,omitempty" jsonschema:"title=Health Check,description=Health check configuration that respects the kubernetes api"`
+	SamePod         *string                        `yaml:"same-pod,omitempty" json:"same-pod,omitempty" jsonschema:"title=Same Pod,description=Service that should be in the same pod"`
+	Description     *string                        `yaml:"description,omitempty" json:"description,omitempty" jsonschema:"title=Description,description=Description of the service that will be injected in the values.yaml file"`
+	Ignore          *bool                          `yaml:"ignore,omitempty" json:"ignore,omitempty" jsonschema:"title=Ignore,description=Ignore the service in the conversion"`
+	Dependencies    []labelstructs.Dependency      `yaml:"dependencies,omitempty" json:"dependencies,omitempty" jsonschema:"title=Dependencies,description=Services that should be injected in the Chart.yaml file"`
+	ConfigMapFiles  *labelstructs.ConfigMapFiles   `yaml:"configmap-files,omitempty" json:"configmap-files,omitempty" jsonschema:"title=ConfigMap Files,description=Files that should be injected as ConfigMap"`
+	MapEnv          *labelstructs.MapEnv           `yaml:"map-env,omitempty" json:"map-env,omitempty" jsonschema:"title=Map Env,description=Map environment variables to another value"`
+	CronJob         *labelstructs.CronJob          `yaml:"cron-job,omitempty" json:"cron-job,omitempty" jsonschema:"title=Cron Job,description=Cron Job configuration"`
+	EnvFrom         *labelstructs.EnvFrom          `yaml:"env-from,omitempty" json:"env-from,omitempty" jsonschema:"title=Env From,description=Inject environment variables from another service"`
+	ExchangeVolumes []*labelstructs.ExchangeVolume `yaml:"exchange-volumes,omitempty" json:"exchange-volumes,omitempty" jsonschema:"title=Exchange Volumes,description=Exchange volumes between services"`
+	ValuesFrom      *labelstructs.ValueFrom        `yaml:"values-from,omitempty" json:"values-from,omitempty" jsonschema:"title=Values From,description=Inject values from another service (secret or configmap environment variables)"`
+}
+
+// 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.
+func OverrideWithConfig(project *types.Project) {
+	var yamlFile string
+	var err error
+	for _, yamlFile = range allowedKatenaryYamlFileNames {
+		_, err = os.Stat(yamlFile)
+		if err == nil {
+			break
+		}
+	}
+	if err != nil {
+		// no katenary file found
+		return
+	}
+	fmt.Println(utils.IconInfo, "Using katenary file", yamlFile)
+
+	services := make(map[string]Service)
+	fp, err := os.Open(yamlFile)
+	if err != nil {
+		return
+	}
+	if err := yaml.NewDecoder(fp).Decode(&services); err != nil {
+		log.Fatal(err)
+		return
+	}
+	for i, p := range project.Services {
+		name := p.Name
+		if project.Services[i].Labels == nil {
+			project.Services[i].Labels = make(map[string]string)
+		}
+		mustGetLabelContent := func(o any, s *types.ServiceConfig, labelName string) {
+			err := getLabelContent(o, s, labelName)
+			if err != nil {
+				log.Fatal(err)
+			}
+		}
+
+		if s, ok := services[name]; ok {
+			mustGetLabelContent(s.MainApp, &project.Services[i], labels.LabelMainApp)
+			mustGetLabelContent(s.Values, &project.Services[i], labels.LabelValues)
+			mustGetLabelContent(s.Secrets, &project.Services[i], labels.LabelSecrets)
+			mustGetLabelContent(s.Ports, &project.Services[i], labels.LabelPorts)
+			mustGetLabelContent(s.Ingress, &project.Services[i], labels.LabelIngress)
+			mustGetLabelContent(s.HealthCheck, &project.Services[i], labels.LabelHealthCheck)
+			mustGetLabelContent(s.SamePod, &project.Services[i], labels.LabelSamePod)
+			mustGetLabelContent(s.Description, &project.Services[i], labels.LabelDescription)
+			mustGetLabelContent(s.Ignore, &project.Services[i], labels.LabelIgnore)
+			mustGetLabelContent(s.Dependencies, &project.Services[i], labels.LabelDependencies)
+			mustGetLabelContent(s.ConfigMapFiles, &project.Services[i], labels.LabelConfigMapFiles)
+			mustGetLabelContent(s.MapEnv, &project.Services[i], labels.LabelMapEnv)
+			mustGetLabelContent(s.CronJob, &project.Services[i], labels.LabelCronJob)
+			mustGetLabelContent(s.EnvFrom, &project.Services[i], labels.LabelEnvFrom)
+			mustGetLabelContent(s.ExchangeVolumes, &project.Services[i], labels.LabelExchangeVolume)
+			mustGetLabelContent(s.ValuesFrom, &project.Services[i], labels.LabelValuesFrom)
+		}
+	}
+	fmt.Println(utils.IconInfo, "Katenary file loaded successfully, the services are now configured.")
+}
+
+func getLabelContent(o any, service *types.ServiceConfig, labelName string) error {
+	if reflect.ValueOf(o).IsZero() {
+		return nil
+	}
+
+	c, err := yaml.Marshal(o)
+	if err != nil {
+		log.Println(err)
+		return err
+	}
+	val := strings.TrimSpace(string(c))
+	if labelName == labels.LabelIngress {
+		// special case, values must be set from some defaults
+		ing, err := labelstructs.IngressFrom(val)
+		if err != nil {
+			log.Fatal(err)
+			return err
+		}
+		c, err := yaml.Marshal(ing)
+		if err != nil {
+			return err
+		}
+		val = strings.TrimSpace(string(c))
+	}
+
+	service.Labels[labelName] = val
+	return nil
+}
+
+// GenerateSchema generates the schema for the katenary.yaml file.
+func GenerateSchema() string {
+	s := jsonschema.Reflect(map[string]Service{})
+
+	// redefine the IntOrString type from k8s
+	s.Definitions["IntOrString"] = &jsonschema.Schema{
+		OneOf: []*jsonschema.Schema{
+			{Type: "integer"},
+			{Type: "string"},
+		},
+	}
+
+	// same for the StringOrMap type, that can be either a string or a map of string:string
+	s.Definitions["StringOrMap"] = &jsonschema.Schema{
+		OneOf: []*jsonschema.Schema{
+			{Type: "string"},
+			{Type: "object", AdditionalProperties: &jsonschema.Schema{Type: "string"}},
+		},
+	}
+
+	c, _ := s.MarshalJSON()
+	// indent the json
+	var out bytes.Buffer
+	err := json.Indent(&out, c, "", "  ")
+	if err != nil {
+		return err.Error()
+	}
+
+	return out.String()
+}

internal/generator/katenaryfile/main_test.go

@@ -1,7 +1,7 @@
 package katenaryfile
 
 import (
-	"katenary/generator/labels"
+	"github.com/katenary/katenary/internal/generator/labels"
 	"log"
 	"os"
 	"path/filepath"
@@ -33,7 +33,7 @@ webapp:
 	// create /tmp/katenary-test-override directory, save the compose.yaml file
 	tmpDir, err := os.MkdirTemp("", "katenary-test-override")
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("Failed to create temp directory: %s", err.Error())
 	}
 	composeFile := filepath.Join(tmpDir, "compose.yaml")
 	katenaryFile := filepath.Join(tmpDir, "katenary.yaml")
@@ -57,6 +57,9 @@ webapp:
 		cli.WithDefaultConfigPath,
 	)
 	project, err := cli.ProjectFromOptions(options)
+	if err != nil {
+		t.Fatalf("Failed to create project from options: %s", err.Error())
+	}
 
 	OverrideWithConfig(project)
 	w := project.Services[0].Labels
@@ -83,7 +86,7 @@ webapp:
 	// create /tmp/katenary-test-override directory, save the compose.yaml file
 	tmpDir, err := os.MkdirTemp("", "katenary-test-override")
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("Failed to create temp directory: %s", err.Error())
 	}
 	composeFile := filepath.Join(tmpDir, "compose.yaml")
 	katenaryFile := filepath.Join(tmpDir, "katenary.yaml")
@@ -107,6 +110,9 @@ webapp:
 		cli.WithDefaultConfigPath,
 	)
 	project, err := cli.ProjectFromOptions(options)
+	if err != nil {
+		t.Fatalf("Failed to create project from options: %s", err.Error())
+	}
 
 	OverrideWithConfig(project)
 	w := project.Services[0].Labels
@@ -117,3 +123,58 @@ webapp:
 		t.Fatal("Expected ingress to be defined", v)
 	}
 }
+
+func TestOverrideConfigMapFiles(t *testing.T) {
+	composeContent := `
+services:
+  webapp:
+    image: nginx:latest
+`
+
+	katenaryfileContent := `
+webapp:
+  configmap-files:
+    - foo/bar
+  ports:
+    - 80
+  ingress:
+    port: 80
+`
+
+	// create /tmp/katenary-test-override directory, save the compose.yaml file
+	tmpDir, err := os.MkdirTemp("", "katenary-test-override")
+	if err != nil {
+		t.Fatalf("Failed to create temp directory: %s", err.Error())
+	}
+	composeFile := filepath.Join(tmpDir, "compose.yaml")
+	katenaryFile := filepath.Join(tmpDir, "katenary.yaml")
+
+	os.MkdirAll(tmpDir, 0755)
+	if err := os.WriteFile(composeFile, []byte(composeContent), 0644); err != nil {
+		t.Log(err)
+	}
+	if err := os.WriteFile(katenaryFile, []byte(katenaryfileContent), 0644); err != nil {
+		t.Log(err)
+	}
+	defer os.RemoveAll(tmpDir)
+
+	c, _ := os.ReadFile(composeFile)
+	log.Println(string(c))
+
+	// chand dir to this directory
+	os.Chdir(tmpDir)
+	options, _ := cli.NewProjectOptions(nil,
+		cli.WithWorkingDirectory(tmpDir),
+		cli.WithDefaultConfigPath,
+	)
+	project, err := cli.ProjectFromOptions(options)
+	if err != nil {
+		t.Fatalf("Failed to create project from options: %s", err.Error())
+	}
+
+	OverrideWithConfig(project)
+	w := project.Services[0].Labels
+	if v, ok := w[labels.LabelConfigMapFiles]; !ok {
+		t.Fatal("Expected configmap-files to be defined", v)
+	}
+}

internal/generator/labels.go

@@ -2,7 +2,7 @@ package generator
 
 import (
 	"fmt"
-	"katenary/generator/labels"
+	"github.com/katenary/katenary/internal/generator/labels"
 )
 
 var componentLabel = labels.LabelName("component")

internal/generator/labels/doc.go

@@ -0,0 +1,2 @@
+// Package labels provides functionality to parse and manipulate labels.
+package labels

internal/generator/labels/katenaryLabels.go

@@ -4,7 +4,8 @@ import (
 	"bytes"
 	_ "embed"
 	"fmt"
-	"katenary/utils"
+	"github.com/katenary/katenary/internal/utils"
+	"log"
 	"regexp"
 	"sort"
 	"strings"
@@ -33,7 +34,7 @@ const (
 	LabelCronJob        Label = KatenaryLabelPrefix + "/cronjob"
 	LabelEnvFrom        Label = KatenaryLabelPrefix + "/env-from"
 	LabelExchangeVolume Label = KatenaryLabelPrefix + "/exchange-volumes"
-	LabelValueFrom      Label = KatenaryLabelPrefix + "/values-from"
+	LabelValuesFrom     Label = KatenaryLabelPrefix + "/values-from"
 )
 
 var (
@@ -83,7 +84,7 @@ func init() {
 	}
 }
 
-// Generate the help for the labels.
+// GetLabelHelp return the help for the labels.
 func GetLabelHelp(asMarkdown bool) string {
 	names := GetLabelNames() // sorted
 	if !asMarkdown {
@@ -125,23 +126,30 @@ func GetLabelHelpFor(labelname string, asMarkdown bool) string {
 	}
 
 	var buf bytes.Buffer
-	template.Must(template.New("shorthelp").Parse(help.Long)).Execute(&buf, struct {
+	var err error
+	err = template.Must(template.New("shorthelp").Parse(help.Long)).Execute(&buf, struct {
 		KatenaryPrefix string
 	}{
 		KatenaryPrefix: KatenaryLabelPrefix,
 	})
+	if err != nil {
+		log.Fatalf("Error executing template: %v", err)
+	}
 	help.Long = buf.String()
 	buf.Reset()
 
-	template.Must(template.New("example").Parse(help.Example)).Execute(&buf, struct {
+	err = template.Must(template.New("example").Parse(help.Example)).Execute(&buf, struct {
 		KatenaryPrefix string
 	}{
 		KatenaryPrefix: KatenaryLabelPrefix,
 	})
+	if err != nil {
+		log.Fatalf("Error executing template: %v", err)
+	}
 	help.Example = buf.String()
 	buf.Reset()
 
-	template.Must(template.New("complete").Parse(helpTemplate)).Execute(&buf, struct {
+	err = template.Must(template.New("complete").Parse(helpTemplate)).Execute(&buf, struct {
 		Name           string
 		Help           Help
 		KatenaryPrefix string
@@ -150,6 +158,9 @@ func GetLabelHelpFor(labelname string, asMarkdown bool) string {
 		Help:           help,
 		KatenaryPrefix: KatenaryLabelPrefix,
 	})
+	if err != nil {
+		log.Fatalf("Error executing template: %v", err)
+	}
 
 	return buf.String()
 }

internal/generator/labels/katenaryLabelsDoc.yaml

@@ -224,7 +224,7 @@
   type: "[]object"
 
 "configmap-files":
-  short: "Add files to the configmap."
+  short: "Inject files as Configmap."
   long: |-
     It makes a file or directory to be converted to one or more ConfigMaps 
     and mounted in the pod. The file or directory is relative to the 
@@ -266,7 +266,7 @@
   type: "object"
 
 "env-from":
-  short: "Add environment variables from antoher service."
+  short: "Add environment variables from another service."
   type: "[]string"
   long: |-
     It adds environment variables from another service to the current service.
@@ -338,9 +338,9 @@
         MARIADB_USER: myuser
         MARIADB_PASSWORD: mypassword
       labels:
-        # it can be a secret
+        # we can declare secrets
         {{ .KatenaryPrefix }}/secrets: |-
-          - DB_PASSWORD
+          - MARIADB_PASSWORD
     php:
       image: php:7.4-fpm
       environment:

internal/generator/labels/labelstructs/configMap.go

@@ -0,0 +1,13 @@
+package labelstructs
+
+import "gopkg.in/yaml.v3"
+
+type ConfigMapFiles []string
+
+func ConfigMapFileFrom(data string) (ConfigMapFiles, error) {
+	var mapping ConfigMapFiles
+	if err := yaml.Unmarshal([]byte(data), &mapping); err != nil {
+		return nil, err
+	}
+	return mapping, nil
+}

internal/generator/labels/labelstructs/configMap_test.go

@@ -0,0 +1,17 @@
+package labelstructs_test
+
+import (
+	"github.com/katenary/katenary/internal/generator/labels/labelstructs"
+	"testing"
+)
+
+func TestConfigMapFileFrom(t *testing.T) {
+	ts := "- foo/bar"
+	tc2, _ := labelstructs.ConfigMapFileFrom(ts)
+	if len(tc2) != 1 {
+		t.Errorf("Expected ConfigMapFile to have 1 item, got %d", len(tc2))
+	}
+	if tc2[0] != "foo/bar" {
+		t.Errorf("Expected ConfigMapFile to contain 'foo/bar', got %s", tc2[0])
+	}
+}

internal/generator/labels/labelstructs/cronJob.go

@@ -1,4 +1,4 @@
-package labelStructs
+package labelstructs
 
 import "gopkg.in/yaml.v3"
 

internal/generator/labels/labelstructs/cronJob_test.go

@@ -0,0 +1,25 @@
+package labelstructs
+
+import "testing"
+
+func TestCronJobFrom(t *testing.T) {
+	ts := `
+image: fooimage
+command: thecommand
+schedule: "0/3 0 * * *"
+Rbac: false
+`
+	tc, _ := CronJobFrom(ts)
+	if tc.Image != "fooimage" {
+		t.Errorf("Expected CronJob image to be 'fooimage', got %s", tc.Image)
+	}
+	if tc.Command != "thecommand" {
+		t.Errorf("Expected CronJob command to be 'thecommand', got %s", tc.Command)
+	}
+	if tc.Schedule != "0/3 0 * * *" {
+		t.Errorf("Expected CronJob schedule to be '0/3 0 * * *', got %s", tc.Schedule)
+	}
+	if tc.Rbac != false {
+		t.Errorf("Expected CronJob rbac to be false, got %t", tc.Rbac)
+	}
+}

internal/generator/labels/labelstructs/dependencies.go

@@ -1,4 +1,4 @@
-package labelStructs
+package labelstructs
 
 import "gopkg.in/yaml.v3"
 

internal/generator/labels/labelstructs/dependencies_test.go

@@ -0,0 +1,14 @@
+package labelstructs
+
+import "testing"
+
+func TestDependenciesLabel(t *testing.T) {
+	ts := "- name: mongodb"
+	tc, _ := DependenciesFrom(ts)
+	if len(tc) != 1 {
+		t.Errorf("Expected DependenciesLabel to have 1 item, got %d", len(tc))
+	}
+	if tc[0].Name != "mongodb" {
+		t.Errorf("Expected DependenciesLabel to contain 'mongodb', got %s", tc[0].Name)
+	}
+}

internal/generator/labels/labelstructs/doc.go

@@ -0,0 +1,2 @@
+// Package labelstructs is a package that contains the structs used to represent the labels in the yaml files.
+package labelstructs

internal/generator/labels/labelstructs/envFrom.go

@@ -1,4 +1,4 @@
-package labelStructs
+package labelstructs
 
 import "gopkg.in/yaml.v3"
 

internal/generator/labels/labelstructs/envFrom_test.go

@@ -0,0 +1,17 @@
+package labelstructs
+
+import "testing"
+
+func TestEnvFromLabel(t *testing.T) {
+	ts := "- foo\n- bar"
+	tc, _ := EnvFromFrom(ts)
+	if len(tc) != 2 {
+		t.Errorf("Expected EnvFrom to have 2 items, got %d", len(tc))
+	}
+	if tc[0] != "foo" {
+		t.Errorf("Expected EnvFrom to contain 'foo', got %s", tc[0])
+	}
+	if tc[1] != "bar" {
+		t.Errorf("Expected EnvFrom to contain 'bar', got %s", tc[1])
+	}
+}

internal/generator/labels/labelstructs/exchangeVolume.go

@@ -1,4 +1,4 @@
-package labelStructs
+package labelstructs
 
 import "gopkg.in/yaml.v3"
 

internal/generator/labels/labelstructs/exchangeVolume_test.go

@@ -0,0 +1,17 @@
+package labelstructs
+
+import "testing"
+
+func TestExchangeVolumeLabel(t *testing.T) {
+	ts := "- name: exchange-volume\n  mountPath: /exchange\n  readOnly: true"
+	tc, _ := NewExchangeVolumes(ts)
+	if len(tc) != 1 {
+		t.Errorf("Expected ExchangeVolumeLabel to have 1 item, got %d", len(tc))
+	}
+	if tc[0].Name != "exchange-volume" {
+		t.Errorf("Expected ExchangeVolumeLabel to contain 'exchange-volume', got %s", tc[0].Name)
+	}
+	if tc[0].MountPath != "/exchange" {
+		t.Errorf("Expected MountPath to be '/exchange', got %s", tc[0].MountPath)
+	}
+}

internal/generator/labels/labelstructs/ingress.go

@@ -1,8 +1,8 @@
-package labelStructs
+package labelstructs
 
 import (
 	"fmt"
-	"katenary/utils"
+	"github.com/katenary/katenary/internal/utils"
 
 	"gopkg.in/yaml.v3"
 )
@@ -14,10 +14,10 @@ type TLS struct {
 type Ingress struct {
 	Port        *int32            `yaml:"port,omitempty" json:"port,omitempty"`
 	Annotations map[string]string `yaml:"annotations,omitempty" jsonschema:"nullable" json:"annotations,omitempty"`
-	Hostname    string            `yaml:"hostname" json:"hostname,omitempty"`
+	Hostname    string            `yaml:"hostname,omitempty" json:"hostname,omitempty"`
 	Path        *string           `yaml:"path,omitempty" json:"path,omitempty"`
 	Class       *string           `yaml:"class,omitempty" json:"class,omitempty" jsonschema:"default:-"`
-	Enabled     bool              `yaml:"enabled" json:"enabled,omitempty"`
+	Enabled     bool              `yaml:"enabled,omitempty" json:"enabled,omitempty"`
 	TLS         *TLS              `yaml:"tls,omitempty" json:"tls,omitempty"`
 }
 

internal/generator/labels/labelstructs/ingress_test.go

@@ -0,0 +1,31 @@
+package labelstructs
+
+import "testing"
+
+func TestIngressLabel(t *testing.T) {
+	ts := "\nhostname: example.com\npath: /\nenabled: true\nport: 8888"
+	tc, err := IngressFrom(ts)
+	if err != nil {
+		t.Errorf("Error parsing IngressLabel: %v", err)
+	}
+	if tc.Hostname != "example.com" {
+		t.Errorf("Expected IngressLabel to contain 'example.com', got %s", tc.Hostname)
+	}
+	if tc.Path == nil || *tc.Path != "/" {
+		t.Errorf("Expected IngressLabel to contain '/', got %v", tc.Path)
+	}
+	if tc.Enabled != true {
+		t.Errorf("Expected IngressLabel to be enabled, got %v", tc.Enabled)
+	}
+	if tc.Port == nil || *tc.Port != 8888 {
+		t.Errorf("Expected IngressLabel to have port 8888, got %d", tc.Port)
+	}
+}
+
+func TestIngressLabelNoPort(t *testing.T) {
+	ts := "\nhostname: example.com\npath: /\nenabled: true"
+	_, err := IngressFrom(ts)
+	if err == nil {
+		t.Errorf("Expected error when parsing IngressLabel without port, got nil")
+	}
+}

internal/generator/labels/labelstructs/mapenv.go

@@ -1,4 +1,4 @@
-package labelStructs
+package labelstructs
 
 import "gopkg.in/yaml.v3"
 

internal/generator/labels/labelstructs/mapenv_test.go

@@ -0,0 +1,11 @@
+package labelstructs
+
+import "testing"
+
+func TestConfigMapLabel(t *testing.T) {
+	ts := "foo: bar"
+	tc, _ := MapEnvFrom(ts)
+	if len(tc) != 1 {
+		t.Errorf("Expected ConfigMapFile to have 1 item, got %d", len(tc))
+	}
+}

internal/generator/labels/labelstructs/ports.go

@@ -1,4 +1,4 @@
-package labelStructs
+package labelstructs
 
 import "gopkg.in/yaml.v3"
 

internal/generator/labels/labelstructs/ports_test.go

@@ -0,0 +1,23 @@
+package labelstructs
+
+import "testing"
+
+func TestPortsFromLabel(t *testing.T) {
+	data := "- 8080\n- 9090\n"
+	expected := Ports{8080, 9090}
+
+	ports, err := PortsFrom(data)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+
+	if len(ports) != len(expected) {
+		t.Fatalf("expected length %d, got %d", len(expected), len(ports))
+	}
+
+	for i, port := range ports {
+		if port != expected[i] {
+			t.Errorf("expected port %d at index %d, got %d", expected[i], i, port)
+		}
+	}
+}

internal/generator/labels/labelstructs/probes.go

@@ -1,4 +1,4 @@
-package labelStructs
+package labelstructs
 
 import (
 	"encoding/json"

internal/generator/labels/labelstructs/probes_test.go

@@ -0,0 +1,16 @@
+package labelstructs
+
+import "testing"
+
+func TestProbesLabel(t *testing.T) {
+	readiness := "readinessProbe:\n    httpGet:\n      path: /healthz\n      port: 8080\n    initialDelaySeconds: 5\n    periodSeconds: 10"
+	tc, err := ProbeFrom(readiness)
+	if err != nil {
+		t.Errorf("Error parsing ProbesLabel: %v %v", err, tc)
+	}
+	liveness := "livenessProbe:\n    httpGet:\n      path: /healthz\n      port: 8080\n    initialDelaySeconds: 5\n    periodSeconds: 10"
+	tc2, err := ProbeFrom(liveness)
+	if err != nil {
+		t.Errorf("Error parsing ProbesLabel: %v %v", err, tc2)
+	}
+}

internal/generator/labels/labelstructs/secrets.go

@@ -1,4 +1,4 @@
-package labelStructs
+package labelstructs
 
 import "gopkg.in/yaml.v3"
 

internal/generator/labels/labelstructs/secrets_test.go

@@ -0,0 +1,17 @@
+package labelstructs
+
+import "testing"
+
+func TestSecretLabel(t *testing.T) {
+	data := "- foo\n- bar"
+	tc, err := SecretsFrom(data)
+	if err != nil {
+		t.Errorf("Error parsing SecretLabel: %v %v", err, tc)
+	}
+	items := []string{"foo", "bar"}
+	for i, item := range tc {
+		if item != items[i] {
+			t.Errorf("Expected SecretLabel to contain '%s', got '%s'", items[i], item)
+		}
+	}
+}

internal/generator/labels/labelstructs/valueFrom.go

@@ -1,4 +1,4 @@
-package labelStructs
+package labelstructs
 
 import "gopkg.in/yaml.v3"
 

internal/generator/labels/labelstructs/valueFrom_test.go

@@ -0,0 +1,25 @@
+package labelstructs
+
+import (
+	"testing"
+)
+
+func TestValueFromLabel(t *testing.T) {
+	data := "data: foo\ndata2: bar"
+	tc, err := GetValueFrom(data)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if tc == nil {
+		t.Fatalf("expected non-nil map, got nil")
+	}
+	if len(*tc) != 2 {
+		t.Errorf("expected 2 items, got %d", len(*tc))
+	}
+	if (*tc)["data"] != "foo" {
+		t.Errorf("expected 'data' to be 'foo', got %s", (*tc)["data"])
+	}
+	if (*tc)["data2"] != "bar" {
+		t.Errorf("expected 'data2' to be 'bar', got %s", (*tc)["data2"])
+	}
+}

internal/generator/rbac.go

@@ -1,7 +1,7 @@
 package generator
 
 import (
-	"katenary/utils"
+	"github.com/katenary/katenary/internal/utils"
 
 	"github.com/compose-spec/compose-go/types"
 	corev1 "k8s.io/api/core/v1"

internal/generator/secret.go

@@ -2,8 +2,8 @@ package generator
 
 import (
 	"encoding/base64"
-	"katenary/generator/labels"
-	"katenary/utils"
+	"github.com/katenary/katenary/internal/generator/labels"
+	"github.com/katenary/katenary/internal/utils"
 	"strings"
 
 	"github.com/compose-spec/compose-go/types"

internal/generator/secret_test.go

@@ -3,7 +3,7 @@ package generator
 import (
 	"bytes"
 	"fmt"
-	"katenary/generator/labels"
+	"github.com/katenary/katenary/internal/generator/labels"
 	"os"
 	"testing"
 
@@ -82,7 +82,9 @@ services:
 		AppVersion:   appVersion,
 		ChartVersion: chartVersion,
 	}
-	Convert(convertOptions, "compose.yml")
+	if err := Convert(convertOptions, "compose.yml"); err != nil {
+		t.Fatalf("Failed to convert compose file: %s", err)
+	}
 	c, err := os.ReadFile("chart/values.yaml")
 	if err != nil {
 		t.Fatal(err)

internal/generator/service.go

@@ -1,7 +1,8 @@
 package generator
 
 import (
-	"katenary/utils"
+	"fmt"
+	"github.com/katenary/katenary/internal/utils"
 	"regexp"
 	"strings"
 
@@ -50,15 +51,12 @@ func NewService(service types.ServiceConfig, appName string) *Service {
 
 // AddPort adds a port to the service.
 func (s *Service) AddPort(port types.ServicePortConfig, serviceName ...string) {
-	name := s.service.Name
-	if len(serviceName) > 0 {
-		name = serviceName[0]
-	}
-
+	var name string
 	var finalport intstr.IntOrString
 
 	if targetPort := utils.GetServiceNameByPort(int(port.Target)); targetPort == "" {
 		finalport = intstr.FromInt(int(port.Target))
+		name = fmt.Sprintf("port-%d", port.Target)
 	} else {
 		finalport = intstr.FromString(targetPort)
 		name = targetPort
@@ -86,7 +84,7 @@ func (s *Service) Yaml() ([]byte, error) {
 	}
 
 	lines := []string{}
-	for _, line := range strings.Split(string(y), "\n") {
+	for line := range strings.SplitSeq(string(y), "\n") {
 		if regexp.MustCompile(`^\s*loadBalancer:\s*`).MatchString(line) {
 			continue
 		}

internal/generator/service_test.go

@@ -47,3 +47,37 @@ services:
 		t.Errorf("Expected 2 ports, got %d", foundPort)
 	}
 }
+
+func TestWithSeveralUnknownPorts(t *testing.T) {
+	composeFile := `
+services:
+  multi:
+    image: nginx
+    ports:
+      - 12443
+      - 12480
+    labels:
+      katenary.v3/ingress: |-
+        port: 12443
+`
+	tmpDir := setup(composeFile)
+	defer teardown(tmpDir)
+
+	currentDir, _ := os.Getwd()
+	os.Chdir(tmpDir)
+	defer os.Chdir(currentDir)
+
+	output := internalCompileTest(t, "-s", "templates/multi/service.yaml")
+	service := v1.Service{}
+	if err := yaml.Unmarshal([]byte(output), &service); err != nil {
+		t.Errorf(unmarshalError, err)
+	}
+
+	if len(service.Spec.Ports) != 2 {
+		t.Errorf("Expected 2 ports, got %d", len(service.Spec.Ports))
+	}
+	// ensure that both port names are different
+	if service.Spec.Ports[0].Name == service.Spec.Ports[1].Name {
+		t.Errorf("Expected different port names, got %s and %s", service.Spec.Ports[0].Name, service.Spec.Ports[1].Name)
+	}
+}

internal/generator/tools_test.go

@@ -1,11 +1,12 @@
 package generator
 
 import (
-	"katenary/parser"
 	"log"
 	"os"
 	"os/exec"
 	"testing"
+
+	"github.com/katenary/katenary/internal/parser"
 )
 
 const unmarshalError = "Failed to unmarshal the output: %s"
@@ -48,7 +49,10 @@ func internalCompileTest(t *testing.T, options ...string) string {
 		AppVersion:   appVersion,
 		ChartVersion: chartVersion,
 	}
-	Convert(convertOptions, "compose.yml")
+	if err := Convert(convertOptions, "compose.yml"); err != nil {
+		log.Printf("Failed to convert: %s", err)
+		return err.Error()
+	}
 
 	// launch helm lint to check the generated chart
 	if helmLint(convertOptions) != nil {