fix: change and precheck etcd_version (#2952)

redscholar · web-flow · commit 5fd34cef73a9 · 2026-01-14T14:13:08.000+08:00
Signed-off-by: redscholar &lt;blacktiledhouse@gmail.com&gt;
diff --git a/builtin/core/defaults/config/v1.23.yaml b/builtin/core/defaults/config/v1.23.yaml
@@ -25,7 +25,7 @@ spec:
           tag: 2.9.6-alpine
   etcd:
     # Specify the etcd version to be installed.
-    etcd_version: v3.5.4
+    etcd_version: v3.5.6
   image_registry:
     # Image registry type to install. Supported: harbor, docker-registry.
     # Leave empty to skip installation (assuming an existing registry is available).
diff --git a/builtin/core/defaults/config/v1.25.yaml b/builtin/core/defaults/config/v1.25.yaml
@@ -25,7 +25,7 @@ spec:
           tag: 2.9.6-alpine
   etcd:
     # Specify the etcd version to be installed.
-    etcd_version: v3.5.7
+    etcd_version: v3.5.9
   image_registry:
     # Image registry type to install. Supported: harbor, docker-registry.
     # Leave empty to skip installation (assuming an existing registry is available).
diff --git a/builtin/core/defaults/config/v1.26.yaml b/builtin/core/defaults/config/v1.26.yaml
@@ -25,7 +25,7 @@ spec:
           tag: 2.9.6-alpine
   etcd:
     # Specify the etcd version to be installed.
-    etcd_version: v3.5.8
+    etcd_version: v3.5.10
   image_registry:
     # Image registry type to install. Supported: harbor, docker-registry.
     # Leave empty to skip installation (assuming an existing registry is available).
diff --git a/builtin/core/defaults/config/v1.27.yaml b/builtin/core/defaults/config/v1.27.yaml
@@ -25,7 +25,7 @@ spec:
           tag: 2.9.6-alpine
   etcd:
     # Specify the etcd version to be installed.
-    etcd_version: v3.5.9
+    etcd_version: v3.5.12
   image_registry:
     # Image registry type to install. Supported: harbor, docker-registry.
     # Leave empty to skip installation (assuming an existing registry is available).
diff --git a/builtin/core/defaults/config/v1.28.yaml b/builtin/core/defaults/config/v1.28.yaml
@@ -25,7 +25,7 @@ spec:
           tag: 2.9.6-alpine
   etcd:
     # Specify the etcd version to be installed.
-    etcd_version: v3.5.9
+    etcd_version: v3.5.15
   image_registry:
     # Image registry type to install. Supported: harbor, docker-registry.
     # Leave empty to skip installation (assuming an existing registry is available).
diff --git a/builtin/core/defaults/config/v1.29.yaml b/builtin/core/defaults/config/v1.29.yaml
@@ -25,7 +25,7 @@ spec:
           tag: 2.9.6-alpine
   etcd:
     # Specify the etcd version to be installed.
-    etcd_version: v3.5.10
+    etcd_version: v3.5.15
   image_registry:
     # Image registry type to install. Supported: harbor, docker-registry.
     # Leave empty to skip installation (assuming an existing registry is available).
diff --git a/builtin/core/defaults/config/v1.30.yaml b/builtin/core/defaults/config/v1.30.yaml
@@ -25,7 +25,7 @@ spec:
           tag: 2.9.6-alpine
   etcd:
     # Specify the etcd version to be installed.
-    etcd_version: v3.5.10
+    etcd_version: v3.5.15
   image_registry:
     # Image registry type to install. Supported: harbor, docker-registry.
     # Leave empty to skip installation (assuming an existing registry is available).
diff --git a/builtin/core/defaults/config/v1.31.yaml b/builtin/core/defaults/config/v1.31.yaml
@@ -25,7 +25,7 @@ spec:
           tag: 2.9.6-alpine
   etcd:
     # Specify the etcd version to be installed.
-    etcd_version: v3.5.11
+    etcd_version: v3.5.24
   image_registry:
     # Image registry type to install. Supported: harbor, docker-registry.
     # Leave empty to skip installation (assuming an existing registry is available).
diff --git a/builtin/core/defaults/config/v1.32.yaml b/builtin/core/defaults/config/v1.32.yaml
@@ -25,7 +25,7 @@ spec:
           tag: 2.9.6-alpine
   etcd:
     # Specify the etcd version to be installed.
-    etcd_version: v3.5.11
+    etcd_version: v3.5.24
   image_registry:
     # Image registry type to install. Supported: harbor, docker-registry.
     # Leave empty to skip installation (assuming an existing registry is available).
diff --git a/builtin/core/defaults/config/v1.33.yaml b/builtin/core/defaults/config/v1.33.yaml
@@ -25,7 +25,7 @@ spec:
           tag: 2.9.6-alpine
   etcd:
     # Specify the etcd version to be installed.
-    etcd_version: v3.5.25
+    etcd_version: v3.5.24
   image_registry:
     # Image registry type to install. Supported: harbor, docker-registry.
     # Leave empty to skip installation (assuming an existing registry is available).
diff --git a/builtin/core/defaults/config/v1.34.yaml b/builtin/core/defaults/config/v1.34.yaml
@@ -25,7 +25,7 @@ spec:
           tag: 2.9.6-alpine
   etcd:
     # Specify the etcd version to be installed.
-    etcd_version: v3.5.25
+    etcd_version: v3.6.5
   image_registry:
     # Image registry type to install. Supported: harbor, docker-registry.
     # Leave empty to skip installation (assuming an existing registry is available).
diff --git a/builtin/core/roles/defaults/defaults/main/01-cluster_require.yaml b/builtin/core/roles/defaults/defaults/main/01-cluster_require.yaml
@@ -62,4 +62,30 @@ cluster_require:
     v1.12: ["v1.23", "v1.24", "v1.25", "v1.26", "v1.27", "v1.28"]
     v1.13: ["v1.23", "v1.24", "v1.25", "v1.26", "v1.27", "v1.28"]
     v1.14: ["v1.29", "v1.30", "v1.31", "v1.32", "v1.33", "v1.34"]
-    v1.15: ["v1.29", "v1.30", "v1.31", "v1.32", "v1.33", "v1.34"]
+    v1.15: ["v1.29", "v1.30", "v1.31", "v1.32", "v1.33", "v1.34"]
+
+  # ETCD MIN Version
+  etcd_min_versions:
+    v1.23: v3.2.18
+    v1.24: v3.2.18
+    v1.25: v3.2.18
+    v1.26: v3.2.18
+    v1.27: v3.2.18
+    v1.28: v3.4.13-4
+    v1.29: v3.4.13-4
+    v1.30: v3.4.13-4
+    v1.31: v3.5.11-0
+    v1.31.14: v3.5.24-0
+    v1.32: v3.5.11-0
+    v1.32.10: v3.5.24-0
+    v1.32.11: v3.5.24-0
+    v1.33.0: v3.5.11-0
+    v1.33.1: v3.5.11-0
+    v1.33.2: v3.5.11-0
+    v1.33.3: v3.5.11-0
+    v1.33.4: v3.5.11-0
+    v1.33.5: v3.5.11-0
+    v1.33: v3.5.21-0
+    v1.34.0: v3.5.21-0
+    v1.34.1: v3.5.21-0
+    v1.34: v3.5.24-0
diff --git a/builtin/core/roles/defaults/vars/v1.23.yaml b/builtin/core/roles/defaults/vars/v1.23.yaml
@@ -10,7 +10,7 @@ kubernetes:
         tag: 2.9.6-alpine
 etcd:
   # etcd binary
-  etcd_version: v3.5.4
+  etcd_version: v3.5.6
 image_registry:
   # keepalived image tag. Used for load balancing when there are multiple image registry nodes.
   keepalived_version: 2.0.20
diff --git a/builtin/core/roles/defaults/vars/v1.25.yaml b/builtin/core/roles/defaults/vars/v1.25.yaml
@@ -10,7 +10,7 @@ kubernetes:
         tag: 2.9.6-alpine
 etcd:
   # etcd binary
-  etcd_version: v3.5.7
+  etcd_version: v3.5.9
 image_registry:
   # ========== image registry ==========
   # keepalived image tag. Used for load balancing when there are multiple image registry nodes.
diff --git a/builtin/core/roles/defaults/vars/v1.26.yaml b/builtin/core/roles/defaults/vars/v1.26.yaml
@@ -10,7 +10,7 @@ kubernetes:
         tag: 2.9.6-alpine
 etcd:
   # etcd binary
-  etcd_version: v3.5.8
+  etcd_version: v3.5.10
 image_registry:
   # ========== image registry ==========
   # keepalived image tag. Used for load balancing when there are multiple image registry nodes.
diff --git a/builtin/core/roles/defaults/vars/v1.27.yaml b/builtin/core/roles/defaults/vars/v1.27.yaml
@@ -10,7 +10,7 @@ kubernetes:
         tag: 2.9.6-alpine
 etcd:
   # etcd binary
-  etcd_version: v3.5.9
+  etcd_version: v3.5.12
 image_registry:
   # ========== image registry ==========
   # keepalived image tag. Used for load balancing when there are multiple image registry nodes.
diff --git a/builtin/core/roles/defaults/vars/v1.28.yaml b/builtin/core/roles/defaults/vars/v1.28.yaml
@@ -10,7 +10,7 @@ kubernetes:
         tag: 2.9.6-alpine
 etcd:
   # etcd binary
-  etcd_version: v3.5.9
+  etcd_version: v3.5.15
 image_registry:
   # ========== image registry ==========
   # keepalived image tag. Used for load balancing when there are multiple image registry nodes.
diff --git a/builtin/core/roles/defaults/vars/v1.29.yaml b/builtin/core/roles/defaults/vars/v1.29.yaml
@@ -10,7 +10,7 @@ kubernetes:
         tag: 2.9.6-alpine
 etcd:
   # etcd binary
-  etcd_version: v3.5.10
+  etcd_version: v3.5.15
 image_registry:
   # ========== image registry ==========
   # keepalived image tag. Used for load balancing when there are multiple image registry nodes.
diff --git a/builtin/core/roles/defaults/vars/v1.30.yaml b/builtin/core/roles/defaults/vars/v1.30.yaml
@@ -10,7 +10,7 @@ kubernetes:
         tag: 2.9.6-alpine
 etcd:
   # etcd binary
-  etcd_version: v3.5.10
+  etcd_version: v3.5.15
 image_registry:
   # ========== image registry ==========
   # keepalived image tag. Used for load balancing when there are multiple image registry nodes.
diff --git a/builtin/core/roles/defaults/vars/v1.31.yaml b/builtin/core/roles/defaults/vars/v1.31.yaml
@@ -10,7 +10,7 @@ kubernetes:
         tag: 2.9.6-alpine
 etcd:
   # etcd binary
-  etcd_version: v3.5.11
+  etcd_version: v3.5.24
 image_registry:
   # ========== image registry ==========
   # keepalived image tag. Used for load balancing when there are multiple image registry nodes.
diff --git a/builtin/core/roles/defaults/vars/v1.32.yaml b/builtin/core/roles/defaults/vars/v1.32.yaml
@@ -10,7 +10,7 @@ kubernetes:
         tag: 2.9.6-alpine
 etcd:
   # etcd binary
-  etcd_version: v3.5.11
+  etcd_version: v3.5.24
 image_registry:
   # ========== image registry ==========
   # keepalived image tag. Used for load balancing when there are multiple image registry nodes.
diff --git a/builtin/core/roles/defaults/vars/v1.33.yaml b/builtin/core/roles/defaults/vars/v1.33.yaml
@@ -10,7 +10,7 @@ kubernetes:
         tag: 2.9.6-alpine
 etcd:
   # etcd binary
-  etcd_version: v3.5.25
+  etcd_version: v3.5.24
 image_registry:
   # ========== image registry ==========
   # keepalived image tag. Used for load balancing when there are multiple image registry nodes.
diff --git a/builtin/core/roles/defaults/vars/v1.34.yaml b/builtin/core/roles/defaults/vars/v1.34.yaml
@@ -10,7 +10,7 @@ kubernetes:
         tag: 2.9.6-alpine
 etcd:
   # etcd binary
-  etcd_version: v3.5.25
+  etcd_version: v3.6.5
 image_registry:
   # ========== image registry ==========
   # keepalived image tag. Used for load balancing when there are multiple image registry nodes.
diff --git a/builtin/core/roles/precheck/etcd/tasks/main.yaml b/builtin/core/roles/precheck/etcd/tasks/main.yaml
@@ -6,6 +6,24 @@
     fail_msg: >-
       Invalid etcd deployment type: "{{ .etcd.deployment_type }}". Expected "internal" or "external".
 
+- name: ETCD | Validate that the etcd version is sufficient
+  run_once: true
+  block:
+    - name: ETCD | Verify etcd minimum version for exact Kubernetes release
+      when: hasKey .cluster_require.etcd_min_versions .kubernetes.kube_version
+      assert:
+        that: .etcd.etcd_version | semverCompare (printf ">=%s" (index .cluster_require.etcd_min_versions .kubernetes.kube_version))
+        fail_msg: >-
+          The specified etcd version is too old. For Kubernetes {{ .kubernetes.kube_version }}, the minimum required etcd version is {{ index .cluster_require.etcd_min_versions .kubernetes.kube_version }}.
+    - name: ETCD | Verify etcd minimum version for Kubernetes minor release
+      when:
+        - hasKey .cluster_require.etcd_min_versions .kubernetes.kube_version | not
+        - hasKey .cluster_require.etcd_min_versions (slice (.kubernetes.kube_version | splitList ".") 0 2 | join ".")
+      assert:
+        that: .etcd.etcd_version | semverCompare (printf ">=%s" (index .cluster_require.etcd_min_versions (slice (.kubernetes.kube_version | splitList ".") 0 2 | join ".")))
+        fail_msg: >-
+          The specified etcd version is too old. For Kubernetes {{ .kubernetes.kube_version }}, the minimum required etcd version is {{ index .cluster_require.etcd_min_versions (slice (.kubernetes.kube_version | splitList ".") 0 2 | join ".") }}.
+
 ## https://cwiki.yunify.com/pages/viewpage.action?pageId=145920824
 - name: ETCD | Validate disk I/O performance for etcd
   when:
