Merge branch 'master' into feat-cronjob

This commit is contained in:
2022-06-01 16:13:35 +02:00

View File

@@ -740,9 +740,16 @@ func setEnvToValues(name string, s *types.ServiceConfig, c *helm.Container) {
return return
} }
AddValues(name, map[string]EnvVal{"environment": env}) 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 { for k := range env {
v := "{{ tpl .Values." + name + ".environment." + k + " . }}" fixedK := strings.ReplaceAll(k, ".", "_")
v := "{{ tpl .Values." + name + ".environment." + fixedK + " . }}"
s.Environment[k] = &v s.Environment[k] = &v
touched := false touched := false
for _, c := range c.Env { for _, c := range c.Env {