Merge pull request #16528 from hakman/automated-cherry-pick-of-#16527…

…-upstream-release-1.29 Automated cherry pick of #16527: Update etcd to v3.5.13
kubernetes · May 6, 2024 · f9a0ba0 · f9a0ba0
2 parents 588f77d + b8c03ed
commit f9a0ba0
Show file tree

Hide file tree

Showing 422 changed files with 1,646 additions and 1,456 deletions.
diff --git a/pkg/model/components/etcd.go b/pkg/model/components/etcd.go
@@ -29,7 +29,7 @@ type EtcdOptionsBuilder struct {
 var _ loader.OptionsBuilder = &EtcdOptionsBuilder{}
 
 const (
-	DefaultEtcd3Version_1_22 = "3.5.9"
+	DefaultEtcd3Version_1_22 = "3.5.13"
 )
 
 // 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,13 +79,14 @@ 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.9"},
-	{Version: "3.5.1", SymlinkToVersion: "3.5.9"},
-	{Version: "3.5.3", SymlinkToVersion: "3.5.9"},
-	{Version: "3.5.4", SymlinkToVersion: "3.5.9"},
-	{Version: "3.5.6", SymlinkToVersion: "3.5.9"},
-	{Version: "3.5.7", SymlinkToVersion: "3.5.9"},
-	{Version: "3.5.9", Image: "registry.k8s.io/etcd:3.5.9-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"},
 }
 
 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.9
+      - --target-dir=/opt/etcd-v3.5.13
       - --src=/usr/local/bin/etcd
       - --src=/usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-9
+      image: registry.k8s.io/etcd:3.5.13-0
+      name: init-etcd-3-5-13
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -164,12 +164,13 @@ Contents: |
       - --target-dir=/opt/etcd-v3.5.4
       - --target-dir=/opt/etcd-v3.5.6
       - --target-dir=/opt/etcd-v3.5.7
-      - --src=/opt/etcd-v3.5.9/etcd
-      - --src=/opt/etcd-v3.5.9/etcdctl
+      - --target-dir=/opt/etcd-v3.5.9
+      - --src=/opt/etcd-v3.5.13/etcd
+      - --src=/opt/etcd-v3.5.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
       image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1
-      name: init-etcd-symlinks-3-5-9
+      name: init-etcd-symlinks-3-5-13
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -272,13 +273,13 @@ Contents: |
       - mountPath: /opt
         name: opt
     - args:
-      - --target-dir=/opt/etcd-v3.5.9
+      - --target-dir=/opt/etcd-v3.5.13
       - --src=/usr/local/bin/etcd
       - --src=/usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-9
+      image: registry.k8s.io/etcd:3.5.13-0
+      name: init-etcd-3-5-13
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -304,12 +305,13 @@ Contents: |
       - --target-dir=/opt/etcd-v3.5.4
       - --target-dir=/opt/etcd-v3.5.6
       - --target-dir=/opt/etcd-v3.5.7
-      - --src=/opt/etcd-v3.5.9/etcd
-      - --src=/opt/etcd-v3.5.9/etcdctl
+      - --target-dir=/opt/etcd-v3.5.9
+      - --src=/opt/etcd-v3.5.13/etcd
+      - --src=/opt/etcd-v3.5.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
       image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1
-      name: init-etcd-symlinks-3-5-9
+      name: init-etcd-symlinks-3-5-13
       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.9
+      - --target-dir=/opt/etcd-v3.5.13
       - --src=/usr/local/bin/etcd
       - --src=/usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-9
+      image: registry.k8s.io/etcd:3.5.13-0
+      name: init-etcd-3-5-13
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -163,12 +163,13 @@ Contents: |
       - --target-dir=/opt/etcd-v3.5.4
       - --target-dir=/opt/etcd-v3.5.6
       - --target-dir=/opt/etcd-v3.5.7
-      - --src=/opt/etcd-v3.5.9/etcd
-      - --src=/opt/etcd-v3.5.9/etcdctl
+      - --target-dir=/opt/etcd-v3.5.9
+      - --src=/opt/etcd-v3.5.13/etcd
+      - --src=/opt/etcd-v3.5.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
       image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1
-      name: init-etcd-symlinks-3-5-9
+      name: init-etcd-symlinks-3-5-13
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -270,13 +271,13 @@ Contents: |
       - mountPath: /opt
         name: opt
     - args:
-      - --target-dir=/opt/etcd-v3.5.9
+      - --target-dir=/opt/etcd-v3.5.13
       - --src=/usr/local/bin/etcd
       - --src=/usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-9
+      image: registry.k8s.io/etcd:3.5.13-0
+      name: init-etcd-3-5-13
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -302,12 +303,13 @@ Contents: |
       - --target-dir=/opt/etcd-v3.5.4
       - --target-dir=/opt/etcd-v3.5.6
       - --target-dir=/opt/etcd-v3.5.7
-      - --src=/opt/etcd-v3.5.9/etcd
-      - --src=/opt/etcd-v3.5.9/etcdctl
+      - --target-dir=/opt/etcd-v3.5.9
+      - --src=/opt/etcd-v3.5.13/etcd
+      - --src=/opt/etcd-v3.5.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
       image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1
-      name: init-etcd-symlinks-3-5-9
+      name: init-etcd-symlinks-3-5-13
       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.9
+      - --target-dir=/opt/etcd-v3.5.13
       - --src=/usr/local/bin/etcd
       - --src=/usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-9
+      image: registry.k8s.io/etcd:3.5.13-0
+      name: init-etcd-3-5-13
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -166,12 +166,13 @@ Contents: |
       - --target-dir=/opt/etcd-v3.5.4
       - --target-dir=/opt/etcd-v3.5.6
       - --target-dir=/opt/etcd-v3.5.7
-      - --src=/opt/etcd-v3.5.9/etcd
-      - --src=/opt/etcd-v3.5.9/etcdctl
+      - --target-dir=/opt/etcd-v3.5.9
+      - --src=/opt/etcd-v3.5.13/etcd
+      - --src=/opt/etcd-v3.5.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
       image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1
-      name: init-etcd-symlinks-3-5-9
+      name: init-etcd-symlinks-3-5-13
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -276,13 +277,13 @@ Contents: |
       - mountPath: /opt
         name: opt
     - args:
-      - --target-dir=/opt/etcd-v3.5.9
+      - --target-dir=/opt/etcd-v3.5.13
       - --src=/usr/local/bin/etcd
       - --src=/usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-9
+      image: registry.k8s.io/etcd:3.5.13-0
+      name: init-etcd-3-5-13
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -308,12 +309,13 @@ Contents: |
       - --target-dir=/opt/etcd-v3.5.4
       - --target-dir=/opt/etcd-v3.5.6
       - --target-dir=/opt/etcd-v3.5.7
-      - --src=/opt/etcd-v3.5.9/etcd
-      - --src=/opt/etcd-v3.5.9/etcdctl
+      - --target-dir=/opt/etcd-v3.5.9
+      - --src=/opt/etcd-v3.5.13/etcd
+      - --src=/opt/etcd-v3.5.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
       image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1
-      name: init-etcd-symlinks-3-5-9
+      name: init-etcd-symlinks-3-5-13
       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.9
+      - --target-dir=/opt/etcd-v3.5.13
       - --src=/usr/local/bin/etcd
       - --src=/usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-9
+      image: registry.k8s.io/etcd:3.5.13-0
+      name: init-etcd-3-5-13
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -172,12 +172,13 @@ Contents: |
       - --target-dir=/opt/etcd-v3.5.4
       - --target-dir=/opt/etcd-v3.5.6
       - --target-dir=/opt/etcd-v3.5.7
-      - --src=/opt/etcd-v3.5.9/etcd
-      - --src=/opt/etcd-v3.5.9/etcdctl
+      - --target-dir=/opt/etcd-v3.5.9
+      - --src=/opt/etcd-v3.5.13/etcd
+      - --src=/opt/etcd-v3.5.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
       image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1
-      name: init-etcd-symlinks-3-5-9
+      name: init-etcd-symlinks-3-5-13
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -288,13 +289,13 @@ Contents: |
       - mountPath: /opt
         name: opt
     - args:
-      - --target-dir=/opt/etcd-v3.5.9
+      - --target-dir=/opt/etcd-v3.5.13
       - --src=/usr/local/bin/etcd
       - --src=/usr/local/bin/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/etcd:3.5.9-0
-      name: init-etcd-3-5-9
+      image: registry.k8s.io/etcd:3.5.13-0
+      name: init-etcd-3-5-13
       resources: {}
       volumeMounts:
       - mountPath: /opt
@@ -320,12 +321,13 @@ Contents: |
       - --target-dir=/opt/etcd-v3.5.4
       - --target-dir=/opt/etcd-v3.5.6
       - --target-dir=/opt/etcd-v3.5.7
-      - --src=/opt/etcd-v3.5.9/etcd
-      - --src=/opt/etcd-v3.5.9/etcdctl
+      - --target-dir=/opt/etcd-v3.5.9
+      - --src=/opt/etcd-v3.5.13/etcd
+      - --src=/opt/etcd-v3.5.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
       image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1
-      name: init-etcd-symlinks-3-5-9
+      name: init-etcd-symlinks-3-5-13
       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.9
+    version: 3.5.13
   - 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.9
+    version: 3.5.13
   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.9"
+  "etcdVersion": "3.5.13"
 }
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.9"
+  "etcdVersion": "3.5.13"
 }
diff --git a/...ditionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/...ditionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -68,13 +68,13 @@ spec:
     - mountPath: /opt
       name: opt
   - args:
-    - --target-dir=/opt/etcd-v3.5.9
+    - --target-dir=/opt/etcd-v3.5.13
     - --src=/usr/local/bin/etcd
     - --src=/usr/local/bin/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/etcd:3.5.9-0
-    name: init-etcd-3-5-9
+    image: registry.k8s.io/etcd:3.5.13-0
+    name: init-etcd-3-5-13
     resources: {}
     volumeMounts:
     - mountPath: /opt
@@ -100,12 +100,13 @@ spec:
     - --target-dir=/opt/etcd-v3.5.4
     - --target-dir=/opt/etcd-v3.5.6
     - --target-dir=/opt/etcd-v3.5.7
-    - --src=/opt/etcd-v3.5.9/etcd
-    - --src=/opt/etcd-v3.5.9/etcdctl
+    - --target-dir=/opt/etcd-v3.5.9
+    - --src=/opt/etcd-v3.5.13/etcd
+    - --src=/opt/etcd-v3.5.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
     image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1
-    name: init-etcd-symlinks-3-5-9
+    name: init-etcd-symlinks-3-5-13
     resources: {}
     volumeMounts:
     - mountPath: /opt