Revert "Allow namespace to be set by programs consuming helm."

bc2cd3c794

Signed-off-by: Aaron Mell <amell@lumindigital.com>

cmd/helm/install.go

@@ -205,7 +205,7 @@ func runInstall(args []string, client *action.Install, valueOpts *values.Options
 		}
 	}
 
-	client.Namespace = settings.GetNamespace()
+	client.Namespace = settings.Namespace()
 	return client.Run(chartRequested, vals)
 }
 

cmd/helm/lint.go

@@ -51,7 +51,7 @@ func newLintCmd(out io.Writer) *cobra.Command {
 			if len(args) > 0 {
 				paths = args
 			}
-			client.Namespace = settings.GetNamespace()
+			client.Namespace = settings.Namespace()
 			vals, err := valueOpts.MergeValues(getter.All(settings))
 			if err != nil {
 				return err

cmd/helm/release_testing.go

@@ -46,7 +46,7 @@ func newReleaseTestCmd(cfg *action.Configuration, out io.Writer) *cobra.Command
 		Long:  releaseTestHelp,
 		Args:  require.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			client.Namespace = settings.GetNamespace()
+			client.Namespace = settings.Namespace()
 			rel, runErr := client.Run(args[0])
 			// We only return an error if we weren't even able to get the
 			// release, otherwise we keep going so we can print status and logs

cmd/helm/upgrade.go

@@ -71,7 +71,7 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 		Long:  upgradeDesc,
 		Args:  require.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			client.Namespace = settings.GetNamespace()
+			client.Namespace = settings.Namespace()
 
 			if client.Version == "" && client.Devel {
 				debug("setting version to >0.0.0-0")

pkg/action/action.go

@@ -222,7 +222,7 @@ func (c *Configuration) Init(envSettings *cli.EnvSettings, allNamespaces bool, h
 	}
 	var namespace string
 	if !allNamespaces {
-		namespace = envSettings.GetNamespace()
+		namespace = envSettings.Namespace()
 	}
 
 	var store *storage.Storage

pkg/cli/environment.go

@@ -38,11 +38,10 @@ import (
 
 // EnvSettings describes all of the environment settings.
 type EnvSettings struct {
+	namespace  string
 	config     genericclioptions.RESTClientGetter
 	configOnce sync.Once
 
-	// Namespace is the namespace used by storage drivers
-	Namespace string
 	// KubeConfig is the path to the kubeconfig file
 	KubeConfig string
 	// KubeContext is the name of the kubeconfig context.
@@ -62,7 +61,7 @@ type EnvSettings struct {
 func New() *EnvSettings {
 
 	env := EnvSettings{
-		Namespace:        os.Getenv("HELM_NAMESPACE"),
+		namespace:        os.Getenv("HELM_NAMESPACE"),
 		KubeContext:      os.Getenv("HELM_KUBECONTEXT"),
 		PluginsDirectory: envOr("HELM_PLUGINS", helmpath.DataPath("plugins")),
 		RegistryConfig:   envOr("HELM_REGISTRY_CONFIG", helmpath.ConfigPath("registry.json")),
@@ -75,7 +74,7 @@ func New() *EnvSettings {
 
 // AddFlags binds flags to the given flagset.
 func (s *EnvSettings) AddFlags(fs *pflag.FlagSet) {
-	fs.StringVarP(&s.Namespace, "namespace", "n", s.Namespace, "namespace scope for this request")
+	fs.StringVarP(&s.namespace, "namespace", "n", s.namespace, "namespace scope for this request")
 	fs.StringVar(&s.KubeConfig, "kubeconfig", "", "path to the kubeconfig file")
 	fs.StringVar(&s.KubeContext, "kube-context", s.KubeContext, "name of the kubeconfig context to use")
 	fs.BoolVar(&s.Debug, "debug", s.Debug, "enable verbose output")
@@ -99,7 +98,7 @@ func (s *EnvSettings) EnvVars() map[string]string {
 		"HELM_REGISTRY_CONFIG":   s.RegistryConfig,
 		"HELM_REPOSITORY_CACHE":  s.RepositoryCache,
 		"HELM_REPOSITORY_CONFIG": s.RepositoryConfig,
-		"HELM_NAMESPACE":         s.GetNamespace(),
+		"HELM_NAMESPACE":         s.Namespace(),
 		"HELM_KUBECONTEXT":       s.KubeContext,
 	}
 
@@ -111,9 +110,9 @@ func (s *EnvSettings) EnvVars() map[string]string {
 }
 
 //Namespace gets the namespace from the configuration
-func (s *EnvSettings) GetNamespace() string {
-	if s.Namespace != "" {
-		return s.Namespace
+func (s *EnvSettings) Namespace() string {
+	if s.namespace != "" {
+		return s.namespace
 	}
 
 	if ns, _, err := s.RESTClientGetter().ToRawKubeConfigLoader().Namespace(); err == nil {
@@ -125,7 +124,7 @@ func (s *EnvSettings) GetNamespace() string {
 //RESTClientGetter gets the kubeconfig from EnvSettings
 func (s *EnvSettings) RESTClientGetter() genericclioptions.RESTClientGetter {
 	s.configOnce.Do(func() {
-		s.config = kube.GetConfig(s.KubeConfig, s.KubeContext, s.Namespace)
+		s.config = kube.GetConfig(s.KubeConfig, s.KubeContext, s.namespace)
 	})
 	return s.config
 }

pkg/cli/environment_test.go

@@ -78,8 +78,8 @@ func TestEnvSettings(t *testing.T) {
 			if settings.Debug != tt.debug {
 				t.Errorf("expected debug %t, got %t", tt.debug, settings.Debug)
 			}
-			if settings.GetNamespace() != tt.ns {
-				t.Errorf("expected namespace %q, got %q", tt.ns, settings.GetNamespace())
+			if settings.Namespace() != tt.ns {
+				t.Errorf("expected namespace %q, got %q", tt.ns, settings.Namespace())
 			}
 			if settings.KubeContext != tt.kcontext {
 				t.Errorf("expected kube-context %q, got %q", tt.kcontext, settings.KubeContext)