Merge pull request #5854 from chaosi-zju/etcd-version

etcd: update default version to 3.5.16-0
karmada-io · Nov 22, 2024 · 2f1fe6e · 2f1fe6e
2 parents 079d0ab + a11784e
commit 2f1fe6e
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/artifacts/deploy/karmada-etcd.yaml b/artifacts/deploy/karmada-etcd.yaml
@@ -33,7 +33,7 @@ spec:
         - operator: Exists
       containers:
         - name: etcd
-          image: registry.k8s.io/etcd:3.5.13-0
+          image: registry.k8s.io/etcd:3.5.16-0
           imagePullPolicy: IfNotPresent
           livenessProbe:
             exec:

diff --git a/charts/karmada/README.md b/charts/karmada/README.md
@@ -233,7 +233,7 @@ helm install karmada-scheduler-estimator -n karmada-system ./charts/karmada
 | `etcd.internal.replicaCount`             | Target replicas of the etcd                                                                                                                                                                                                                   | `1`                                                                                                                                                                                                                  |
 | `etcd.internal.image.repository`         | Image of the etcd                                                                                                                                                                                                                             | `"registry.k8s.io/etcd"`                                                                                                                                                                                             |
 | `etcd.internal.image.pullPolicy`         | Image pull policy of the etcd                                                                                                                                                                                                                 | `"IfNotPresent"`                                                                                                                                                                                                     |
-| `etcd.internal.image.tag`                | Image tag of the etcd                                                                                                                                                                                                                         | `"3.5.13-0"`                                                                                                                                                                                                         |
+| `etcd.internal.image.tag`                | Image tag of the etcd                                                                                                                                                                                                                         | `"3.5.16-0"`                                                                                                                                                                                                         |
 | `etcd.internal.storageType`              | StorageType of the etcd, accepts "hostPath", "pvc"                                                                                                                                                                                            | `"hostPath"`                                                                                                                                                                                                         |
 | `etcd.internal.pvc.storageClass`         | StorageClass of the etcd, takes effect when`etcd.internal.storageType` is "pvc"                                                                                                                                                               | `""`                                                                                                                                                                                                                 |
 | `etcd.internal.pvc.size`                 | Storage size of the etcd, takes effect when`etcd.internal.storageType` is "pvc"                                                                                                                                                               | `""`                                                                                                                                                                                                                 |

diff --git a/charts/karmada/values.yaml b/charts/karmada/values.yaml
@@ -668,7 +668,7 @@ etcd:
     image:
       registry: registry.k8s.io
       repository: etcd
-      tag: "3.5.13-0"
+      tag: "3.5.16-0"
       ## Specify a imagePullPolicy, defaults to 'IfNotPresent'
       pullPolicy: IfNotPresent
     ## @param etcd.internal.storageType storage type for etcd data

diff --git a/operator/config/samples/karmada-sample.yaml b/operator/config/samples/karmada-sample.yaml
@@ -13,7 +13,7 @@ spec:
     etcd:
       local:
         imageRepository: registry.k8s.io/etcd
-        imageTag: 3.5.13-0
+        imageTag: 3.5.16-0
         replicas: 1
         volumeData:
           # hostPath:

diff --git a/operator/config/samples/karmada.yaml b/operator/config/samples/karmada.yaml
@@ -8,7 +8,7 @@ spec:
     etcd:
       local:
         imageRepository: registry.k8s.io/etcd
-        imageTag: 3.5.13-0
+        imageTag: 3.5.16-0
         replicas: 1
         volumeData:
           # hostPath:

diff --git a/operator/pkg/constants/constants.go b/operator/pkg/constants/constants.go
@@ -29,7 +29,7 @@ const (
 	// KarmadaDefaultRepository defines the default of the karmada image repository
 	KarmadaDefaultRepository = "docker.io/karmada"
 	// EtcdDefaultVersion defines the default of the karmada etcd image tag
-	EtcdDefaultVersion = "3.5.13-0"
+	EtcdDefaultVersion = "3.5.16-0"
 	// KubeDefaultVersion defines the default of the karmada apiserver and kubeControllerManager image tag
 	KubeDefaultVersion = "v1.31.3"
 	// KarmadaDefaultServiceSubnet defines the default of the subnet used by k8s services.

diff --git a/pkg/karmadactl/cmdinit/cmdinit.go b/pkg/karmadactl/cmdinit/cmdinit.go
@@ -67,7 +67,7 @@ var (
 		%[1]s init --etcd-storage-mode hostPath --etcd-node-selector-labels karmada.io/etcd=true
 
 		# Private registry can be specified for all images
-		%[1]s init --etcd-image local.registry.com/library/etcd:3.5.13-0
+		%[1]s init --etcd-image local.registry.com/library/etcd:3.5.16-0
 
 		# Specify Karmada API Server IP address. If not set, the address on the master node will be used.
 		%[1]s init --karmada-apiserver-advertise-address 192.168.1.2

diff --git a/pkg/karmadactl/cmdinit/kubernetes/deploy.go b/pkg/karmadactl/cmdinit/kubernetes/deploy.go
@@ -84,7 +84,7 @@ var (
 
 	karmadaRelease string
 
-	defaultEtcdImage = "etcd:3.5.13-0"
+	defaultEtcdImage = "etcd:3.5.16-0"
 
 	// DefaultCrdURL Karmada crds resource
 	DefaultCrdURL string