Katenary/katenary
2
0
Fork 2
Code Issues 13 Pull Requests 1 Actions Packages Projects 4 Releases 18 Wiki Activity

Merge Develop to prepare V3 #77

Merged
metal3d merged 98 commits from develop into master 2024-10-29 16:45:05 +00:00
Conversation 1 Commits 98 Files Changed 179 +11 -14
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 164a617869 - Show all commits

25
generator/configMap.go
View File

@@ -94,23 +94,20 @@ func NewConfigMap(service types.ServiceConfig, appName string, forFile bool) *Co
done[value] = true done[value] = true
continue continue
} }
val := utils.TplValue(service.Name, "environment."+value)
service.Environment[value] = &val
} }
if forFile { if !forFile {
// do not bind env variables to the configmap // do not bind env variables to the configmap
return cm // remove the variables that are already defined in the environment
} if l, ok := service.Labels[LabelMapEnv]; ok {
// remove the variables that are already defined in the environment envmap, err := labelStructs.MapEnvFrom(l)
if l, ok := service.Labels[LabelMapEnv]; ok { if err != nil {
envmap, err := labelStructs.MapEnvFrom(l) log.Fatal("Error parsing map-env", err)
if err != nil { }
log.Fatal("Error parsing map-env", err) for key, value := range envmap {
} cm.AddData(key, strings.ReplaceAll(value, "__APP__", appName))
for key, value := range envmap { done[key] = true
cm.AddData(key, strings.ReplaceAll(value, "__APP__", appName)) }
done[key] = true
} }
} }
for key, env := range service.Environment { for key, env := range service.Environment {