Skip to content
Snippets Groups Projects
Commit fccf212e authored by Jessica Yuen's avatar Jessica Yuen
Browse files

Only overwrite namespace, server if not explicitly specified


Currently, namespace and server is being overwritten by the environment
despite the user explicitly passing in the `--namespace` flag.

Ex: during `ks apply dev --namespace=ns2`, `ns2` should take preference
to the namespace specified by the dev environment.

Signed-off-by: default avatarJessica Yuen <im.jessicayuen@gmail.com>
parent 4923a3f5
No related branches found
No related tags found
No related merge requests found
......@@ -360,10 +360,14 @@ func overrideCluster(envName string, clientConfig clientcmd.ClientConfig, overri
if _, ok := servers[server]; ok {
clusterName := servers[server]
log.Debugf("Overwriting --cluster flag with '%s'", clusterName)
overrides.Context.Cluster = clusterName
log.Debugf("Overwriting --namespace flag with '%s'", env.Namespace)
overrides.Context.Namespace = env.Namespace
if overrides.Context.Cluster == "" {
log.Debugf("Overwriting --cluster flag with '%s'", clusterName)
overrides.Context.Cluster = clusterName
}
if overrides.Context.Namespace == "" {
log.Debugf("Overwriting --namespace flag with '%s'", env.Namespace)
overrides.Context.Namespace = env.Namespace
}
return nil
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment