From b90035f03f8fe89e09ea2800bd59833bef235e94 Mon Sep 17 00:00:00 2001 From: Lan Liang Date: Thu, 21 Dec 2023 18:10:47 +0800 Subject: [PATCH] Update apiserver&controller-manager to v1.26.12 Signed-off-by: Lan Liang --- artifacts/deploy/karmada-apiserver.yaml | 2 +- artifacts/deploy/kube-controller-manager.yaml | 2 +- charts/karmada/README.md | 4 ++-- charts/karmada/values.yaml | 4 ++-- operator/README.md | 4 ++-- operator/config/samples/karmada.yaml | 4 ++-- operator/pkg/constants/constants.go | 2 +- pkg/karmadactl/cmdinit/cmdinit.go | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/artifacts/deploy/karmada-apiserver.yaml b/artifacts/deploy/karmada-apiserver.yaml index 79f050fc5..9c884906d 100644 --- a/artifacts/deploy/karmada-apiserver.yaml +++ b/artifacts/deploy/karmada-apiserver.yaml @@ -64,7 +64,7 @@ spec: - --tls-private-key-file=/etc/karmada/pki/apiserver.key - --tls-min-version=VersionTLS13 name: karmada-apiserver - image: registry.k8s.io/kube-apiserver:v1.25.4 + image: registry.k8s.io/kube-apiserver:v1.26.12 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 8 diff --git a/artifacts/deploy/kube-controller-manager.yaml b/artifacts/deploy/kube-controller-manager.yaml index 67d0eea32..de548a441 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: registry.k8s.io/kube-controller-manager:v1.25.4 + image: registry.k8s.io/kube-controller-manager:v1.26.12 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 8 diff --git a/charts/karmada/README.md b/charts/karmada/README.md index b3c5589ed..b5c2865ae 100644 --- a/charts/karmada/README.md +++ b/charts/karmada/README.md @@ -306,7 +306,7 @@ helm install karmada-scheduler-estimator -n karmada-system ./charts/karmada | `apiServer.podAnnotations` | Annotations of the karmada-apiserver pods | `{}` | | `apiServer.imagePullSecrets` | Image pull secret of the karmada-apiserver | `[]` | | `apiServer.image.repository` | Image of the karmada-apiserver | `"registry.k8s.io/kube-apiserver"` | -| `apiServer.image.tag` | Image tag of the karmada-apiserver | `"v1.25.4"` | +| `apiServer.image.tag` | Image tag of the karmada-apiserver | `"v1.26.12"` | | `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" | `"false"` | @@ -335,7 +335,7 @@ helm install karmada-scheduler-estimator -n karmada-system ./charts/karmada | `kubeControllerManager.podAnnotations` | Annotations 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 | `"registry.k8s.io/kube-controller-manager"` | -| `kubeControllerManager.image.tag` | Image tag of the kube-controller-manager | `"v1.25.4"` | +| `kubeControllerManager.image.tag` | Image tag of the kube-controller-manager | `"v1.26.12"` | | `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 2e4dd28c1..b0ef6182d 100644 --- a/charts/karmada/values.yaml +++ b/charts/karmada/values.yaml @@ -348,7 +348,7 @@ apiServer: image: registry: registry.k8s.io repository: kube-apiserver - tag: "v1.25.4" + tag: "v1.26.12" ## Specify a imagePullPolicy, defaults to 'IfNotPresent' pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. @@ -548,7 +548,7 @@ kubeControllerManager: image: registry: registry.k8s.io repository: kube-controller-manager - tag: "v1.25.4" + tag: "v1.26.12" ## Specify a imagePullPolicy, defaults to 'IfNotPresent' pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. diff --git a/operator/README.md b/operator/README.md index c52ce3a64..e2a0a5efa 100644 --- a/operator/README.md +++ b/operator/README.md @@ -195,7 +195,7 @@ You can change it to `NodePort`: ... karmadaAPIServer: imageRepository: registry.k8s.io/kube-apiserver - imageTag: v1.25.4 + imageTag: v1.26.12 replicas: 1 serviceType: NodePort serviceSubnet: 10.96.0.0/12 @@ -210,7 +210,7 @@ You can add more SANs to karmada-apiserver certificate: ... karmadaAPIServer: imageRepository: registry.k8s.io/kube-apiserver - imageTag: v1.25.4 + imageTag: v1.26.12 replicas: 1 serviceSubnet: 10.96.0.0/12 certSANs: diff --git a/operator/config/samples/karmada.yaml b/operator/config/samples/karmada.yaml index da183ff41..9ace7bfd1 100644 --- a/operator/config/samples/karmada.yaml +++ b/operator/config/samples/karmada.yaml @@ -25,7 +25,7 @@ spec: storage: 3Gi karmadaAPIServer: imageRepository: registry.k8s.io/kube-apiserver - imageTag: v1.25.4 + imageTag: v1.26.12 replicas: 1 serviceType: NodePort serviceSubnet: 10.96.0.0/12 @@ -47,7 +47,7 @@ spec: replicas: 1 kubeControllerManager: imageRepository: registry.k8s.io/kube-controller-manager - imageTag: v1.25.4 + imageTag: v1.26.12 replicas: 1 karmadaMetricsAdapter: imageRepository: docker.io/karmada/karmada-metrics-adapter diff --git a/operator/pkg/constants/constants.go b/operator/pkg/constants/constants.go index f2e80c586..bbe132074 100644 --- a/operator/pkg/constants/constants.go +++ b/operator/pkg/constants/constants.go @@ -31,7 +31,7 @@ const ( // EtcdDefaultVersion defines the default of the karmada etcd image tag EtcdDefaultVersion = "3.5.9-0" // KubeDefaultVersion defines the default of the karmada apiserver and kubeControllerManager image tag - KubeDefaultVersion = "v1.25.4" + KubeDefaultVersion = "v1.26.12" // KarmadaDefaultServiceSubnet defines the default of the subnet used by k8s services. KarmadaDefaultServiceSubnet = "10.96.0.0/12" // KarmadaDefaultDNSDomain defines the default of the DNSDomain diff --git a/pkg/karmadactl/cmdinit/cmdinit.go b/pkg/karmadactl/cmdinit/cmdinit.go index 5c62fb72f..cc1b93f10 100644 --- a/pkg/karmadactl/cmdinit/cmdinit.go +++ b/pkg/karmadactl/cmdinit/cmdinit.go @@ -118,7 +118,7 @@ func NewCmdInit(parentCommand string) *cobra.Command { // kube image registry flags.StringVarP(&opts.KubeImageMirrorCountry, "kube-image-mirror-country", "", "", "Country code of the kube image registry to be used. For Chinese mainland users, set it to cn") flags.StringVarP(&opts.KubeImageRegistry, "kube-image-registry", "", "", "Kube image registry. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers to override default kube image registry") - flags.StringVar(&opts.KubeImageTag, "kube-image-tag", "v1.25.4", "Choose a specific Kubernetes version for the control plane.") + flags.StringVar(&opts.KubeImageTag, "kube-image-tag", "v1.26.12", "Choose a specific Kubernetes version for the control plane.") // cert flags.StringVar(&opts.ExternalIP, "cert-external-ip", "", "the external IP of Karmada certificate (e.g 192.168.1.2,172.16.1.2)") flags.StringVar(&opts.ExternalDNS, "cert-external-dns", "", "the external DNS of Karmada certificate (e.g localhost,localhost.com)")