kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-12 01:14:22 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Remove redundant env field

Browse Source
This commit is contained in:
Donny Xia
2020-08-26 12:49:42 -07:00
parent 46194b3385
commit c202be0338
6 changed files with 40 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
kyaml/runfn/runfn.go
View File

@@ -92,7 +92,7 @@ type RunFns struct {
User runtimeutil.ContainerUser
// Env contains environment variables that will be exported to container
Env runtimeutil.ContainerEnv
Env []string
}
// Execute runs the command
@@ -274,16 +274,18 @@ func (r RunFns) getFunctionsFromFunctions() ([]kio.Filter, error) {
// mergeContainerEnv will merge the envs specified by command line (imperative) and config
// file (declarative). If they have same key, the imperative value will be respected.
func (r RunFns) mergeContainerEnv(envs runtimeutil.ContainerEnv) runtimeutil.ContainerEnv {
for key, value := range r.Env.EnvVars {
envs.AddKeyValue(key, value)
func (r RunFns) mergeContainerEnv(envs []string) []string {
imperative := runtimeutil.NewContainerEnvFromStringSlice(r.Env)
declarative := runtimeutil.NewContainerEnvFromStringSlice(envs)
for key, value := range imperative.EnvVars {
declarative.AddKeyValue(key, value)
}
for _, key := range r.Env.VarsToExport {
envs.AddKey(key)
for _, key := range imperative.VarsToExport {
declarative.AddKey(key)
}
return envs
return declarative.Raw()
}
func (r RunFns) getFunctionFilters(global bool, fns ...*yaml.RNode) (