Commit 241565b

authored

Ensure that user-specified env vars are ordered deterministically (#2411)

1 parent c95604f commit 241565bCopy full SHA for 241565b

File tree

+12

-3

lines changed

+12

-3

lines changed

Lines changed: 12 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ package workloads`
`19`	`19`	`import (`
`20`	`20`	`"fmt"`
`21`	`21`	`"path"`
	`22`	`+ "sort"`
`22`	`23`	`"strings"`
`23`	`24`
`24`	`25`	`"github.com/cortexlabs/cortex/pkg/config"`
`@@ -386,10 +387,18 @@ func userPodContainers(api spec.API) ([]kcore.Container, []kcore.Volume) {`
`386`	`387`	`})`
`387`	`388`	`}`
`388`	`389`
`389`		`- for k, v := range container.Env {`
	`390`	`+ envVarNames := make([]string, 0, len(container.Env))`
	`391`	`+ for envVarName := range container.Env {`
	`392`	`+ envVarNames = append(envVarNames, envVarName)`
	`393`	`+ }`
	`394`	`+`
	`395`	`+ // k8s deployments will replace pods if env vars are re-ordered`
	`396`	`+ sort.Strings(envVarNames)`
	`397`	`+`
	`398`	`+ for _, envVarName := range envVarNames {`
`390`	`399`	`containerEnvVars = append(containerEnvVars, kcore.EnvVar{`
`391`		`- Name: k,`
`392`		`- Value: v,`
	`400`	`+ Name: envVarName,`
	`401`	`+ Value: container.Env[envVarName],`
`393`	`402`	`})`
`394`	`403`	`}`
`395`	`404`

Comments

(0)