Split source file

generator/container.go

@@ -0,0 +1,200 @@
+package generator
+
+import (
+	"fmt"
+	"katenary/helm"
+	"katenary/logger"
+	"log"
+	"os"
+	"strconv"
+	"strings"
+
+	"github.com/compose-spec/compose-go/types"
+)
+
+// Generate a container in deployment with all needed objects (volumes, secrets, env, ...).
+// The deployName shoud be the name of the deployment, we cannot get it from Metadata as this is a variable name.
+func newContainerForDeployment(
+	deployName, containerName string,
+	deployment *helm.Deployment,
+	s *types.ServiceConfig,
+	fileGeneratorChan HelmFileGenerator) *helm.Container {
+
+	buildCrontab(deployName, deployment, s, fileGeneratorChan)
+
+	container := helm.NewContainer(containerName, s.Image, s.Environment, s.Labels)
+
+	applyEnvMapLabel(s, container)
+	if secretFile := setSecretVar(containerName, s, container); secretFile != nil {
+		fileGeneratorChan <- secretFile
+		container.EnvFrom = append(container.EnvFrom, map[string]map[string]string{
+			"secretRef": {
+				"name": secretFile.Metadata().Name,
+			},
+		})
+	}
+	setEnvToValues(containerName, s, container)
+	prepareContainer(container, s, containerName)
+	prepareEnvFromFiles(deployName, s, container, fileGeneratorChan)
+
+	// add the container in deployment
+	if deployment.Spec.Template.Spec.Containers == nil {
+		deployment.Spec.Template.Spec.Containers = make([]*helm.Container, 0)
+	}
+	deployment.Spec.Template.Spec.Containers = append(
+		deployment.Spec.Template.Spec.Containers,
+		container,
+	)
+
+	// add the volumes
+	if deployment.Spec.Template.Spec.Volumes == nil {
+		deployment.Spec.Template.Spec.Volumes = make([]map[string]interface{}, 0)
+	}
+	// manage LABEL_VOLUMEFROM
+	addVolumeFrom(deployment, container, s)
+	// and then we can add other volumes
+	deployment.Spec.Template.Spec.Volumes = append(
+		deployment.Spec.Template.Spec.Volumes,
+		prepareVolumes(deployName, containerName, s, container, fileGeneratorChan)...,
+	)
+
+	// add init containers
+	if deployment.Spec.Template.Spec.InitContainers == nil {
+		deployment.Spec.Template.Spec.InitContainers = make([]*helm.Container, 0)
+	}
+	deployment.Spec.Template.Spec.InitContainers = append(
+		deployment.Spec.Template.Spec.InitContainers,
+		prepareInitContainers(containerName, s, container)...,
+	)
+
+	// check if there is containerPort assigned in label, add it, and do
+	// not create service for this.
+	if ports, ok := s.Labels[helm.LABEL_CONTAINER_PORT]; ok {
+		for _, port := range strings.Split(ports, ",") {
+			func(port string, container *helm.Container, s *types.ServiceConfig) {
+				port = strings.TrimSpace(port)
+				if port == "" {
+					return
+				}
+				portNumber, err := strconv.Atoi(port)
+				if err != nil {
+					return
+				}
+				// avoid already declared ports
+				for _, p := range s.Ports {
+					if int(p.Target) == portNumber {
+						return
+					}
+				}
+				container.Ports = append(container.Ports, &helm.ContainerPort{
+					Name:          deployName + "-" + port,
+					ContainerPort: portNumber,
+				})
+			}(port, container, s)
+		}
+	}
+
+	return container
+}
+
+// prepareContainer assigns image, command, env, and labels to a container.
+func prepareContainer(container *helm.Container, service *types.ServiceConfig, servicename string) {
+	// if there is no image name, this should fail!
+	if service.Image == "" {
+		log.Fatal(ICON_PACKAGE+" No image name for service ", servicename)
+	}
+
+	// Get the image tag
+	imageParts := strings.Split(service.Image, ":")
+	tag := ""
+	if len(imageParts) == 2 {
+		container.Image = imageParts[0]
+		tag = imageParts[1]
+	}
+
+	vtag := ".Values." + servicename + ".repository.tag"
+	container.Image = `{{ .Values.` + servicename + `.repository.image }}` +
+		`{{ if ne ` + vtag + ` "" }}:{{ ` + vtag + ` }}{{ end }}`
+	container.Command = service.Command
+	AddValues(servicename, map[string]EnvVal{
+		"repository": map[string]EnvVal{
+			"image": imageParts[0],
+			"tag":   tag,
+		},
+	})
+	prepareProbes(servicename, service, container)
+	generateContainerPorts(service, servicename, container)
+}
+
+// generateContainerPorts add the container ports of a service.
+func generateContainerPorts(s *types.ServiceConfig, name string, container *helm.Container) {
+
+	exists := make(map[int]string)
+	for _, port := range s.Ports {
+		portName := name
+		for _, n := range exists {
+			if name == n {
+				portName = fmt.Sprintf("%s-%d", name, port.Target)
+			}
+		}
+		container.Ports = append(container.Ports, &helm.ContainerPort{
+			Name:          portName,
+			ContainerPort: int(port.Target),
+		})
+		exists[int(port.Target)] = name
+	}
+
+	// manage the "expose" section to be a NodePort in Kubernetes
+	for _, expose := range s.Expose {
+
+		port, _ := strconv.Atoi(expose)
+
+		if _, exist := exists[port]; exist {
+			continue
+		}
+		container.Ports = append(container.Ports, &helm.ContainerPort{
+			Name:          name,
+			ContainerPort: port,
+		})
+	}
+}
+
+// prepareInitContainers add the init containers of a service.
+func prepareInitContainers(name string, s *types.ServiceConfig, container *helm.Container) []*helm.Container {
+
+	// We need to detect others services, but we probably not have parsed them yet, so
+	// we will wait for them for a while.
+	initContainers := make([]*helm.Container, 0)
+	for dp := range s.DependsOn {
+		c := helm.NewContainer("check-"+dp, "busybox", nil, s.Labels)
+		command := strings.ReplaceAll(strings.TrimSpace(dependScript), "__service__", dp)
+
+		foundPort := -1
+		locker.Lock()
+		if defaultPort, ok := servicesMap[dp]; !ok {
+			logger.Redf("Error while getting port for service %s\n", dp)
+			os.Exit(1)
+		} else {
+			foundPort = defaultPort
+		}
+		locker.Unlock()
+		if foundPort == -1 {
+			log.Fatalf(
+				"ERROR, the %s service is waiting for %s port number, "+
+					"but it is never discovered. You must declare at least one port in "+
+					"the \"ports\" section of the service in the docker-compose file",
+				name,
+				dp,
+			)
+		}
+		command = strings.ReplaceAll(command, "__port__", strconv.Itoa(foundPort))
+
+		c.Command = []string{
+			"sh",
+			"-c",
+			command,
+		}
+		initContainers = append(initContainers, c)
+	}
+	return initContainers
+}

generator/deployment.go

@@ -0,0 +1,70 @@
+package generator
+
+import (
+	"katenary/helm"
+	"katenary/logger"
+
+	"github.com/compose-spec/compose-go/types"
+)
+
+// This function will try to yied deployment and services based on a service from the compose file structure.
+func buildDeployment(name string, s *types.ServiceConfig, linked map[string]types.ServiceConfig, fileGeneratorChan HelmFileGenerator) {
+
+	logger.Magenta(ICON_PACKAGE+" Generating deployment for ", name)
+	deployment := helm.NewDeployment(name)
+
+	newContainerForDeployment(name, name, deployment, s, fileGeneratorChan)
+
+	// Add selectors
+	selectors := buildSelector(name, s)
+	selectors[helm.K+"/resource"] = "deployment"
+	deployment.Spec.Selector = map[string]interface{}{
+		"matchLabels": selectors,
+	}
+	deployment.Spec.Template.Metadata.Labels = selectors
+
+	// Now, the linked services (same pod)
+	for lname, link := range linked {
+		newContainerForDeployment(name, lname, deployment, &link, fileGeneratorChan)
+		// append ports and expose ports to the deployment,
+		// to be able to generate them in the Service file
+		if len(link.Ports) > 0 || len(link.Expose) > 0 {
+			s.Ports = append(s.Ports, link.Ports...)
+			s.Expose = append(s.Expose, link.Expose...)
+		}
+	}
+
+	// Remove duplicates in volumes
+	volumes := make([]map[string]interface{}, 0)
+	done := make(map[string]bool)
+	for _, vol := range deployment.Spec.Template.Spec.Volumes {
+		name := vol["name"].(string)
+		if _, ok := done[name]; ok {
+			continue
+		} else {
+			done[name] = true
+			volumes = append(volumes, vol)
+		}
+	}
+	deployment.Spec.Template.Spec.Volumes = volumes
+
+	// Then, create Services and possible Ingresses for ingress labels, "ports" and "expose" section
+	if len(s.Ports) > 0 || len(s.Expose) > 0 {
+		for _, s := range generateServicesAndIngresses(name, s) {
+			if s != nil {
+				fileGeneratorChan <- s
+			}
+		}
+	}
+
+	// add the volumes in Values
+	if len(VolumeValues[name]) > 0 {
+		AddValues(name, map[string]EnvVal{"persistence": VolumeValues[name]})
+	}
+
+	// the deployment is ready, give it
+	fileGeneratorChan <- deployment
+
+	// and then, we can say that it's the end
+	fileGeneratorChan <- nil
+}

generator/env.go

@@ -0,0 +1,154 @@
+package generator
+
+import (
+	"fmt"
+	"io/ioutil"
+	"katenary/compose"
+	"katenary/helm"
+	"katenary/logger"
+	"katenary/tools"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/compose-spec/compose-go/types"
+	"gopkg.in/yaml.v3"
+)
+
+// applyEnvMapLabel will get all LABEL_MAP_ENV to rebuild the env map with tpl.
+func applyEnvMapLabel(s *types.ServiceConfig, c *helm.Container) {
+
+	locker.Lock()
+	defer locker.Unlock()
+	mapenv, ok := s.Labels[helm.LABEL_MAP_ENV]
+	if !ok {
+		return
+	}
+
+	// the mapenv is a YAML string
+	var envmap map[string]EnvVal
+	err := yaml.Unmarshal([]byte(mapenv), &envmap)
+	if err != nil {
+		logger.ActivateColors = true
+		logger.Red(err.Error())
+		logger.ActivateColors = false
+		return
+	}
+
+	// add in envmap
+	for k, v := range envmap {
+		vstring := fmt.Sprintf("%v", v)
+		s.Environment[k] = &vstring
+		touched := false
+		if c.Env != nil {
+			c.Env = make([]*helm.Value, 0)
+		}
+		for _, env := range c.Env {
+			if env.Name == k {
+				env.Value = v
+				touched = true
+			}
+		}
+		if !touched {
+			c.Env = append(c.Env, &helm.Value{Name: k, Value: v})
+		}
+	}
+}
+
+// readEnvFile read environment file and add to the values.yaml map.
+func readEnvFile(envfilename string) map[string]EnvVal {
+	env := make(map[string]EnvVal)
+	content, err := ioutil.ReadFile(envfilename)
+	if err != nil {
+		logger.ActivateColors = true
+		logger.Red(err.Error())
+		logger.ActivateColors = false
+		os.Exit(2)
+	}
+	// each value is on a separate line with KEY=value
+	lines := strings.Split(string(content), "\n")
+	for _, line := range lines {
+		if strings.Contains(line, "=") {
+			kv := strings.SplitN(line, "=", 2)
+			env[kv[0]] = kv[1]
+		}
+	}
+	return env
+}
+
+// prepareEnvFromFiles generate configMap or secrets from environment files.
+func prepareEnvFromFiles(name string, s *types.ServiceConfig, container *helm.Container, fileGeneratorChan HelmFileGenerator) {
+
+	// prepare secrets
+	secretsFiles := make([]string, 0)
+	if v, ok := s.Labels[helm.LABEL_ENV_SECRET]; ok {
+		secretsFiles = strings.Split(v, ",")
+	}
+
+	var secretVars []string
+	if v, ok := s.Labels[helm.LABEL_SECRETVARS]; ok {
+		secretVars = strings.Split(v, ",")
+	}
+
+	for i, s := range secretVars {
+		secretVars[i] = strings.TrimSpace(s)
+	}
+
+	// manage environment files (env_file in compose)
+	for _, envfile := range s.EnvFile {
+		f := tools.PathToName(envfile)
+		f = strings.ReplaceAll(f, ".env", "")
+		isSecret := false
+		for _, s := range secretsFiles {
+			s = strings.TrimSpace(s)
+			if s == envfile {
+				isSecret = true
+			}
+		}
+		var store helm.InlineConfig
+		if !isSecret {
+			logger.Bluef(ICON_CONF+" Generating configMap from %s\n", envfile)
+			store = helm.NewConfigMap(name, envfile)
+		} else {
+			logger.Bluef(ICON_SECRET+" Generating secret from %s\n", envfile)
+			store = helm.NewSecret(name, envfile)
+		}
+
+		envfile = filepath.Join(compose.GetCurrentDir(), envfile)
+		if err := store.AddEnvFile(envfile, secretVars); err != nil {
+			logger.ActivateColors = true
+			logger.Red(err.Error())
+			logger.ActivateColors = false
+			os.Exit(2)
+		}
+
+		section := "configMapRef"
+		if isSecret {
+			section = "secretRef"
+		}
+
+		container.EnvFrom = append(container.EnvFrom, map[string]map[string]string{
+			section: {
+				"name": store.Metadata().Name,
+			},
+		})
+
+		// read the envfile and remove them from the container environment or secret
+		envs := readEnvFile(envfile)
+		for varname := range envs {
+			if !isSecret {
+				// remove varname from container
+				for i, s := range container.Env {
+					if s.Name == varname {
+						container.Env = append(container.Env[:i], container.Env[i+1:]...)
+						i--
+					}
+				}
+			}
+		}
+
+		if store != nil {
+			fileGeneratorChan <- store.(HelmFile)
+		}
+	}
+}

generator/main.go

@@ -3,7 +3,6 @@ package generator
 import (
 	"fmt"
 	"io/ioutil"
-	"katenary/compose"
 	"katenary/helm"
 	"katenary/logger"
 	"katenary/tools"
@@ -17,7 +16,6 @@ import (
 	"sync"
 
 	"github.com/compose-spec/compose-go/types"
-	"gopkg.in/yaml.v3"
 )
 
 type EnvVal = helm.EnvValue
@@ -35,11 +33,9 @@ const (
 
 // Values is kept in memory to create a values.yaml file.
 var (
-	Values       = make(map[string]map[string]interface{})
+	EmptyDirs   = []string{}
-	VolumeValues = make(map[string]map[string]map[string]EnvVal)
+	servicesMap = make(map[string]int)
-	EmptyDirs    = []string{}
+	locker      = &sync.Mutex{}
-	servicesMap  = make(map[string]int)
-	locker       = &sync.Mutex{}
 
 	dependScript = `
 OK=0
@@ -64,97 +60,6 @@ func CreateReplicaObject(name string, s types.ServiceConfig, linked map[string]t
 	return ret
 }
 
-// This function will try to yied deployment and services based on a service from the compose file structure.
-func buildDeployment(name string, s *types.ServiceConfig, linked map[string]types.ServiceConfig, fileGeneratorChan HelmFileGenerator) {
-
-	logger.Magenta(ICON_PACKAGE+" Generating deployment for ", name)
-	deployment := helm.NewDeployment(name)
-
-	newContainerForDeployment(name, name, deployment, s, fileGeneratorChan)
-
-	// Add selectors
-	selectors := buildSelector(name, s)
-	selectors[helm.K+"/resource"] = "deployment"
-	deployment.Spec.Selector = map[string]interface{}{
-		"matchLabels": selectors,
-	}
-	deployment.Spec.Template.Metadata.Labels = selectors
-
-	// Now, the linked services (same pod)
-	for lname, link := range linked {
-		newContainerForDeployment(name, lname, deployment, &link, fileGeneratorChan)
-		// append ports and expose ports to the deployment,
-		// to be able to generate them in the Service file
-		if len(link.Ports) > 0 || len(link.Expose) > 0 {
-			s.Ports = append(s.Ports, link.Ports...)
-			s.Expose = append(s.Expose, link.Expose...)
-		}
-	}
-
-	// Remove duplicates in volumes
-	volumes := make([]map[string]interface{}, 0)
-	done := make(map[string]bool)
-	for _, vol := range deployment.Spec.Template.Spec.Volumes {
-		name := vol["name"].(string)
-		if _, ok := done[name]; ok {
-			continue
-		} else {
-			done[name] = true
-			volumes = append(volumes, vol)
-		}
-	}
-	deployment.Spec.Template.Spec.Volumes = volumes
-
-	// Then, create Services and possible Ingresses for ingress labels, "ports" and "expose" section
-	if len(s.Ports) > 0 || len(s.Expose) > 0 {
-		for _, s := range generateServicesAndIngresses(name, s) {
-			if s != nil {
-				fileGeneratorChan <- s
-			}
-		}
-	}
-
-	// add the volumes in Values
-	if len(VolumeValues[name]) > 0 {
-		AddValues(name, map[string]EnvVal{"persistence": VolumeValues[name]})
-	}
-
-	// the deployment is ready, give it
-	fileGeneratorChan <- deployment
-
-	// and then, we can say that it's the end
-	fileGeneratorChan <- nil
-}
-
-// prepareContainer assigns image, command, env, and labels to a container.
-func prepareContainer(container *helm.Container, service *types.ServiceConfig, servicename string) {
-	// if there is no image name, this should fail!
-	if service.Image == "" {
-		log.Fatal(ICON_PACKAGE+" No image name for service ", servicename)
-	}
-
-	// Get the image tag
-	imageParts := strings.Split(service.Image, ":")
-	tag := ""
-	if len(imageParts) == 2 {
-		container.Image = imageParts[0]
-		tag = imageParts[1]
-	}
-
-	vtag := ".Values." + servicename + ".repository.tag"
-	container.Image = `{{ .Values.` + servicename + `.repository.image }}` +
-		`{{ if ne ` + vtag + ` "" }}:{{ ` + vtag + ` }}{{ end }}`
-	container.Command = service.Command
-	AddValues(servicename, map[string]EnvVal{
-		"repository": map[string]EnvVal{
-			"image": imageParts[0],
-			"tag":   tag,
-		},
-	})
-	prepareProbes(servicename, service, container)
-	generateContainerPorts(service, servicename, container)
-}
-
 // Create a service (k8s).
 func generateServicesAndIngresses(name string, s *types.ServiceConfig) []HelmFile {
 
@@ -279,213 +184,6 @@ func buildConfigMapFromPath(name, path string) *helm.ConfigMap {
 	return cm
 }
 
-// generateContainerPorts add the container ports of a service.
-func generateContainerPorts(s *types.ServiceConfig, name string, container *helm.Container) {
-
-	exists := make(map[int]string)
-	for _, port := range s.Ports {
-		portName := name
-		for _, n := range exists {
-			if name == n {
-				portName = fmt.Sprintf("%s-%d", name, port.Target)
-			}
-		}
-		container.Ports = append(container.Ports, &helm.ContainerPort{
-			Name:          portName,
-			ContainerPort: int(port.Target),
-		})
-		exists[int(port.Target)] = name
-	}
-
-	// manage the "expose" section to be a NodePort in Kubernetes
-	for _, expose := range s.Expose {
-
-		port, _ := strconv.Atoi(expose)
-
-		if _, exist := exists[port]; exist {
-			continue
-		}
-		container.Ports = append(container.Ports, &helm.ContainerPort{
-			Name:          name,
-			ContainerPort: port,
-		})
-	}
-}
-
-// prepareVolumes add the volumes of a service.
-func prepareVolumes(deployment, name string, s *types.ServiceConfig, container *helm.Container, fileGeneratorChan HelmFileGenerator) []map[string]interface{} {
-
-	volumes := make([]map[string]interface{}, 0)
-	mountPoints := make([]interface{}, 0)
-	configMapsVolumes := make([]string, 0)
-	if v, ok := s.Labels[helm.LABEL_VOL_CM]; ok {
-		configMapsVolumes = strings.Split(v, ",")
-		for i, cm := range configMapsVolumes {
-			configMapsVolumes[i] = strings.TrimSpace(cm)
-		}
-	}
-
-	for _, vol := range s.Volumes {
-
-		volname := vol.Source
-		volepath := vol.Target
-
-		if volname == "" {
-			logger.ActivateColors = true
-			logger.Yellowf("Warning, volume source to %s is empty for %s -- skipping\n", volepath, name)
-			logger.ActivateColors = false
-			continue
-		}
-
-		isConfigMap := false
-		for _, cmVol := range configMapsVolumes {
-			if tools.GetRelPath(volname) == cmVol {
-				isConfigMap = true
-				break
-			}
-		}
-
-		// local volume cannt be mounted
-		if !isConfigMap && (strings.HasPrefix(volname, ".") || strings.HasPrefix(volname, "/")) {
-			logger.ActivateColors = true
-			logger.Redf("You cannot, at this time, have local volume in %s deployment\n", name)
-			logger.ActivateColors = false
-			continue
-		}
-		if isConfigMap {
-			// check if the volname path points on a file, if so, we need to add subvolume to the interface
-			stat, err := os.Stat(volname)
-			if err != nil {
-				logger.ActivateColors = true
-				logger.Redf("An error occured reading volume path %s\n", err.Error())
-				logger.ActivateColors = false
-				continue
-			}
-			pointToFile := ""
-			if !stat.IsDir() {
-				pointToFile = filepath.Base(volname)
-			}
-
-			// the volume is a path and it's explicitally asked to be a configmap in labels
-			cm := buildConfigMapFromPath(name, volname)
-			cm.K8sBase.Metadata.Name = helm.ReleaseNameTpl + "-" + name + "-" + tools.PathToName(volname)
-
-			// build a configmapRef for this volume
-			volname := tools.PathToName(volname)
-			volumes = append(volumes, map[string]interface{}{
-				"name": volname,
-				"configMap": map[string]string{
-					"name": cm.K8sBase.Metadata.Name,
-				},
-			})
-			if len(pointToFile) > 0 {
-				mountPoints = append(mountPoints, map[string]interface{}{
-					"name":      volname,
-					"mountPath": volepath,
-					"subPath":   pointToFile,
-				})
-			} else {
-				mountPoints = append(mountPoints, map[string]interface{}{
-					"name":      volname,
-					"mountPath": volepath,
-				})
-			}
-			if cm != nil {
-				fileGeneratorChan <- cm
-			}
-		} else {
-			// It's a Volume. Mount this from PVC to declare.
-
-			volname = strings.ReplaceAll(volname, "-", "")
-
-			isEmptyDir := false
-			for _, v := range EmptyDirs {
-				v = strings.ReplaceAll(v, "-", "")
-				if v == volname {
-					volumes = append(volumes, map[string]interface{}{
-						"name":     volname,
-						"emptyDir": map[string]string{},
-					})
-					mountPoints = append(mountPoints, map[string]interface{}{
-						"name":      volname,
-						"mountPath": volepath,
-					})
-					container.VolumeMounts = append(container.VolumeMounts, mountPoints...)
-					isEmptyDir = true
-					break
-				}
-			}
-			if isEmptyDir {
-				continue
-			}
-
-			volumes = append(volumes, map[string]interface{}{
-				"name": volname,
-				"persistentVolumeClaim": map[string]string{
-					"claimName": helm.ReleaseNameTpl + "-" + volname,
-				},
-			})
-			mountPoints = append(mountPoints, map[string]interface{}{
-				"name":      volname,
-				"mountPath": volepath,
-			})
-
-			logger.Yellow(ICON_STORE+" Generate volume values", volname, "for container named", name, "in deployment", deployment)
-			AddVolumeValues(deployment, volname, map[string]EnvVal{
-				"enabled":  false,
-				"capacity": "1Gi",
-			})
-
-			if pvc := helm.NewPVC(deployment, volname); pvc != nil {
-				fileGeneratorChan <- pvc
-			}
-		}
-	}
-	// add the volume in the container and return the volume definition to add in Deployment
-	container.VolumeMounts = append(container.VolumeMounts, mountPoints...)
-	return volumes
-}
-
-// prepareInitContainers add the init containers of a service.
-func prepareInitContainers(name string, s *types.ServiceConfig, container *helm.Container) []*helm.Container {
-
-	// We need to detect others services, but we probably not have parsed them yet, so
-	// we will wait for them for a while.
-	initContainers := make([]*helm.Container, 0)
-	for dp := range s.DependsOn {
-		c := helm.NewContainer("check-"+dp, "busybox", nil, s.Labels)
-		command := strings.ReplaceAll(strings.TrimSpace(dependScript), "__service__", dp)
-
-		foundPort := -1
-		locker.Lock()
-		if defaultPort, ok := servicesMap[dp]; !ok {
-			logger.Redf("Error while getting port for service %s\n", dp)
-			os.Exit(1)
-		} else {
-			foundPort = defaultPort
-		}
-		locker.Unlock()
-		if foundPort == -1 {
-			log.Fatalf(
-				"ERROR, the %s service is waiting for %s port number, "+
-					"but it is never discovered. You must declare at least one port in "+
-					"the \"ports\" section of the service in the docker-compose file",
-				name,
-				dp,
-			)
-		}
-		command = strings.ReplaceAll(command, "__port__", strconv.Itoa(foundPort))
-
-		c.Command = []string{
-			"sh",
-			"-c",
-			command,
-		}
-		initContainers = append(initContainers, c)
-	}
-	return initContainers
-}
-
 // prepareProbes generate http/tcp/command probes for a service.
 func prepareProbes(name string, s *types.ServiceConfig, container *helm.Container) {
 	// first, check if there a label for the probe
@@ -568,204 +266,6 @@ func buildCommandProbe(s *types.ServiceConfig) *helm.Probe {
 	}
 }
 
-// prepareEnvFromFiles generate configMap or secrets from environment files.
-func prepareEnvFromFiles(name string, s *types.ServiceConfig, container *helm.Container, fileGeneratorChan HelmFileGenerator) {
-
-	// prepare secrets
-	secretsFiles := make([]string, 0)
-	if v, ok := s.Labels[helm.LABEL_ENV_SECRET]; ok {
-		secretsFiles = strings.Split(v, ",")
-	}
-
-	var secretVars []string
-	if v, ok := s.Labels[helm.LABEL_SECRETVARS]; ok {
-		secretVars = strings.Split(v, ",")
-	}
-
-	for i, s := range secretVars {
-		secretVars[i] = strings.TrimSpace(s)
-	}
-
-	// manage environment files (env_file in compose)
-	for _, envfile := range s.EnvFile {
-		f := tools.PathToName(envfile)
-		f = strings.ReplaceAll(f, ".env", "")
-		isSecret := false
-		for _, s := range secretsFiles {
-			s = strings.TrimSpace(s)
-			if s == envfile {
-				isSecret = true
-			}
-		}
-		var store helm.InlineConfig
-		if !isSecret {
-			logger.Bluef(ICON_CONF+" Generating configMap from %s\n", envfile)
-			store = helm.NewConfigMap(name, envfile)
-		} else {
-			logger.Bluef(ICON_SECRET+" Generating secret from %s\n", envfile)
-			store = helm.NewSecret(name, envfile)
-		}
-
-		envfile = filepath.Join(compose.GetCurrentDir(), envfile)
-		if err := store.AddEnvFile(envfile, secretVars); err != nil {
-			logger.ActivateColors = true
-			logger.Red(err.Error())
-			logger.ActivateColors = false
-			os.Exit(2)
-		}
-
-		section := "configMapRef"
-		if isSecret {
-			section = "secretRef"
-		}
-
-		container.EnvFrom = append(container.EnvFrom, map[string]map[string]string{
-			section: {
-				"name": store.Metadata().Name,
-			},
-		})
-
-		// read the envfile and remove them from the container environment or secret
-		envs := readEnvFile(envfile)
-		for varname := range envs {
-			if !isSecret {
-				// remove varname from container
-				for i, s := range container.Env {
-					if s.Name == varname {
-						container.Env = append(container.Env[:i], container.Env[i+1:]...)
-						i--
-					}
-				}
-			}
-		}
-
-		if store != nil {
-			fileGeneratorChan <- store.(HelmFile)
-		}
-	}
-}
-
-// AddValues adds values to the values.yaml map.
-func AddValues(servicename string, values map[string]EnvVal) {
-	locker.Lock()
-	defer locker.Unlock()
-
-	if _, ok := Values[servicename]; !ok {
-		Values[servicename] = make(map[string]interface{})
-	}
-
-	for k, v := range values {
-		Values[servicename][k] = v
-	}
-}
-
-// AddVolumeValues add a volume to the values.yaml map for the given deployment name.
-func AddVolumeValues(deployment string, volname string, values map[string]EnvVal) {
-	locker.Lock()
-	defer locker.Unlock()
-
-	if _, ok := VolumeValues[deployment]; !ok {
-		VolumeValues[deployment] = make(map[string]map[string]EnvVal)
-	}
-	VolumeValues[deployment][volname] = values
-}
-
-func readEnvFile(envfilename string) map[string]EnvVal {
-	env := make(map[string]EnvVal)
-	content, err := ioutil.ReadFile(envfilename)
-	if err != nil {
-		logger.ActivateColors = true
-		logger.Red(err.Error())
-		logger.ActivateColors = false
-		os.Exit(2)
-	}
-	// each value is on a separate line with KEY=value
-	lines := strings.Split(string(content), "\n")
-	for _, line := range lines {
-		if strings.Contains(line, "=") {
-			kv := strings.SplitN(line, "=", 2)
-			env[kv[0]] = kv[1]
-		}
-	}
-	return env
-}
-
-// applyEnvMapLabel will get all LABEL_MAP_ENV to rebuild the env map with tpl.
-func applyEnvMapLabel(s *types.ServiceConfig, c *helm.Container) {
-
-	locker.Lock()
-	defer locker.Unlock()
-	mapenv, ok := s.Labels[helm.LABEL_MAP_ENV]
-	if !ok {
-		return
-	}
-
-	// the mapenv is a YAML string
-	var envmap map[string]EnvVal
-	err := yaml.Unmarshal([]byte(mapenv), &envmap)
-	if err != nil {
-		logger.ActivateColors = true
-		logger.Red(err.Error())
-		logger.ActivateColors = false
-		return
-	}
-
-	// add in envmap
-	for k, v := range envmap {
-		vstring := fmt.Sprintf("%v", v)
-		s.Environment[k] = &vstring
-		touched := false
-		if c.Env != nil {
-			c.Env = make([]*helm.Value, 0)
-		}
-		for _, env := range c.Env {
-			if env.Name == k {
-				env.Value = v
-				touched = true
-			}
-		}
-		if !touched {
-			c.Env = append(c.Env, &helm.Value{Name: k, Value: v})
-		}
-	}
-}
-
-// setEnvToValues will set the environment variables to the values.yaml map.
-func setEnvToValues(name string, s *types.ServiceConfig, c *helm.Container) {
-	// crete the "environment" key
-
-	env := make(map[string]EnvVal)
-	for k, v := range s.Environment {
-		env[k] = v
-	}
-	if len(env) == 0 {
-		return
-	}
-
-	valuesEnv := make(map[string]interface{})
-	for k, v := range env {
-		k = strings.ReplaceAll(k, ".", "_")
-		valuesEnv[k] = v
-	}
-
-	AddValues(name, map[string]EnvVal{"environment": valuesEnv})
-	for k := range env {
-		fixedK := strings.ReplaceAll(k, ".", "_")
-		v := "{{ tpl .Values." + name + ".environment." + fixedK + " . }}"
-		s.Environment[k] = &v
-		touched := false
-		for _, c := range c.Env {
-			if c.Name == k {
-				c.Value = v
-				touched = true
-			}
-		}
-		if !touched {
-			c.Env = append(c.Env, &helm.Value{Name: k, Value: v})
-		}
-	}
-}
-
 func setSecretVar(name string, s *types.ServiceConfig, c *helm.Container) *helm.Secret {
 	locker.Lock()
 	defer locker.Unlock()
@@ -796,156 +296,3 @@ func setSecretVar(name string, s *types.ServiceConfig, c *helm.Container) *helm.
 	}
 	return store
 }
-
-// Generate a container in deployment with all needed objects (volumes, secrets, env, ...).
-// The deployName shoud be the name of the deployment, we cannot get it from Metadata as this is a variable name.
-func newContainerForDeployment(
-	deployName, containerName string,
-	deployment *helm.Deployment,
-	s *types.ServiceConfig,
-	fileGeneratorChan HelmFileGenerator) *helm.Container {
-
-	buildCrontab(deployName, deployment, s, fileGeneratorChan)
-
-	container := helm.NewContainer(containerName, s.Image, s.Environment, s.Labels)
-
-	applyEnvMapLabel(s, container)
-	if secretFile := setSecretVar(containerName, s, container); secretFile != nil {
-		fileGeneratorChan <- secretFile
-		container.EnvFrom = append(container.EnvFrom, map[string]map[string]string{
-			"secretRef": {
-				"name": secretFile.Metadata().Name,
-			},
-		})
-	}
-	setEnvToValues(containerName, s, container)
-	prepareContainer(container, s, containerName)
-	prepareEnvFromFiles(deployName, s, container, fileGeneratorChan)
-
-	// add the container in deployment
-	if deployment.Spec.Template.Spec.Containers == nil {
-		deployment.Spec.Template.Spec.Containers = make([]*helm.Container, 0)
-	}
-	deployment.Spec.Template.Spec.Containers = append(
-		deployment.Spec.Template.Spec.Containers,
-		container,
-	)
-
-	// add the volumes
-	if deployment.Spec.Template.Spec.Volumes == nil {
-		deployment.Spec.Template.Spec.Volumes = make([]map[string]interface{}, 0)
-	}
-	// manage LABEL_VOLUMEFROM
-	addVolumeFrom(deployment, container, s)
-	// and then we can add other volumes
-	deployment.Spec.Template.Spec.Volumes = append(
-		deployment.Spec.Template.Spec.Volumes,
-		prepareVolumes(deployName, containerName, s, container, fileGeneratorChan)...,
-	)
-
-	// add init containers
-	if deployment.Spec.Template.Spec.InitContainers == nil {
-		deployment.Spec.Template.Spec.InitContainers = make([]*helm.Container, 0)
-	}
-	deployment.Spec.Template.Spec.InitContainers = append(
-		deployment.Spec.Template.Spec.InitContainers,
-		prepareInitContainers(containerName, s, container)...,
-	)
-
-	// check if there is containerPort assigned in label, add it, and do
-	// not create service for this.
-	if ports, ok := s.Labels[helm.LABEL_CONTAINER_PORT]; ok {
-		for _, port := range strings.Split(ports, ",") {
-			func(port string, container *helm.Container, s *types.ServiceConfig) {
-				port = strings.TrimSpace(port)
-				if port == "" {
-					return
-				}
-				portNumber, err := strconv.Atoi(port)
-				if err != nil {
-					return
-				}
-				// avoid already declared ports
-				for _, p := range s.Ports {
-					if int(p.Target) == portNumber {
-						return
-					}
-				}
-				container.Ports = append(container.Ports, &helm.ContainerPort{
-					Name:          deployName + "-" + port,
-					ContainerPort: portNumber,
-				})
-			}(port, container, s)
-		}
-	}
-
-	return container
-}
-
-// addVolumeFrom takes the LABEL_VOLUMEFROM to get volumes from another container. This can only work with
-// container that has got LABEL_SAMEPOD as we need to get the volumes from another container in the same deployment.
-func addVolumeFrom(deployment *helm.Deployment, container *helm.Container, s *types.ServiceConfig) {
-	labelfrom, ok := s.Labels[helm.LABEL_VOLUMEFROM]
-	if !ok {
-		return
-	}
-
-	// decode Yaml from the label
-	var volumesFrom map[string]map[string]string
-	err := yaml.Unmarshal([]byte(labelfrom), &volumesFrom)
-	if err != nil {
-		logger.ActivateColors = true
-		logger.Red(err.Error())
-		logger.ActivateColors = false
-		return
-	}
-
-	// for each declared volume "from", we will find it from the deployment volumes and add it to the container.
-	// Then, to avoid duplicates, we will remove it from the ServiceConfig object.
-	for name, volumes := range volumesFrom {
-		for volumeName := range volumes {
-			initianame := volumeName
-			volumeName = tools.PathToName(volumeName)
-			// get the volume from the deployment container "name"
-			var ctn *helm.Container
-			for _, c := range deployment.Spec.Template.Spec.Containers {
-				if c.Name == name {
-					ctn = c
-					break
-				}
-			}
-			if ctn == nil {
-				logger.ActivateColors = true
-				logger.Redf("VolumeFrom: container %s not found", name)
-				logger.ActivateColors = false
-				continue
-			}
-			// get the volume from the container
-			for _, v := range ctn.VolumeMounts {
-				switch v := v.(type) {
-				case map[string]interface{}:
-					if v["name"] == volumeName {
-						if container.VolumeMounts == nil {
-							container.VolumeMounts = make([]interface{}, 0)
-						}
-						// make a copy of the volume mount and then add it to the VolumeMounts
-						var mountpoint = make(map[string]interface{})
-						for k, v := range v {
-							mountpoint[k] = v
-						}
-						container.VolumeMounts = append(container.VolumeMounts, mountpoint)
-
-						// remove the volume from the ServiceConfig
-						for i, vol := range s.Volumes {
-							if vol.Source == initianame {
-								s.Volumes = append(s.Volumes[:i], s.Volumes[i+1:]...)
-								i--
-								break
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-}

generator/values.go

@@ -0,0 +1,69 @@
+package generator
+
+import (
+	"katenary/helm"
+	"strings"
+
+	"github.com/compose-spec/compose-go/types"
+)
+
+// AddValues adds values to the values.yaml map.
+func AddValues(servicename string, values map[string]EnvVal) {
+	locker.Lock()
+	defer locker.Unlock()
+
+	if _, ok := Values[servicename]; !ok {
+		Values[servicename] = make(map[string]interface{})
+	}
+
+	for k, v := range values {
+		Values[servicename][k] = v
+	}
+}
+
+// AddVolumeValues add a volume to the values.yaml map for the given deployment name.
+func AddVolumeValues(deployment string, volname string, values map[string]EnvVal) {
+	locker.Lock()
+	defer locker.Unlock()
+
+	if _, ok := VolumeValues[deployment]; !ok {
+		VolumeValues[deployment] = make(map[string]map[string]EnvVal)
+	}
+	VolumeValues[deployment][volname] = values
+}
+
+// setEnvToValues will set the environment variables to the values.yaml map.
+func setEnvToValues(name string, s *types.ServiceConfig, c *helm.Container) {
+	// crete the "environment" key
+
+	env := make(map[string]EnvVal)
+	for k, v := range s.Environment {
+		env[k] = v
+	}
+	if len(env) == 0 {
+		return
+	}
+
+	valuesEnv := make(map[string]interface{})
+	for k, v := range env {
+		k = strings.ReplaceAll(k, ".", "_")
+		valuesEnv[k] = v
+	}
+
+	AddValues(name, map[string]EnvVal{"environment": valuesEnv})
+	for k := range env {
+		fixedK := strings.ReplaceAll(k, ".", "_")
+		v := "{{ tpl .Values." + name + ".environment." + fixedK + " . }}"
+		s.Environment[k] = &v
+		touched := false
+		for _, c := range c.Env {
+			if c.Name == k {
+				c.Value = v
+				touched = true
+			}
+		}
+		if !touched {
+			c.Env = append(c.Env, &helm.Value{Name: k, Value: v})
+		}
+	}
+}

generator/volumes.go

@@ -0,0 +1,220 @@
+package generator
+
+import (
+	"katenary/helm"
+	"katenary/logger"
+	"katenary/tools"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/compose-spec/compose-go/types"
+	"gopkg.in/yaml.v3"
+)
+
+var (
+	Values       = make(map[string]map[string]interface{})
+	VolumeValues = make(map[string]map[string]map[string]EnvVal)
+)
+
+// addVolumeFrom takes the LABEL_VOLUMEFROM to get volumes from another container. This can only work with
+// container that has got LABEL_SAMEPOD as we need to get the volumes from another container in the same deployment.
+func addVolumeFrom(deployment *helm.Deployment, container *helm.Container, s *types.ServiceConfig) {
+	labelfrom, ok := s.Labels[helm.LABEL_VOLUMEFROM]
+	if !ok {
+		return
+	}
+
+	// decode Yaml from the label
+	var volumesFrom map[string]map[string]string
+	err := yaml.Unmarshal([]byte(labelfrom), &volumesFrom)
+	if err != nil {
+		logger.ActivateColors = true
+		logger.Red(err.Error())
+		logger.ActivateColors = false
+		return
+	}
+
+	// for each declared volume "from", we will find it from the deployment volumes and add it to the container.
+	// Then, to avoid duplicates, we will remove it from the ServiceConfig object.
+	for name, volumes := range volumesFrom {
+		for volumeName := range volumes {
+			initianame := volumeName
+			volumeName = tools.PathToName(volumeName)
+			// get the volume from the deployment container "name"
+			var ctn *helm.Container
+			for _, c := range deployment.Spec.Template.Spec.Containers {
+				if c.Name == name {
+					ctn = c
+					break
+				}
+			}
+			if ctn == nil {
+				logger.ActivateColors = true
+				logger.Redf("VolumeFrom: container %s not found", name)
+				logger.ActivateColors = false
+				continue
+			}
+			// get the volume from the container
+			for _, v := range ctn.VolumeMounts {
+				switch v := v.(type) {
+				case map[string]interface{}:
+					if v["name"] == volumeName {
+						if container.VolumeMounts == nil {
+							container.VolumeMounts = make([]interface{}, 0)
+						}
+						// make a copy of the volume mount and then add it to the VolumeMounts
+						var mountpoint = make(map[string]interface{})
+						for k, v := range v {
+							mountpoint[k] = v
+						}
+						container.VolumeMounts = append(container.VolumeMounts, mountpoint)
+
+						// remove the volume from the ServiceConfig
+						for i, vol := range s.Volumes {
+							if vol.Source == initianame {
+								s.Volumes = append(s.Volumes[:i], s.Volumes[i+1:]...)
+								i--
+								break
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+// prepareVolumes add the volumes of a service.
+func prepareVolumes(deployment, name string, s *types.ServiceConfig, container *helm.Container, fileGeneratorChan HelmFileGenerator) []map[string]interface{} {
+
+	volumes := make([]map[string]interface{}, 0)
+	mountPoints := make([]interface{}, 0)
+	configMapsVolumes := make([]string, 0)
+	if v, ok := s.Labels[helm.LABEL_VOL_CM]; ok {
+		configMapsVolumes = strings.Split(v, ",")
+		for i, cm := range configMapsVolumes {
+			configMapsVolumes[i] = strings.TrimSpace(cm)
+		}
+	}
+
+	for _, vol := range s.Volumes {
+
+		volname := vol.Source
+		volepath := vol.Target
+
+		if volname == "" {
+			logger.ActivateColors = true
+			logger.Yellowf("Warning, volume source to %s is empty for %s -- skipping\n", volepath, name)
+			logger.ActivateColors = false
+			continue
+		}
+
+		isConfigMap := false
+		for _, cmVol := range configMapsVolumes {
+			if tools.GetRelPath(volname) == cmVol {
+				isConfigMap = true
+				break
+			}
+		}
+
+		// local volume cannt be mounted
+		if !isConfigMap && (strings.HasPrefix(volname, ".") || strings.HasPrefix(volname, "/")) {
+			logger.ActivateColors = true
+			logger.Redf("You cannot, at this time, have local volume in %s deployment\n", name)
+			logger.ActivateColors = false
+			continue
+		}
+		if isConfigMap {
+			// check if the volname path points on a file, if so, we need to add subvolume to the interface
+			stat, err := os.Stat(volname)
+			if err != nil {
+				logger.ActivateColors = true
+				logger.Redf("An error occured reading volume path %s\n", err.Error())
+				logger.ActivateColors = false
+				continue
+			}
+			pointToFile := ""
+			if !stat.IsDir() {
+				pointToFile = filepath.Base(volname)
+			}
+
+			// the volume is a path and it's explicitally asked to be a configmap in labels
+			cm := buildConfigMapFromPath(name, volname)
+			cm.K8sBase.Metadata.Name = helm.ReleaseNameTpl + "-" + name + "-" + tools.PathToName(volname)
+
+			// build a configmapRef for this volume
+			volname := tools.PathToName(volname)
+			volumes = append(volumes, map[string]interface{}{
+				"name": volname,
+				"configMap": map[string]string{
+					"name": cm.K8sBase.Metadata.Name,
+				},
+			})
+			if len(pointToFile) > 0 {
+				mountPoints = append(mountPoints, map[string]interface{}{
+					"name":      volname,
+					"mountPath": volepath,
+					"subPath":   pointToFile,
+				})
+			} else {
+				mountPoints = append(mountPoints, map[string]interface{}{
+					"name":      volname,
+					"mountPath": volepath,
+				})
+			}
+			if cm != nil {
+				fileGeneratorChan <- cm
+			}
+		} else {
+			// It's a Volume. Mount this from PVC to declare.
+
+			volname = strings.ReplaceAll(volname, "-", "")
+
+			isEmptyDir := false
+			for _, v := range EmptyDirs {
+				v = strings.ReplaceAll(v, "-", "")
+				if v == volname {
+					volumes = append(volumes, map[string]interface{}{
+						"name":     volname,
+						"emptyDir": map[string]string{},
+					})
+					mountPoints = append(mountPoints, map[string]interface{}{
+						"name":      volname,
+						"mountPath": volepath,
+					})
+					container.VolumeMounts = append(container.VolumeMounts, mountPoints...)
+					isEmptyDir = true
+					break
+				}
+			}
+			if isEmptyDir {
+				continue
+			}
+
+			volumes = append(volumes, map[string]interface{}{
+				"name": volname,
+				"persistentVolumeClaim": map[string]string{
+					"claimName": helm.ReleaseNameTpl + "-" + volname,
+				},
+			})
+			mountPoints = append(mountPoints, map[string]interface{}{
+				"name":      volname,
+				"mountPath": volepath,
+			})
+
+			logger.Yellow(ICON_STORE+" Generate volume values", volname, "for container named", name, "in deployment", deployment)
+			AddVolumeValues(deployment, volname, map[string]EnvVal{
+				"enabled":  false,
+				"capacity": "1Gi",
+			})
+
+			if pvc := helm.NewPVC(deployment, volname); pvc != nil {
+				fileGeneratorChan <- pvc
+			}
+		}
+	}
+	// add the volume in the container and return the volume definition to add in Deployment
+	container.VolumeMounts = append(container.VolumeMounts, mountPoints...)
+	return volumes
+}