diff --git a/pkg/model/components/etcd.go b/pkg/model/components/etcd.go index db7d616c6b8fc..50d708c0891a5 100644 --- 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.17" + DefaultEtcd3Version_1_22 = "3.5.21" ) // 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 index 25105505aabab..91773dcc20072 100644 --- a/pkg/model/components/etcdmanager/options.go +++ b/pkg/model/components/etcdmanager/options.go @@ -79,15 +79,16 @@ 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.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"}, + {Version: "3.5.0", SymlinkToVersion: "3.5.21"}, + {Version: "3.5.1", SymlinkToVersion: "3.5.21"}, + {Version: "3.5.3", SymlinkToVersion: "3.5.21"}, + {Version: "3.5.4", SymlinkToVersion: "3.5.21"}, + {Version: "3.5.6", SymlinkToVersion: "3.5.21"}, + {Version: "3.5.7", SymlinkToVersion: "3.5.21"}, + {Version: "3.5.9", SymlinkToVersion: "3.5.21"}, + {Version: "3.5.13", SymlinkToVersion: "3.5.21"}, + {Version: "3.5.17", SymlinkToVersion: "3.5.21"}, + {Version: "3.5.21", Image: "registry.k8s.io/etcd:3.5.21-0"}, } func etcdSupportedVersions() []etcdVersion { diff --git a/pkg/model/components/etcdmanager/tests/interval/tasks.yaml b/pkg/model/components/etcdmanager/tests/interval/tasks.yaml index d50014b5a88c5..4f5f343277fd7 100644 --- 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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -161,17 +161,18 @@ Contents: | - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -274,13 +275,13 @@ Contents: | - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -303,17 +304,18 @@ Contents: | - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml index 6ed2b74e43f6e..152fd8012000c 100644 --- 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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -160,17 +160,18 @@ Contents: | - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -272,13 +273,13 @@ Contents: | - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -301,17 +302,18 @@ Contents: | - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 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 index f36530c913c4e..b8f9eb2273def 100644 --- 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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -163,17 +163,18 @@ Contents: | - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -278,13 +279,13 @@ Contents: | - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -307,17 +308,18 @@ Contents: | - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml index ce238a76f5601..bd23fb89344d6 100644 --- 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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -169,17 +169,18 @@ Contents: | - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -290,13 +291,13 @@ Contents: | - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -319,17 +320,18 @@ Contents: | - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content index ba4fea0938523..0657c051e12cd 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/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.17 + version: 3.5.21 - 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.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index cda354126a797..9377e5e58736f 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/additionalobjects/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index eb1672ec4eef1..57715036fe685 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content index bb18aa0b27ed4..17cb6a32d649f 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content @@ -39,7 +39,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -48,7 +48,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 7fb45d33d8e07..929f5a75957e6 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -70,13 +70,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -99,17 +99,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 3ee39fb4b9dc2..a161209b29405 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -70,13 +70,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -99,17 +99,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content index 0c6ff5e8eeed9..1524d808982f8 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content @@ -43,7 +43,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -52,7 +52,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 280e084dc3afa..c286b447cd26b 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 5dc98b18fdac3..3524d67cadbd0 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content index 1a1324eaf10fb..50fb5ff3b7cdd 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content @@ -41,7 +41,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/bastionuserdata.example.com/backups/etcd/events etcdMembers: @@ -50,7 +50,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index c546e630d13cc..e7f555dcad04b 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 0d3234e3a64c9..77b6d9564d5ee 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content index 9cbb23c39c961..2d66e418bf57a 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content @@ -65,7 +65,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/cas-priority-expander-custom.example.com/backups/etcd/events etcdMembers: @@ -74,7 +74,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller keyStore: memfs://clusters.example.com/cas-priority-expander-custom.example.com/pki diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 4ce44d6a31746..5124a18f44c8e 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 0bc055a6d674a..f6bc002945967 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content index f07a9d3935515..8a91f090d81c5 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content @@ -58,7 +58,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/cas-priority-expander.example.com/backups/etcd/events etcdMembers: @@ -67,7 +67,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller keyStore: memfs://clusters.example.com/cas-priority-expander.example.com/pki diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index c9f033eca62d9..3fc4a204bf7af 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index fbd51d6619005..aada2dee10383 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content index 43591933cba2b..0ddfeaf5afa0c 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content @@ -61,7 +61,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/complex.example.com/backups/etcd/events etcdMembers: @@ -70,7 +70,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/complex/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/complex/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 5934f6b84974a..f5d1b246b59e5 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 00ba11659f31a..360b1cbd2a8f1 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content index cadf7b964f031..8f63b79525a53 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content @@ -39,7 +39,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/compress.example.com/backups/etcd/events etcdMembers: @@ -48,7 +48,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/compress/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/compress/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 13627bd53b93c..5defcf0e5ead8 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 11001297fba83..f5ab1f1ca53ac 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content index 1e45da03984ea..543bcc182080c 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content @@ -48,7 +48,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/containerd.example.com/backups/etcd/events etcdMembers: @@ -57,7 +57,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index ba3cf400056a1..ecf4a0b525405 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/containerd-custom/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 11c2bede98405..cf271a61b7bc3 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content index c6281590e1c55..9c34d648114d1 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content @@ -39,7 +39,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/containerd.example.com/backups/etcd/events etcdMembers: @@ -48,7 +48,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index ba3cf400056a1..ecf4a0b525405 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/containerd/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 11c2bede98405..cf271a61b7bc3 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content index 1b3714f471d94..91be8f2338ef7 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content @@ -39,7 +39,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/123.example.com/backups/etcd/events etcdMembers: @@ -48,7 +48,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/digit/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/digit/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6036e05d96ed6..fc6e1e66e187b 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index f6def1339b730..cd65006416a37 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content index d46516f520634..01d65b1bb5bbc 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content @@ -43,7 +43,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/existing-iam.example.com/backups/etcd/events etcdMembers: @@ -56,7 +56,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_etcd-cluster-spec-events_content index 9353816affed3..daf8535690787 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 3, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_etcd-cluster-spec-main_content index 9353816affed3..daf8535690787 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 3, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index eb004f309ce0a..b6e0c769cbda2 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content index eb004f309ce0a..b6e0c769cbda2 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content index eb004f309ce0a..b6e0c769cbda2 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index a0587dda62e2e..80e9f1e87e756 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content index a0587dda62e2e..80e9f1e87e756 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content index a0587dda62e2e..80e9f1e87e756 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content index 9051b369f22c7..cff21f4276d5c 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content @@ -46,7 +46,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/existingsg.example.com/backups/etcd/events etcdMembers: @@ -59,7 +59,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_etcd-cluster-spec-events_content index 9353816affed3..daf8535690787 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 3, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_etcd-cluster-spec-main_content index 9353816affed3..daf8535690787 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 3, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index e929558174697..93b571f7a5211 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_sg/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content index e929558174697..93b571f7a5211 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content index e929558174697..93b571f7a5211 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index afd3bad66da41..b9cd3582b84ae 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content index afd3bad66da41..b9cd3582b84ae 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content index afd3bad66da41..b9cd3582b84ae 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content index 742efe42dcab9..209e9ed31a01a 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content @@ -39,7 +39,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -48,7 +48,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: external-dns iam: diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 280e084dc3afa..c286b447cd26b 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 5dc98b18fdac3..3524d67cadbd0 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content index 0e72b9e62b963..6afa42b69fa6f 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content @@ -39,7 +39,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -48,7 +48,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: external-dns iam: diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 280e084dc3afa..c286b447cd26b 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 5dc98b18fdac3..3524d67cadbd0 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content index c29856ada266d..6481f8875a7a8 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content @@ -39,7 +39,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/externallb.example.com/backups/etcd/events etcdMembers: @@ -48,7 +48,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 8cff5216de19c..edf91b6c4ab29 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/externallb/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 71a8924a293df..f26d65504c673 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content index 51efe97dd6198..fef00bf9ad10d 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content @@ -47,7 +47,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/externalpolicies.example.com/backups/etcd/events etcdMembers: @@ -56,7 +56,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller externalPolicies: diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index c34b46ed46ab8..2157c1d069879 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/externalpolicies/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index c722cbfbd31bd..bbad24b7e312c 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content index bf2eb42c15171..eb38cf19d7e57 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content @@ -43,7 +43,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/ha.example.com/backups/etcd/events etcdMembers: @@ -56,7 +56,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/ha/data/aws_s3_object_etcd-cluster-spec-events_content index 9353816affed3..daf8535690787 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 3, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/ha/data/aws_s3_object_etcd-cluster-spec-main_content index 9353816affed3..daf8535690787 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 3, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index e1f7faca7e528..94b1359943006 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content index e1f7faca7e528..94b1359943006 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content index e1f7faca7e528..94b1359943006 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 297a3e78d96fb..04502a46ef9f3 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content index 297a3e78d96fb..04502a46ef9f3 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content index 297a3e78d96fb..04502a46ef9f3 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content index b3a1b4888f9ee..e7446670f6238 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content @@ -50,7 +50,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/ha-gce.example.com/backups/etcd/events cpuRequest: 100m @@ -65,7 +65,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_etcd-cluster-spec-events_content index 9353816affed3..daf8535690787 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 3, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_etcd-cluster-spec-main_content index 9353816affed3..daf8535690787 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 3, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content index 6ca9b9d7fefd6..4cdd71d388306 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-b_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-b_content index 6ca9b9d7fefd6..4cdd71d388306 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-b_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-b_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-c_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-c_content index 6ca9b9d7fefd6..4cdd71d388306 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-c_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-c_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content index 430336d35e76b..864fb6fd17829 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-b_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-b_content index 430336d35e76b..864fb6fd17829 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-b_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-b_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-c_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-c_content index 430336d35e76b..864fb6fd17829 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-c_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-c_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content index 27a1b005f5831..b2bdfb9080a40 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content @@ -41,7 +41,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -50,7 +50,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 280e084dc3afa..c286b447cd26b 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 5dc98b18fdac3..3524d67cadbd0 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content index 1cc2e1cd66514..ba4e7b051fcc0 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content @@ -39,7 +39,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -48,7 +48,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 280e084dc3afa..c286b447cd26b 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 5dc98b18fdac3..3524d67cadbd0 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content index f1440cb4fe0e2..33c1b5694edd0 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content @@ -61,7 +61,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -70,7 +70,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 280e084dc3afa..c286b447cd26b 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 5dc98b18fdac3..3524d67cadbd0 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content index f15869633182d..9039dcda66f24 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content @@ -62,7 +62,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -71,7 +71,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 280e084dc3afa..c286b447cd26b 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 5dc98b18fdac3..3524d67cadbd0 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content index d5854bd96df68..41e4f88dba507 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content @@ -64,7 +64,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/minimal.example.com/backups/etcd/events cpuRequest: 100m @@ -75,7 +75,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content index e8fbafbe0741b..9f0f701dc0946 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content index 89a5410dbd7ae..983269e314990 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content index 26ead7bc22bee..ecd6135d20e5c 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content @@ -64,7 +64,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/many-addons.example.com/backups/etcd/events etcdMembers: @@ -73,7 +73,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 7c4fc4818fa7b..4bebbb1c11799 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 7f43f4c38579d..35bd26c165914 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content index cae5774b102a7..8a30e41512626 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content @@ -42,7 +42,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/minimal.example.com/backups/etcd/events cpuRequest: 100m @@ -54,7 +54,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index e660369b2bf25..862e2dd94a1ee 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 610ed2561ee46..7f979dcfb19b4 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_cluster-completed.spec_content index 99c2a0e0da618..d7649adb959ad 100644 --- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_cluster-completed.spec_content @@ -42,7 +42,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/minimal.example.com/backups/etcd/events cpuRequest: 100m @@ -54,7 +54,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index e660369b2bf25..862e2dd94a1ee 100644 --- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 610ed2561ee46..7f979dcfb19b4 100644 --- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_cluster-completed.spec_content index 2776d07b01608..ca5997a618508 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_cluster-completed.spec_content @@ -42,7 +42,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/minimal.example.com/backups/etcd/events cpuRequest: 100m @@ -54,7 +54,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index e660369b2bf25..862e2dd94a1ee 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 610ed2561ee46..7f979dcfb19b4 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_cluster-completed.spec_content index 84c4aaefff2f6..e12b899274ad1 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_cluster-completed.spec_content @@ -42,7 +42,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/minimal.example.com/backups/etcd/events cpuRequest: 100m @@ -54,7 +54,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index e660369b2bf25..862e2dd94a1ee 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 610ed2561ee46..7f979dcfb19b4 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_cluster-completed.spec_content index fb2d3571c9930..14615c2e1a65f 100644 --- a/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_cluster-completed.spec_content @@ -42,7 +42,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/minimal.example.com/backups/etcd/events cpuRequest: 100m @@ -54,7 +54,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index e660369b2bf25..862e2dd94a1ee 100644 --- a/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 610ed2561ee46..7f979dcfb19b4 100644 --- a/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_cluster-completed.spec_content index 660d49d5cb35e..422ba2de3e09a 100644 --- a/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_cluster-completed.spec_content @@ -42,7 +42,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/minimal.example.com/backups/etcd/events cpuRequest: 100m @@ -54,7 +54,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index e660369b2bf25..862e2dd94a1ee 100644 --- a/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 610ed2561ee46..7f979dcfb19b4 100644 --- a/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_cluster-completed.spec_content index 96c25f757b8fd..5368c5166438a 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_cluster-completed.spec_content @@ -39,7 +39,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal-aws.example.com/backups/etcd/events etcdMembers: @@ -48,7 +48,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller keyStore: memfs://clusters.example.com/minimal-aws.example.com/pki diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index d699194a03c33..62c0ef4025c0d 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-aws/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index f46b34cba804a..cf90a789317c8 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content index ad175775cfea6..e53135ade28e2 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content @@ -43,7 +43,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/minimal.example.com/backups/etcd/events cpuRequest: 100m @@ -55,7 +55,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.17 + version: 3.5.21 iam: allowContainerRegistry: true legacy: false diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index e660369b2bf25..862e2dd94a1ee 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 610ed2561ee46..7f979dcfb19b4 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content index 0bfe11e3a5ffc..0075492716d78 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content @@ -42,7 +42,7 @@ spec: image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc logLevel: 10 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal-etcd.example.com/backups/etcd/events etcdMembers: @@ -56,7 +56,7 @@ spec: value: 1d image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index ff42ec4ac3da0..9780d62886039 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -70,13 +70,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -99,17 +99,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index d880db18483e4..f81a42de77573 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content index beaa0ee04f3d1..7a6ce56b5cf35 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content @@ -43,7 +43,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -54,7 +54,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 280e084dc3afa..c286b447cd26b 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 5dc98b18fdac3..3524d67cadbd0 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content index 2a5ea8c677a72..19d8c5cd25ec5 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content @@ -43,7 +43,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal-ipv6.example.com/backups/etcd/events etcdMembers: @@ -52,7 +52,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 2051d9e7cf5f9..b686233fbb2fb 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index ad4cf15aa57a1..12d094aab38be 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content index 70b17dc3ea2b5..73865e7bd7334 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content @@ -43,7 +43,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal-ipv6.example.com/backups/etcd/events etcdMembers: @@ -52,7 +52,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 2051d9e7cf5f9..b686233fbb2fb 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index ad4cf15aa57a1..12d094aab38be 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_cluster-completed.spec_content index f746420c6f540..caee56bc36f93 100644 --- a/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_cluster-completed.spec_content @@ -43,7 +43,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal-ipv6.example.com/backups/etcd/events etcdMembers: @@ -52,7 +52,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 2051d9e7cf5f9..b686233fbb2fb 100644 --- a/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-kindnet/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index ad4cf15aa57a1..12d094aab38be 100644 --- a/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content index d3f4197d77b4a..b55b0e3a196ba 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content @@ -43,7 +43,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal-ipv6.example.com/backups/etcd/events etcdMembers: @@ -52,7 +52,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 2051d9e7cf5f9..b686233fbb2fb 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index ad4cf15aa57a1..12d094aab38be 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content index 7bb4d43aa93f8..fe4695fc17123 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content @@ -43,7 +43,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal-ipv6.example.com/backups/etcd/events etcdMembers: @@ -52,7 +52,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 2051d9e7cf5f9..b686233fbb2fb 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index ad4cf15aa57a1..12d094aab38be 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content index 3eb4270171707..191c7c06d1cb1 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -39,7 +39,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/backups/etcd/events etcdMembers: @@ -48,7 +48,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller keyStore: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/pki diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6c4131daa9859..19c81acab27b4 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-longclustername/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 1cd04f7888844..d9b77fca4f0da 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content index 2331bdd7ed85d..096feeb19e702 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content @@ -39,7 +39,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal-warmpool.example.com/backups/etcd/events etcdMembers: @@ -48,7 +48,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index d60e6ce948c8b..a54e738822439 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-warmpool/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index a132e8e17daf1..b1f932ba9df4a 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content index 133876bd79ba9..d420a66807ccd 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content @@ -46,7 +46,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/minimal-gce.example.com/backups/etcd/events cpuRequest: 100m @@ -57,7 +57,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content index f97ec9963bba6..dacc2763955e0 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content index 7cd02aa10f78e..20bff19f74863 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content index c4f838210dc5d..cafa9dc9d9dc6 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content @@ -48,7 +48,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/minimal-gce.example.com/backups/etcd/events cpuRequest: 100m @@ -59,7 +59,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.17 + version: 3.5.21 iam: legacy: false keyStore: memfs://tests/minimal-gce.example.com/pki diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content index f97ec9963bba6..dacc2763955e0 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content index 7cd02aa10f78e..20bff19f74863 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content index 713486dec534c..9b965783dd0c6 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content @@ -50,7 +50,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/minimal-gce-ilb.example.com/backups/etcd/events cpuRequest: 100m @@ -61,7 +61,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content index b7cfd9e80df05..a4ec67b3bc288 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content index d23f9434877e7..224a1933a537b 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content index c75d3e8d8a520..2913223d364b0 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -50,7 +50,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com/backups/etcd/events cpuRequest: 100m @@ -61,7 +61,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content index a398dd7105501..419efc55caed5 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content index 49eb7a6029779..d9d8fb1311b0e 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content index 23b14b38e3e38..751ff46ae3c9e 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -47,7 +47,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com/backups/etcd/events cpuRequest: 100m @@ -58,7 +58,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content index a398dd7105501..419efc55caed5 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content index 49eb7a6029779..d9d8fb1311b0e 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content index 877ba8ee1a8af..712c4b6da32cb 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content @@ -50,7 +50,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/minimal-gce-plb.example.com/backups/etcd/events cpuRequest: 100m @@ -61,7 +61,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content index 4e91f0f19de32..b3395a8fcb1a2 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content index 093c200bae997..002d1bdfbdbe3 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content index 8176391b0bb9e..4f37e5aab2f27 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content @@ -46,7 +46,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/minimal-gce-private.example.com/backups/etcd/events cpuRequest: 100m @@ -57,7 +57,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content index 50c6643656ccf..cb158f87ce6e9 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-events-master-us-test1-a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content index 22a52c7a52c59..798ed76a42825 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_manifests-etcdmanager-main-master-us-test1-a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content index f09d47760c963..1fa1f6cab6bb4 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content @@ -38,7 +38,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal.k8s.local/backups/etcd/events etcdMembers: @@ -47,7 +47,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index d4f7963ab674b..4605e26ed194d 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index ffefca31df0d9..79db0c5b08e5b 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content index 25a925a65df0b..811b6328c27fa 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content @@ -38,7 +38,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal.k8s.local/backups/etcd/events etcdMembers: @@ -47,7 +47,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index d4f7963ab674b..4605e26ed194d 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index ffefca31df0d9..79db0c5b08e5b 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content index 202354d8a6fe0..0423e5f47cded 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content @@ -40,7 +40,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/minimal.example.com/backups/etcd/events cpuRequest: 100m @@ -51,7 +51,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.17 + version: 3.5.21 iam: allowContainerRegistry: true legacy: false diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-events-master-fsn1_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-events-master-fsn1_content index b9f14f6114030..ef7a81b47bd86 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-events-master-fsn1_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-events-master-fsn1_content @@ -69,13 +69,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -98,17 +98,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-main-master-fsn1_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-main-master-fsn1_content index b912333a4f628..478d6b0251369 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-main-master-fsn1_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_manifests-etcdmanager-main-master-fsn1_content @@ -69,13 +69,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -98,17 +98,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content index 4e5ce75fb57c5..99572eb80fd41 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_cluster-completed.spec_content @@ -31,7 +31,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://tests/scw-minimal.k8s.local/backups/etcd/events cpuRequest: 100m @@ -42,7 +42,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-events-control-plane-fr-par-1_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-events-control-plane-fr-par-1_content index 8208ca04c1c75..1e715e299aadc 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-events-control-plane-fr-par-1_content +++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-events-control-plane-fr-par-1_content @@ -71,13 +71,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -100,17 +100,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-main-control-plane-fr-par-1_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-main-control-plane-fr-par-1_content index 52d256912969c..531fac24d8c7f 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-main-control-plane-fr-par-1_content +++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-main-control-plane-fr-par-1_content @@ -71,13 +71,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -100,17 +100,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content index 9599781c65b7d..dc8b6aacbfdc0 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content @@ -43,7 +43,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/mixedinstances.example.com/backups/etcd/events etcdMembers: @@ -56,7 +56,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_etcd-cluster-spec-events_content index 9353816affed3..daf8535690787 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 3, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_etcd-cluster-spec-main_content index 9353816affed3..daf8535690787 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 3, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index d719f0d8b06a0..f9e42df607211 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content index d719f0d8b06a0..f9e42df607211 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content index d719f0d8b06a0..f9e42df607211 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index badb07a9f4c47..32a2e410f564b 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content index badb07a9f4c47..32a2e410f564b 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content index badb07a9f4c47..32a2e410f564b 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content index 9599781c65b7d..dc8b6aacbfdc0 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content @@ -43,7 +43,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/mixedinstances.example.com/backups/etcd/events etcdMembers: @@ -56,7 +56,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_etcd-cluster-spec-events_content index 9353816affed3..daf8535690787 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 3, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_etcd-cluster-spec-main_content index 9353816affed3..daf8535690787 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 3, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index d719f0d8b06a0..f9e42df607211 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances_spot/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content index d719f0d8b06a0..f9e42df607211 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content index d719f0d8b06a0..f9e42df607211 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index badb07a9f4c47..32a2e410f564b 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content index badb07a9f4c47..32a2e410f564b 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content index badb07a9f4c47..32a2e410f564b 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content index 8355a75e38709..a929defbe4629 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content @@ -39,7 +39,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com/backups/etcd/events etcdMembers: @@ -48,7 +48,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 2198553fe57a0..d5f4b1af6c8c2 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 3f0f36a1c10cb..ba81521a9ab32 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content index 1e9a4394da36d..d3faf5b0162da 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content @@ -39,7 +39,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com/backups/etcd/events etcdMembers: @@ -48,7 +48,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 2198553fe57a0..d5f4b1af6c8c2 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/nth-imds-processor/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 3f0f36a1c10cb..ba81521a9ab32 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content index 97693cf4dd60f..c72fb4b36ee11 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content @@ -42,7 +42,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -51,7 +51,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 280e084dc3afa..c286b447cd26b 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 5dc98b18fdac3..3524d67cadbd0 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content index c82802c3baa2d..18da06c411e82 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content @@ -41,7 +41,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/private-shared-ip.example.com/backups/etcd/events etcdMembers: @@ -50,7 +50,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 0164cbd3c5241..c3df3ba60405f 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-ip/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 682a8253ce222..19871b27d6f07 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content index 85195b4332c98..aa63dfaa1dfb5 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content @@ -41,7 +41,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/private-shared-subnet.example.com/backups/etcd/events etcdMembers: @@ -50,7 +50,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 7421af7023207..8b0a4008e3250 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-subnet/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 8a7e466a4844e..fb65fab39246b 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content index 4f2d0f0bbf1a8..e1bf4dfd8b9ea 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content @@ -41,7 +41,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/privatecalico.example.com/backups/etcd/events etcdMembers: @@ -50,7 +50,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 921a670ae71f5..59caac7ecfdf1 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecalico/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 99cccef491d5f..efca890078ad5 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content index 762893986d1b1..7962149c4b805 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content @@ -41,7 +41,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/privatecanal.example.com/backups/etcd/events etcdMembers: @@ -50,7 +50,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 82190e45900b6..285d60312e9e5 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecanal/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 3380d2d44e5db..862b450d745b1 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content index 6722b8ff1da3e..adc0fa350f35d 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content @@ -41,7 +41,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/privatecilium.example.com/backups/etcd/events etcdMembers: @@ -50,7 +50,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 3a222c83d6c10..a60a4e8ce1410 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium-eni/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index adbc466bf0233..d97cce0307967 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content index 04f100f260a21..3a44ef1bd3d57 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content @@ -41,7 +41,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/privatecilium.example.com/backups/etcd/events etcdMembers: @@ -50,7 +50,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 3a222c83d6c10..a60a4e8ce1410 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index adbc466bf0233..d97cce0307967 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content index a39df05350ee1..8a8bb216398c2 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content @@ -43,7 +43,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/privatecilium.example.com/backups/etcd/events etcdMembers: @@ -52,7 +52,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 3a222c83d6c10..a60a4e8ce1410 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium2/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index adbc466bf0233..d97cce0307967 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content index 346012b7126cc..6a1e40f560b94 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content @@ -41,7 +41,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/privateciliumadvanced.example.com/backups/etcd/events etcdMembers: @@ -50,7 +50,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/privateciliumadvanced.example.com/backups/etcd/cilium etcdMembers: @@ -59,7 +59,7 @@ spec: manager: backupRetentionDays: 90 name: cilium - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_etcd-cluster-spec-cilium_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_etcd-cluster-spec-cilium_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_etcd-cluster-spec-cilium_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_etcd-cluster-spec-cilium_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-cilium-master-us-test-1a_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-cilium-master-us-test-1a_content index 0c5983dab79b0..488d2f4900f1d 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-cilium-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-cilium-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 75959535c84ff..fa9dd5790f4d8 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateciliumadvanced/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index b57782a25a2d3..a8644469dbf59 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content index 63df3a0ba3200..8e5e7ab0f77a0 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content @@ -44,7 +44,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/privatedns1.example.com/backups/etcd/events etcdMembers: @@ -53,7 +53,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 31a4c8b3398bf..d17b70ec9ed75 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns1/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 2654817320ec2..26b72ce6faae9 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content index 12993f30030c4..df2d45e9da1d6 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content @@ -41,7 +41,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/privatedns2.example.com/backups/etcd/events etcdMembers: @@ -50,7 +50,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index f5db2a999e96a..7505c016b1ff9 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns2/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index a2c3b2801dbd6..2dc29ee1925be 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content index 719e183358c95..658ce5cd68fef 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content @@ -41,7 +41,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/privateflannel.example.com/backups/etcd/events etcdMembers: @@ -50,7 +50,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index c45bc85cce150..dd89da34c85d1 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateflannel/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index c4017778a6a47..7168e8a9ca00e 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_cluster-completed.spec_content index d83c1046bb6fa..db49020d19dbe 100644 --- a/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_cluster-completed.spec_content @@ -41,7 +41,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/privatekindnet.example.com/backups/etcd/events etcdMembers: @@ -50,7 +50,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index ddab88baf637d..5d54e4aed2277 100644 --- a/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatekindnet/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 912ef05b352c1..22675eb20c444 100644 --- a/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content index 02bf27b45d039..57528bd16c166 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content @@ -41,7 +41,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/privatekopeio.example.com/backups/etcd/events etcdMembers: @@ -50,7 +50,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 32b5276525ca4..a60ec5551a002 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatekopeio/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 4c486437c0f18..8726fa673f335 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content index 63d3fe38b22a1..5890e8ded4b19 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content @@ -39,7 +39,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -48,7 +48,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 280e084dc3afa..c286b447cd26b 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 5dc98b18fdac3..3524d67cadbd0 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content index bb97232965c6a..810669c33212c 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content @@ -39,7 +39,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/sharedsubnet.example.com/backups/etcd/events etcdMembers: @@ -48,7 +48,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 0478eb75dabfa..7034b0bc5a4e3 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_subnet/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index b078f6fbcf4cc..71afb30a34309 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content index 2cd68fede11d0..5e17f99ade594 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content @@ -39,7 +39,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/sharedvpc.example.com/backups/etcd/events etcdMembers: @@ -48,7 +48,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 6c2ec2cd87a4e..0f5361d3928be 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index c62c40e030ccb..49778265a35c7 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content index 4f7f8763f9fd5..ba50411927f24 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content @@ -43,7 +43,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal-ipv6.example.com/backups/etcd/events etcdMembers: @@ -52,7 +52,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 2051d9e7cf5f9..b686233fbb2fb 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/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.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index ad4cf15aa57a1..12d094aab38be 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -68,13 +68,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content index edde776c518c9..08ee1ec8d8e57 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content @@ -41,7 +41,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/unmanaged.example.com/backups/etcd/events etcdMembers: @@ -50,7 +50,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index da7bc45a3ba2c..79b2209b52f24 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 6080fee4a6e53..ba0a32c684a7f 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content index 54c1db34e6319..20891f0ab967e 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content @@ -39,7 +39,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.17 + version: 3.5.21 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -48,7 +48,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.17 + version: 3.5.21 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_etcd-cluster-spec-events_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_etcd-cluster-spec-main_content index 432cd0d5554c5..4e70b7f195043 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.17" + "etcdVersion": "3.5.21" } diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 280e084dc3afa..c286b447cd26b 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 5dc98b18fdac3..3524d67cadbd0 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.17 + - --target-dir=/opt/etcd-v3.5.21 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.17-0 - name: init-etcd-3-5-17 + image: registry.k8s.io/etcd:3.5.21-0 + name: init-etcd-3-5-21 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --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.17 - --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.17/etcd - - --src=/opt/etcd-v3.5.17/etcdctl + - --src=/opt/etcd-v3.5.21/etcd + - --src=/opt/etcd-v3.5.21/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.32.0-beta.1 - name: init-etcd-symlinks-3-5-17 + name: init-etcd-symlinks-3-5-21 resources: {} volumeMounts: - mountPath: /opt