Merge pull request #19408 from mfojtik/up-60-remove-env

up: remove --env flag
openshift · Apr 20, 2018 · 9bbdae4 · 9bbdae4
2 parents 45d2bb2 + 1a2989a
commit 9bbdae4
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 12 deletions.
diff --git a/contrib/completions/bash/oc b/contrib/completions/bash/oc
diff --git a/contrib/completions/zsh/oc b/contrib/completions/zsh/oc
diff --git a/pkg/oc/bootstrap/docker/run_self_hosted.go b/pkg/oc/bootstrap/docker/run_self_hosted.go
@@ -393,9 +393,7 @@ func (c *ClusterUpConfig) makeNodeConfig(masterConfigDir string) (string, error)
 func (c *ClusterUpConfig) makeKubeletFlags(out io.Writer, nodeConfigDir string) ([]string, error) {
 	container := kubelet.NewKubeletStartFlags()
 	container.ContainerBinds = append(container.ContainerBinds, nodeConfigDir+":/var/lib/origin/openshift.local.config/node:z")
-	container.Environment = c.Environment
 	container.NodeImage = c.openshiftImage()
-	container.Environment = c.Environment
 	container.UseSharedVolume = !c.UseNsenterMount
 
 	kubeletFlags, err := container.MakeKubeletFlags(c.GetDockerClient(), c.BaseDir)
@@ -452,7 +450,6 @@ func (c *ClusterUpConfig) startKubelet(out io.Writer, masterConfigDir, nodeConfi
 	}
 
 	container := kubelet.NewKubeletRunConfig()
-	container.Environment = c.Environment
 	container.ContainerBinds = append(container.ContainerBinds, nodeConfigDir+":/var/lib/origin/openshift.local.config/node:z")
 	container.ContainerBinds = append(container.ContainerBinds, masterConfigDir+":/var/lib/origin/openshift.local.config/master:z")
 	container.ContainerBinds = append(container.ContainerBinds, podManifestDir+":/var/lib/origin/pod-manifests:z")

diff --git a/pkg/oc/bootstrap/docker/up.go b/pkg/oc/bootstrap/docker/up.go
@@ -142,7 +142,6 @@ type ClusterUpConfig struct {
 	SpecifiedBaseDir  bool
 	HostName          string
 	UseExistingConfig bool
-	Environment       []string
 	ServerLogLevel    int
 
 	ComponentsToEnable       []string
@@ -187,7 +186,6 @@ func (c *ClusterUpConfig) Bind(flags *pflag.FlagSet) {
 	flags.BoolVar(&c.WriteConfig, "write-config", false, "Write the configuration files into host config dir")
 	flags.BoolVar(&c.PortForwarding, "forward-ports", c.PortForwarding, "Use Docker port-forwarding to communicate with origin container. Requires 'socat' locally.")
 	flags.IntVar(&c.ServerLogLevel, "server-loglevel", 0, "Log level for OpenShift server")
-	flags.StringArrayVarP(&c.Environment, "env", "e", c.Environment, "Specify a key-value pair for an environment variable to set on OpenShift container")
 	flags.StringSliceVar(&c.UserEnabledComponents, "enable", c.UserEnabledComponents, fmt.Sprintf(""+
 		"A list of components to enable.  '*' enables all on-by-default components, 'foo' enables the component "+
 		"named 'foo', '-foo' disables the component named 'foo'.\nAll components: %s\nDisabled-by-default components: %s",
@@ -407,7 +405,6 @@ func (c *ClusterUpConfig) Validate(errout io.Writer) error {
 	if c.dockerClient == nil {
 		return fmt.Errorf("missing dockerClient")
 	}
-	cmdutil.WarnAboutCommaSeparation(errout, c.Environment, "--env")
 	return nil
 }