Merge pull request #1629 from fuweid/cherry-pick-cri-1628

estesp · web-flow · commit ca9c5533489d · 2021-03-03T09:41:39.000-05:00
[release/1.3] cri: append envs from image config to empty slice to avoid env lost
diff --git a/pkg/server/container_create.go b/pkg/server/container_create.go
@@ -359,7 +359,7 @@ func (c *criService) generateContainerSpec(id string, sandboxID string, sandboxP
 
 	// Apply envs from image config first, so that envs from container config
 	// can override them.
-	env := imageConfig.Env
+	env := append([]string{}, imageConfig.Env...)
 	for _, e := range config.GetEnvs() {
 		env = append(env, e.GetKey()+"="+e.GetValue())
 	}

Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ func (c *criService) generateContainerSpec(id string, sandboxID string, sandboxP`
`359`	`359`
`360`	`360`	`// Apply envs from image config first, so that envs from container config`
`361`	`361`	`// can override them.`
`362`		`- env := imageConfig.Env`
	`362`	`+ env := append([]string{}, imageConfig.Env...)`
`363`	`363`	`for _, e := range config.GetEnvs() {`
`364`	`364`	`env = append(env, e.GetKey()+"="+e.GetValue())`
`365`	`365`	`}`