From 8e3731752cb87cbcdd1a52ac4114bf63f7a25770 Mon Sep 17 00:00:00 2001 From: jwcesign Date: Mon, 19 Sep 2022 20:05:03 +0800 Subject: [PATCH 1/3] Update karmada's k8s components to 1.25.1 for loca-up-karmada.sh Signed-off-by: jwcesign --- artifacts/deploy/karmada-apiserver.yaml | 2 +- artifacts/deploy/kube-controller-manager.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/artifacts/deploy/karmada-apiserver.yaml b/artifacts/deploy/karmada-apiserver.yaml index a7b180715..0069697ba 100644 --- a/artifacts/deploy/karmada-apiserver.yaml +++ b/artifacts/deploy/karmada-apiserver.yaml @@ -64,7 +64,7 @@ spec: - --tls-cert-file=/etc/karmada/pki/apiserver.crt - --tls-private-key-file=/etc/karmada/pki/apiserver.key name: karmada-apiserver - image: k8s.gcr.io/kube-apiserver:v1.24.2 + image: k8s.gcr.io/kube-apiserver:v1.25.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 8 diff --git a/artifacts/deploy/kube-controller-manager.yaml b/artifacts/deploy/kube-controller-manager.yaml index b9c811e0c..4ab07c9e5 100644 --- a/artifacts/deploy/kube-controller-manager.yaml +++ b/artifacts/deploy/kube-controller-manager.yaml @@ -52,7 +52,7 @@ spec: - --service-cluster-ip-range=10.96.0.0/12 - --use-service-account-credentials=true - --v=4 - image: k8s.gcr.io/kube-controller-manager:v1.24.2 + image: k8s.gcr.io/kube-controller-manager:v1.25.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 8 From a6d26b287d2c5fd3e9f6eccef7722a21e8e22639 Mon Sep 17 00:00:00 2001 From: jwcesign Date: Tue, 20 Sep 2022 12:08:37 +0800 Subject: [PATCH 2/3] Update k8s dependency to latest version(1.25.1) for karmadactl Signed-off-by: jwcesign --- pkg/karmadactl/cmdinit/kubernetes/deploy.go | 6 +++--- pkg/karmadactl/cmdinit/utils/examples.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/karmadactl/cmdinit/kubernetes/deploy.go b/pkg/karmadactl/cmdinit/kubernetes/deploy.go index 7bcec23c0..dbf32d668 100644 --- 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 ( @@ -255,7 +255,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/utils/examples.go b/pkg/karmadactl/cmdinit/utils/examples.go index f588dbe46..f0a90a8de 100644 --- 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) } From d8a35e2d9ac02c6379ccafdd4f8e5e193c2cbc8a Mon Sep 17 00:00:00 2001 From: jwcesign Date: Wed, 21 Sep 2022 15:02:48 +0800 Subject: [PATCH 3/3] Update helm install karmada with k8s 1.25.1 Signed-off-by: jwcesign --- artifacts/deploy/karmada-apiserver.yaml | 2 +- artifacts/deploy/kube-controller-manager.yaml | 2 +- charts/karmada/README.md | 4 ++-- charts/karmada/values.yaml | 4 ++-- pkg/karmadactl/cmdinit/kubernetes/deploy.go | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/artifacts/deploy/karmada-apiserver.yaml b/artifacts/deploy/karmada-apiserver.yaml index 0069697ba..a35b58bd1 100644 --- a/artifacts/deploy/karmada-apiserver.yaml +++ b/artifacts/deploy/karmada-apiserver.yaml @@ -64,7 +64,7 @@ spec: - --tls-cert-file=/etc/karmada/pki/apiserver.crt - --tls-private-key-file=/etc/karmada/pki/apiserver.key name: karmada-apiserver - image: k8s.gcr.io/kube-apiserver:v1.25.1 + image: k8s.gcr.io/kube-apiserver:v1.25.2 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 8 diff --git a/artifacts/deploy/kube-controller-manager.yaml b/artifacts/deploy/kube-controller-manager.yaml index 4ab07c9e5..8f6a9dc05 100644 --- a/artifacts/deploy/kube-controller-manager.yaml +++ b/artifacts/deploy/kube-controller-manager.yaml @@ -52,7 +52,7 @@ spec: - --service-cluster-ip-range=10.96.0.0/12 - --use-service-account-credentials=true - --v=4 - image: k8s.gcr.io/kube-controller-manager:v1.25.1 + image: k8s.gcr.io/kube-controller-manager:v1.25.2 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 8 diff --git a/charts/karmada/README.md b/charts/karmada/README.md index de6734f02..128ceca01 100644 --- a/charts/karmada/README.md +++ b/charts/karmada/README.md @@ -262,7 +262,7 @@ helm install karmada-scheduler-estimator -n karmada-system ./charts/karmada | `apiServer.podAnnotations` | Annotaions of the karmada-apiserver pods | `{}` | | `apiServer.imagePullSecrets` | Image pull secret of the karmada-apiserver | `[]` | | `apiServer.image.repository` | Image of the karmada-apiserver | `"k8s.gcr.io/kube-apiserver"` | -| `apiServer.image.tag` | Image tag of the karmada-apiserver | `"v1.24.2"` | +| `apiServer.image.tag` | Image tag of the karmada-apiserver | `"v1.25.2"` | | `apiServer.image.pullPolicy` | Image pull policy of the karmada-apiserver | `"IfNotPresent"` | | `apiServer.resources` | Resource quota of the karmada-apiserver | `{}` | | `apiServer.hostNetwork` | Deploy karmada-apiserver with hostNetwork. If there are multiple karmadas in one cluster, you'd better set it to "false" | `"true"` | @@ -291,7 +291,7 @@ helm install karmada-scheduler-estimator -n karmada-system ./charts/karmada | `kubeControllerManager.podAnnotations` | Annotaions of the kube-controller-manager pods | `{}` | | `kubeControllerManager.imagePullSecrets` | Image pull secret of the kube-controller-manager | `[]` | | `kubeControllerManager.image.repository` | Image of the kube-controller-manager | `"k8s.gcr.io/kube-controller-manager"` | -| `kubeControllerManager.image.tag` | Image tag of the kube-controller-manager | `"v1.24.2"` | +| `kubeControllerManager.image.tag` | Image tag of the kube-controller-manager | `"v1.25.2"` | | `kubeControllerManager.image.pullPolicy` | Image pull policy of the kube-controller-manager | `"IfNotPresent"` | | `kubeControllerManager.resources` | Resource quota of the kube-controller-manager | `{}` | | `kubeControllerManager.nodeSelector` | Node selector of the kube-controller-manager | `{}` | diff --git a/charts/karmada/values.yaml b/charts/karmada/values.yaml index 8c328c634..51043f2c2 100644 --- a/charts/karmada/values.yaml +++ b/charts/karmada/values.yaml @@ -306,7 +306,7 @@ apiServer: image: registry: k8s.gcr.io repository: kube-apiserver - tag: "v1.24.2" + tag: "v1.25.2" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## @@ -446,7 +446,7 @@ kubeControllerManager: image: registry: k8s.gcr.io repository: kube-controller-manager - tag: "v1.24.2" + tag: "v1.25.2" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## diff --git a/pkg/karmadactl/cmdinit/kubernetes/deploy.go b/pkg/karmadactl/cmdinit/kubernetes/deploy.go index dbf32d668..1b1b16a04 100644 --- 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.25.1" - defaultKubeControllerManagerImage = "kube-controller-manager:v1.25.1" + defaultKubeAPIServerImage = "kube-apiserver:v1.25.2" + defaultKubeControllerManagerImage = "kube-controller-manager:v1.25.2" ) const (