Merge pull request #17160 from hakman/etcd-3.5.17

Update etcd to v3.5.17
kubernetes · Jan 2, 2025 · d4f03b1 · d4f03b1
2 parents 8063d83 + c3a748f
commit d4f03b1
Show file tree

Hide file tree

Showing 417 changed files with 1,629 additions and 1,441 deletions.
diff --git a/pkg/model/components/etcd.go b/pkg/model/components/etcd.go
@@ -29,7 +29,7 @@ type EtcdOptionsBuilder struct {
 var _ loader.ClusterOptionsBuilder = &EtcdOptionsBuilder{}
 
 const (
-	DefaultEtcd3Version_1_22 = "3.5.13"
+	DefaultEtcd3Version_1_22 = "3.5.17"
 )
 
 // BuildOptions is responsible for filling in the defaults for the etcd cluster model

diff --git a/pkg/model/components/etcdmanager/options.go b/pkg/model/components/etcdmanager/options.go
@@ -79,14 +79,15 @@ type etcdVersion struct {
 var etcdSupportedImages = []etcdVersion{
 	{Version: "3.4.3", SymlinkToVersion: "3.4.13"},
 	{Version: "3.4.13", Image: "registry.k8s.io/etcd:3.4.13-0"},
-	{Version: "3.5.0", SymlinkToVersion: "3.5.13"},
-	{Version: "3.5.1", SymlinkToVersion: "3.5.13"},
-	{Version: "3.5.3", SymlinkToVersion: "3.5.13"},
-	{Version: "3.5.4", SymlinkToVersion: "3.5.13"},
-	{Version: "3.5.6", SymlinkToVersion: "3.5.13"},
-	{Version: "3.5.7", SymlinkToVersion: "3.5.13"},
-	{Version: "3.5.9", SymlinkToVersion: "3.5.13"},
-	{Version: "3.5.13", Image: "registry.k8s.io/etcd:3.5.13-0"},
+	{Version: "3.5.0", SymlinkToVersion: "3.5.17"},
+	{Version: "3.5.1", SymlinkToVersion: "3.5.17"},
+	{Version: "3.5.3", SymlinkToVersion: "3.5.17"},
+	{Version: "3.5.4", SymlinkToVersion: "3.5.17"},
+	{Version: "3.5.6", SymlinkToVersion: "3.5.17"},
+	{Version: "3.5.7", SymlinkToVersion: "3.5.17"},
+	{Version: "3.5.9", SymlinkToVersion: "3.5.17"},
+	{Version: "3.5.13", SymlinkToVersion: "3.5.17"},
+	{Version: "3.5.17", Image: "registry.k8s.io/etcd:3.5.17-0"},
 }
 
 func etcdSupportedVersions() []etcdVersion {

diff --git a/pkg/model/components/etcdmanager/tests/interval/tasks.yaml b/pkg/model/components/etcdmanager/tests/interval/tasks.yaml
@@ -132,13 +132,13 @@ Contents: |
       - mountPath: /opt
         name: opt
     - args:
-      - --target-dir=/opt/etcd-v3.5.13
+      - --target-dir=/opt/etcd-v3.5.17
       - --src=/usr/local/bin/etcd
       - --src=/usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.13-0
-      name: init-etcd-3-5-13
+      image: registry.k8s.io/etcd:3.5.17-0
+      name: init-etcd-3-5-17
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -160,17 +160,18 @@ Contents: |
       - --symlink
       - --target-dir=/opt/etcd-v3.5.0
       - --target-dir=/opt/etcd-v3.5.1
+      - --target-dir=/opt/etcd-v3.5.13
       - --target-dir=/opt/etcd-v3.5.3
       - --target-dir=/opt/etcd-v3.5.4
       - --target-dir=/opt/etcd-v3.5.6
       - --target-dir=/opt/etcd-v3.5.7
       - --target-dir=/opt/etcd-v3.5.9
-      - --src=/opt/etcd-v3.5.13/etcd
-      - --src=/opt/etcd-v3.5.13/etcdctl
+      - --src=/opt/etcd-v3.5.17/etcd
+      - --src=/opt/etcd-v3.5.17/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
       image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1
-      name: init-etcd-symlinks-3-5-13
+      name: init-etcd-symlinks-3-5-17
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -273,13 +274,13 @@ Contents: |
       - mountPath: /opt
         name: opt
     - args:
-      - --target-dir=/opt/etcd-v3.5.13
+      - --target-dir=/opt/etcd-v3.5.17
       - --src=/usr/local/bin/etcd
       - --src=/usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.13-0
-      name: init-etcd-3-5-13
+      image: registry.k8s.io/etcd:3.5.17-0
+      name: init-etcd-3-5-17
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -301,17 +302,18 @@ Contents: |
       - --symlink
       - --target-dir=/opt/etcd-v3.5.0
       - --target-dir=/opt/etcd-v3.5.1
+      - --target-dir=/opt/etcd-v3.5.13
       - --target-dir=/opt/etcd-v3.5.3
       - --target-dir=/opt/etcd-v3.5.4
       - --target-dir=/opt/etcd-v3.5.6
       - --target-dir=/opt/etcd-v3.5.7
       - --target-dir=/opt/etcd-v3.5.9
-      - --src=/opt/etcd-v3.5.13/etcd
-      - --src=/opt/etcd-v3.5.13/etcdctl
+      - --src=/opt/etcd-v3.5.17/etcd
+      - --src=/opt/etcd-v3.5.17/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
       image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1
-      name: init-etcd-symlinks-3-5-13
+      name: init-etcd-symlinks-3-5-17
       resources: {}
       volumeMounts:
       - mountPath: /opt

diff --git a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
@@ -131,13 +131,13 @@ Contents: |
       - mountPath: /opt
         name: opt
     - args:
-      - --target-dir=/opt/etcd-v3.5.13
+      - --target-dir=/opt/etcd-v3.5.17
       - --src=/usr/local/bin/etcd
       - --src=/usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.13-0
-      name: init-etcd-3-5-13
+      image: registry.k8s.io/etcd:3.5.17-0
+      name: init-etcd-3-5-17
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -159,17 +159,18 @@ Contents: |
       - --symlink
       - --target-dir=/opt/etcd-v3.5.0
       - --target-dir=/opt/etcd-v3.5.1
+      - --target-dir=/opt/etcd-v3.5.13
       - --target-dir=/opt/etcd-v3.5.3
       - --target-dir=/opt/etcd-v3.5.4
       - --target-dir=/opt/etcd-v3.5.6
       - --target-dir=/opt/etcd-v3.5.7
       - --target-dir=/opt/etcd-v3.5.9
-      - --src=/opt/etcd-v3.5.13/etcd
-      - --src=/opt/etcd-v3.5.13/etcdctl
+      - --src=/opt/etcd-v3.5.17/etcd
+      - --src=/opt/etcd-v3.5.17/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
       image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1
-      name: init-etcd-symlinks-3-5-13
+      name: init-etcd-symlinks-3-5-17
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -271,13 +272,13 @@ Contents: |
       - mountPath: /opt
         name: opt
     - args:
-      - --target-dir=/opt/etcd-v3.5.13
+      - --target-dir=/opt/etcd-v3.5.17
       - --src=/usr/local/bin/etcd
       - --src=/usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.13-0
-      name: init-etcd-3-5-13
+      image: registry.k8s.io/etcd:3.5.17-0
+      name: init-etcd-3-5-17
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -299,17 +300,18 @@ Contents: |
       - --symlink
       - --target-dir=/opt/etcd-v3.5.0
       - --target-dir=/opt/etcd-v3.5.1
+      - --target-dir=/opt/etcd-v3.5.13
       - --target-dir=/opt/etcd-v3.5.3
       - --target-dir=/opt/etcd-v3.5.4
       - --target-dir=/opt/etcd-v3.5.6
       - --target-dir=/opt/etcd-v3.5.7
       - --target-dir=/opt/etcd-v3.5.9
-      - --src=/opt/etcd-v3.5.13/etcd
-      - --src=/opt/etcd-v3.5.13/etcdctl
+      - --src=/opt/etcd-v3.5.17/etcd
+      - --src=/opt/etcd-v3.5.17/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
       image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1
-      name: init-etcd-symlinks-3-5-13
+      name: init-etcd-symlinks-3-5-17
       resources: {}
       volumeMounts:
       - mountPath: /opt

diff --git a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml
@@ -134,13 +134,13 @@ Contents: |
       - mountPath: /opt
         name: opt
     - args:
-      - --target-dir=/opt/etcd-v3.5.13
+      - --target-dir=/opt/etcd-v3.5.17
       - --src=/usr/local/bin/etcd
       - --src=/usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.13-0
-      name: init-etcd-3-5-13
+      image: registry.k8s.io/etcd:3.5.17-0
+      name: init-etcd-3-5-17
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -162,17 +162,18 @@ Contents: |
       - --symlink
       - --target-dir=/opt/etcd-v3.5.0
       - --target-dir=/opt/etcd-v3.5.1
+      - --target-dir=/opt/etcd-v3.5.13
       - --target-dir=/opt/etcd-v3.5.3
       - --target-dir=/opt/etcd-v3.5.4
       - --target-dir=/opt/etcd-v3.5.6
       - --target-dir=/opt/etcd-v3.5.7
       - --target-dir=/opt/etcd-v3.5.9
-      - --src=/opt/etcd-v3.5.13/etcd
-      - --src=/opt/etcd-v3.5.13/etcdctl
+      - --src=/opt/etcd-v3.5.17/etcd
+      - --src=/opt/etcd-v3.5.17/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
       image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1
-      name: init-etcd-symlinks-3-5-13
+      name: init-etcd-symlinks-3-5-17
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -277,13 +278,13 @@ Contents: |
       - mountPath: /opt
         name: opt
     - args:
-      - --target-dir=/opt/etcd-v3.5.13
+      - --target-dir=/opt/etcd-v3.5.17
       - --src=/usr/local/bin/etcd
       - --src=/usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.13-0
-      name: init-etcd-3-5-13
+      image: registry.k8s.io/etcd:3.5.17-0
+      name: init-etcd-3-5-17
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -305,17 +306,18 @@ Contents: |
       - --symlink
       - --target-dir=/opt/etcd-v3.5.0
       - --target-dir=/opt/etcd-v3.5.1
+      - --target-dir=/opt/etcd-v3.5.13
       - --target-dir=/opt/etcd-v3.5.3
       - --target-dir=/opt/etcd-v3.5.4
       - --target-dir=/opt/etcd-v3.5.6
       - --target-dir=/opt/etcd-v3.5.7
       - --target-dir=/opt/etcd-v3.5.9
-      - --src=/opt/etcd-v3.5.13/etcd
-      - --src=/opt/etcd-v3.5.13/etcdctl
+      - --src=/opt/etcd-v3.5.17/etcd
+      - --src=/opt/etcd-v3.5.17/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
       image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1
-      name: init-etcd-symlinks-3-5-13
+      name: init-etcd-symlinks-3-5-17
       resources: {}
       volumeMounts:
       - mountPath: /opt

diff --git a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
@@ -140,13 +140,13 @@ Contents: |
       - mountPath: /opt
         name: opt
     - args:
-      - --target-dir=/opt/etcd-v3.5.13
+      - --target-dir=/opt/etcd-v3.5.17
       - --src=/usr/local/bin/etcd
       - --src=/usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.13-0
-      name: init-etcd-3-5-13
+      image: registry.k8s.io/etcd:3.5.17-0
+      name: init-etcd-3-5-17
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -168,17 +168,18 @@ Contents: |
       - --symlink
       - --target-dir=/opt/etcd-v3.5.0
       - --target-dir=/opt/etcd-v3.5.1
+      - --target-dir=/opt/etcd-v3.5.13
       - --target-dir=/opt/etcd-v3.5.3
       - --target-dir=/opt/etcd-v3.5.4
       - --target-dir=/opt/etcd-v3.5.6
       - --target-dir=/opt/etcd-v3.5.7
       - --target-dir=/opt/etcd-v3.5.9
-      - --src=/opt/etcd-v3.5.13/etcd
-      - --src=/opt/etcd-v3.5.13/etcdctl
+      - --src=/opt/etcd-v3.5.17/etcd
+      - --src=/opt/etcd-v3.5.17/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
       image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1
-      name: init-etcd-symlinks-3-5-13
+      name: init-etcd-symlinks-3-5-17
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -289,13 +290,13 @@ Contents: |
       - mountPath: /opt
         name: opt
     - args:
-      - --target-dir=/opt/etcd-v3.5.13
+      - --target-dir=/opt/etcd-v3.5.17
       - --src=/usr/local/bin/etcd
       - --src=/usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.13-0
-      name: init-etcd-3-5-13
+      image: registry.k8s.io/etcd:3.5.17-0
+      name: init-etcd-3-5-17
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -317,17 +318,18 @@ Contents: |
       - --symlink
       - --target-dir=/opt/etcd-v3.5.0
       - --target-dir=/opt/etcd-v3.5.1
+      - --target-dir=/opt/etcd-v3.5.13
       - --target-dir=/opt/etcd-v3.5.3
       - --target-dir=/opt/etcd-v3.5.4
       - --target-dir=/opt/etcd-v3.5.6
       - --target-dir=/opt/etcd-v3.5.7
       - --target-dir=/opt/etcd-v3.5.9
-      - --src=/opt/etcd-v3.5.13/etcd
-      - --src=/opt/etcd-v3.5.13/etcdctl
+      - --src=/opt/etcd-v3.5.17/etcd
+      - --src=/opt/etcd-v3.5.17/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
       image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1
-      name: init-etcd-symlinks-3-5-13
+      name: init-etcd-symlinks-3-5-17
       resources: {}
       volumeMounts:
       - mountPath: /opt

diff --git a/...ration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content b/...ration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content
@@ -42,7 +42,7 @@ spec:
       backupRetentionDays: 90
     memoryRequest: 100Mi
     name: main
-    version: 3.5.13
+    version: 3.5.17
   - backups:
       backupStore: memfs://tests/additionalobjects.example.com/backups/etcd/events
     cpuRequest: 100m
@@ -54,7 +54,7 @@ spec:
       backupRetentionDays: 90
     memoryRequest: 100Mi
     name: events
-    version: 3.5.13
+    version: 3.5.17
   externalDns:
     provider: dns-controller
   iam:

diff --git a/...tion/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-events_content b/...tion/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-events_content
@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.13"
+  "etcdVersion": "3.5.17"
 }
diff --git a/...ration/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-main_content b/...ration/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-main_content
@@ -1,4 +1,4 @@
 {
   "memberCount": 1,
-  "etcdVersion": "3.5.13"
+  "etcdVersion": "3.5.17"
 }