Merge Develop to prepare V3 #77

Merged
metal3d merged 98 commits from develop into master 2024-10-29 16:45:05 +00:00
Showing only changes of commit 164a617869 - Show all commits

View File

@@ -94,14 +94,10 @@ func NewConfigMap(service types.ServiceConfig, appName string, forFile bool) *Co
done[value] = true
continue
}
val := utils.TplValue(service.Name, "environment."+value)
service.Environment[value] = &val
}
if forFile {
if !forFile {
// 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 {
envmap, err := labelStructs.MapEnvFrom(l)
@@ -113,6 +109,7 @@ func NewConfigMap(service types.ServiceConfig, appName string, forFile bool) *Co
done[key] = true
}
}
}
for key, env := range service.Environment {
_, isDropped := drop[key]
_, isDone := done[key]