Update k8s dependency to latest version(1.25.1) for karmadactl

Signed-off-by: jwcesign <jiangwei115@huawei.com>
karmada-io · Sep 20, 2022 · c0538b9 · c0538b9
1 parent 92508b3
commit c0538b9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/pkg/karmadactl/cmdinit/kubernetes/deploy.go b/pkg/karmadactl/cmdinit/kubernetes/deploy.go
@@ -45,8 +45,8 @@ var (
 	defaultKubeConfig = filepath.Join(homeDir(), ".kube", "config")
 
 	defaultEtcdImage                  = "etcd:3.5.3-0"
-	defaultKubeAPIServerImage         = "kube-apiserver:v1.24.2"
-	defaultKubeControllerManagerImage = "kube-controller-manager:v1.24.2"
+	defaultKubeAPIServerImage         = "kube-apiserver:v1.25.1"
+	defaultKubeControllerManagerImage = "kube-controller-manager:v1.25.1"
 )
 
 const (
@@ -176,6 +176,10 @@ func (i *CommandInitOption) Complete() error {
 			return err
 		}
 	}
+	// Recreate the KarmadaDataPath
+	if err := os.MkdirAll(i.KarmadaDataPath, 0755); err != nil {
+		return err
+	}
 
 	return nil
 }
@@ -248,7 +252,7 @@ func (i *CommandInitOption) genCerts() error {
 func (i *CommandInitOption) prepareCRD() error {
 	if strings.HasPrefix(i.CRDs, "http") {
 		filename := i.KarmadaDataPath + "/" + path.Base(i.CRDs)
-		klog.Infoln("download crds file name:", filename)
+		klog.Infof("download crds file:%s", i.CRDs)
 		if err := utils.DownloadFile(i.CRDs, filename); err != nil {
 			return err
 		}

diff --git a/pkg/karmadactl/cmdinit/kubernetes/deployments.go b/pkg/karmadactl/cmdinit/kubernetes/deployments.go
@@ -558,7 +558,6 @@ func (i *CommandInitOption) makeKarmadaControllerManagerDeployment() *appsv1.Dep
 				Operator: corev1.TolerationOpExists,
 			},
 		},
-		ServiceAccountName:           controllerManagerDeploymentAndServiceName,
 		AutomountServiceAccountToken: pointer.Bool(false),
 	}
 

diff --git a/pkg/karmadactl/cmdinit/utils/examples.go b/pkg/karmadactl/cmdinit/utils/examples.go
@@ -184,7 +184,7 @@ Step 1: Use "%[2]s join" command to register the cluster to Karmada control plan
 (In karmada)~# %[2]s --kubeconfig %[1]s/karmada-apiserver.config  join ${MEMBER_CLUSTER_NAME} --cluster-kubeconfig=$HOME/.kube/config
 
 Step 2: Show members of karmada
-(In karmada)~# kubectl  --kubeconfig %[1]s/karmada-apiserver.config get clusters
+(In karmada)~# kubectl --kubeconfig %[1]s/karmada-apiserver.config get clusters
 
 
 Register cluster with 'Pull' mode
@@ -193,7 +193,7 @@ Step 1: Use "%[2]s register" command to register the cluster to Karmada control
 (In member cluster)~# %[2]s%[3]s
 
 Step 2: Show members of karmada
-(In karmada)~# kubectl  --kubeconfig %[1]s/karmada-apiserver.config get clusters
+(In karmada)~# kubectl --kubeconfig %[1]s/karmada-apiserver.config get clusters
 
 `, path, parentCommand, printRegisterCommand)
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     				Operator: corev1.TolerationOpExists,
     			},
     		},
-    		ServiceAccountName:           controllerManagerDeploymentAndServiceName,
     		AutomountServiceAccountToken: pointer.Bool(false),
     	}
@@ Expand Down @@