Merge pull request #313 from weaveworks/WKP-1032/kubeconfig-context

Set cluster, context and user to wks-<cluster-name>
weaveworks · Nov 12, 2020 · 5422d8c · 5422d8c
2 parents 1bba08c + e11d873
commit 5422d8c
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/pkg/kubernetes/config/kubeconfig.go b/pkg/kubernetes/config/kubeconfig.go
@@ -147,16 +147,22 @@ func Merge(existing *clientcmdapi.Config, tomerge *clientcmdapi.Config) *clientc
 
 // RenameConfig renames the default cluster and context names to the values from cluster.yaml
 func RenameConfig(sp *specs.Specs, newConfig *clientcmdapi.Config) {
+	name := fmt.Sprintf("wks-%s", sp.GetClusterName())
+
 	log.Debug("Renaming cluster")
-	newConfig.Clusters[sp.GetClusterName()] = newConfig.Clusters[DefaultClusterName]
+	newConfig.Clusters[name] = newConfig.Clusters[DefaultClusterName]
 	delete(newConfig.Clusters, DefaultClusterName)
 
+	log.Debug("Renaming user")
+	newConfig.AuthInfos[name] = newConfig.AuthInfos[DefaultClusterAdminName]
+	delete(newConfig.AuthInfos, DefaultClusterAdminName)
+
 	log.Debug("Renaming context")
-	newContextName := fmt.Sprintf("%s@%s", DefaultClusterAdminName, sp.GetClusterName())
-	newConfig.Contexts[newContextName] = newConfig.Contexts[DefaultContextName]
-	newConfig.Contexts[newContextName].Cluster = sp.GetClusterName()
+	newConfig.Contexts[name] = newConfig.Contexts[DefaultContextName]
+	newConfig.Contexts[name].Cluster = name
+	newConfig.Contexts[name].AuthInfo = name
 	delete(newConfig.Contexts, DefaultContextName)
 
 	log.Debug("Renaming current context")
-	newConfig.CurrentContext = newContextName
+	newConfig.CurrentContext = name
 }