Merge pull request #898 from Random-Liu/revert-#895

yujuhong · web-flow · commit 9cd964f62bef · 2018-09-06T16:20:29.000-07:00
Revert "Add HOSTNAME to env by default for pod containers"
diff --git a/pkg/server/container_create.go b/pkg/server/container_create.go
@@ -342,8 +342,6 @@ func (c *criService) generateContainerSpec(id string, sandboxID string, sandboxP
 	for _, e := range config.GetEnvs() {
 		g.AddProcessEnv(e.GetKey(), e.GetValue())
 	}
-	// add the HOSTNAME variable to the environment to match Docker runtime default
-	g.AddProcessEnv("HOSTNAME", sandboxConfig.GetHostname())
 
 	securityContext := config.GetLinux().GetSecurityContext()
 	selinuxOpt := securityContext.GetSelinuxOptions()

Original file line number	Diff line number	Diff line change
`@@ -342,8 +342,6 @@ func (c *criService) generateContainerSpec(id string, sandboxID string, sandboxP`
`342`	`342`	`for _, e := range config.GetEnvs() {`
`343`	`343`	`g.AddProcessEnv(e.GetKey(), e.GetValue())`
`344`	`344`	`}`
`345`		`- // add the HOSTNAME variable to the environment to match Docker runtime default`
`346`		`- g.AddProcessEnv("HOSTNAME", sandboxConfig.GetHostname())`
`347`	`345`
`348`	`346`	`securityContext := config.GetLinux().GetSecurityContext()`
`349`	`347`	`selinuxOpt := securityContext.GetSelinuxOptions()`