From a9321809d15ba8d15e3d07ec272b88603e0ba4e4 Mon Sep 17 00:00:00 2001 From: chaosi-zju Date: Thu, 21 Nov 2024 15:19:25 +0800 Subject: [PATCH] update karmada-apiserver and kube-controller-manager to v1.31.3 by default. Signed-off-by: chaosi-zju --- charts/karmada/README.md | 4 ++-- charts/karmada/values.yaml | 4 ++-- hack/deploy-karmada.sh | 2 +- operator/README.md | 4 ++-- operator/config/samples/karmada-sample.yaml | 4 ++-- operator/config/samples/karmada.yaml | 4 ++-- operator/pkg/constants/constants.go | 2 +- pkg/karmadactl/cmdinit/cmdinit.go | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/charts/karmada/README.md b/charts/karmada/README.md index 8b609a42eecf..30686ae99015 100644 --- a/charts/karmada/README.md +++ b/charts/karmada/README.md @@ -308,7 +308,7 @@ helm install karmada-scheduler-estimator -n karmada-system ./charts/karmada | `apiServer.podAnnotations` | Annotations of the karmada-apiserver pods | `{}` | | `apiServer.image.pullSecrets` | 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.30.4"` | +| `apiServer.image.tag` | Image tag of the karmada-apiserver | `"v1.31.3"` | | `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"` | @@ -337,7 +337,7 @@ helm install karmada-scheduler-estimator -n karmada-system ./charts/karmada | `kubeControllerManager.podAnnotations` | Annotations of the kube-controller-manager pods | `{}` | | `kubeControllerManager.image.pullSecrets` | 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.30.4"` | +| `kubeControllerManager.image.tag` | Image tag of the kube-controller-manager | `"v1.31.3"` | | `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 54874df67fd4..53e0fc128f1c 100644 --- a/charts/karmada/values.yaml +++ b/charts/karmada/values.yaml @@ -374,7 +374,7 @@ apiServer: image: registry: registry.k8s.io repository: kube-apiserver - tag: "v1.30.4" + tag: "v1.31.3" ## Specify a imagePullPolicy, defaults to 'IfNotPresent' pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. @@ -572,7 +572,7 @@ kubeControllerManager: image: registry: registry.k8s.io repository: kube-controller-manager - tag: "v1.30.4" + tag: "v1.31.3" ## Specify a imagePullPolicy, defaults to 'IfNotPresent' pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. diff --git a/hack/deploy-karmada.sh b/hack/deploy-karmada.sh index cd411cb917e9..96113dd0e5b9 100755 --- a/hack/deploy-karmada.sh +++ b/hack/deploy-karmada.sh @@ -228,7 +228,7 @@ fi # deploy karmada apiserver TEMP_PATH_APISERVER=$(mktemp -d) trap '{ rm -rf ${TEMP_PATH_APISERVER}; }' EXIT -KARMADA_APISERVER_VERSION=${KARMADA_APISERVER_VERSION:-"v1.30.4"} +KARMADA_APISERVER_VERSION=${KARMADA_APISERVER_VERSION:-"v1.31.3"} cp "${REPO_ROOT}"/artifacts/deploy/karmada-apiserver.yaml "${TEMP_PATH_APISERVER}"/karmada-apiserver.yaml sed -i'' -e "s/{{service_type}}/${KARMADA_APISERVER_SERVICE_TYPE}/g" "${TEMP_PATH_APISERVER}"/karmada-apiserver.yaml sed -i'' -e "s/{{karmada_apiserver_version}}/${KARMADA_APISERVER_VERSION}/g" "${TEMP_PATH_APISERVER}"/karmada-apiserver.yaml diff --git a/operator/README.md b/operator/README.md index 0a9ab6525eb6..479faf6a5961 100644 --- a/operator/README.md +++ b/operator/README.md @@ -214,7 +214,7 @@ You can change it to `NodePort`: ... karmadaAPIServer: imageRepository: registry.k8s.io/kube-apiserver - imageTag: v1.30.4 + imageTag: v1.31.3 replicas: 1 serviceType: NodePort serviceSubnet: 10.96.0.0/12 @@ -229,7 +229,7 @@ You can add more SANs to karmada-apiserver certificate: ... karmadaAPIServer: imageRepository: registry.k8s.io/kube-apiserver - imageTag: v1.30.4 + imageTag: v1.31.3 replicas: 1 serviceSubnet: 10.96.0.0/12 certSANs: diff --git a/operator/config/samples/karmada-sample.yaml b/operator/config/samples/karmada-sample.yaml index ce720307460c..c42de964e73a 100644 --- a/operator/config/samples/karmada-sample.yaml +++ b/operator/config/samples/karmada-sample.yaml @@ -30,7 +30,7 @@ spec: storage: 3Gi karmadaAPIServer: imageRepository: registry.k8s.io/kube-apiserver - imageTag: v1.30.4 + imageTag: v1.31.3 replicas: 1 serviceType: NodePort serviceSubnet: 10.96.0.0/12 @@ -52,7 +52,7 @@ spec: replicas: 1 kubeControllerManager: imageRepository: registry.k8s.io/kube-controller-manager - imageTag: v1.30.4 + imageTag: v1.31.3 replicas: 1 karmadaMetricsAdapter: imageRepository: docker.io/karmada/karmada-metrics-adapter diff --git a/operator/config/samples/karmada.yaml b/operator/config/samples/karmada.yaml index 94f81d19ab74..08e8bde6a0cc 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.30.4 + imageTag: v1.31.3 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.30.4 + imageTag: v1.31.3 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 525b27d743fe..bc898b02a22a 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.13-0" // KubeDefaultVersion defines the default of the karmada apiserver and kubeControllerManager image tag - KubeDefaultVersion = "v1.30.4" + KubeDefaultVersion = "v1.31.3" // 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 24e1eb567cec..95e8246541eb 100644 --- a/pkg/karmadactl/cmdinit/cmdinit.go +++ b/pkg/karmadactl/cmdinit/cmdinit.go @@ -123,7 +123,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.30.4", "Choose a specific Kubernetes version for the control plane.") + flags.StringVar(&opts.KubeImageTag, "kube-image-tag", "v1.31.3", "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)")