kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid depending on kubectl from kops update-cluster 

This is helpful if kubectl is not installed.
This commit is contained in:
justinsb 2023-08-26 07:39:01 -04:00
parent 1b31a46c4c
commit cc5d667eb5
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cmd/kops/update_cluster.go
View File

@ -37,7 +37,6 @@ import (
"k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup" "k8s.io/kops/upup/pkg/fi/cloudup"
"k8s.io/kops/upup/pkg/fi/utils" "k8s.io/kops/upup/pkg/fi/utils"
"k8s.io/kops/upup/pkg/kutil"
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
) )
@ -313,12 +312,12 @@ func RunUpdateCluster(ctx context.Context, f *util.Factory, out io.Writer, c *Up
firstRun := false firstRun := false
if !isDryrun && c.CreateKubecfg { if !isDryrun && c.CreateKubecfg {
hasKubecfg, err := hasKubecfg(cluster.ObjectMeta.Name) hasKubeconfig, err := clusterIsInKubeConfig(cluster.ObjectMeta.Name)
if err != nil { if err != nil {
klog.Warningf("error reading kubecfg: %v", err) klog.Warningf("error reading kubeconfig: %v", err)
hasKubecfg = true hasKubeconfig = true
} }
firstRun = !hasKubecfg firstRun = !hasKubeconfig
klog.Infof("Exporting kubeconfig for cluster") klog.Infof("Exporting kubeconfig for cluster")
@ -439,19 +438,21 @@ func findBastionPublicName(c *kops.Cluster) string {
return bastion.PublicName return bastion.PublicName
} }
func hasKubecfg(contextName string) (bool, error) { // clusterIsInKubeConfig checks if we have a context with the specified name (cluster name) in ~/.kube/config.
kubectl := &kutil.Kubectl{} // It is used as a check to see if this is (likely) a new cluster.
func clusterIsInKubeConfig(contextName string) (bool, error) {
config, err := kubectl.GetConfig(false) configAccess := clientcmd.NewDefaultPathOptions()
config, err := configAccess.GetStartingConfig()
if err != nil { if err != nil {
return false, fmt.Errorf("error getting config from kubectl: %v", err) return false, fmt.Errorf("error reading kubeconfig: %w", err)
} }
for _, context := range config.Contexts { for k := range config.Contexts {
if context.Name == contextName { if k == contextName {
return true, nil return true, nil
} }
} }
return false, nil return false, nil
} }