diff --git a/pkg/model/components/etcd.go b/pkg/model/components/etcd.go index ddd297c8e925f..254c6c9c8aeaf 100644 --- a/pkg/model/components/etcd.go +++ b/pkg/model/components/etcd.go @@ -29,7 +29,7 @@ type EtcdOptionsBuilder struct { var _ loader.OptionsBuilder = &EtcdOptionsBuilder{} const ( - DefaultEtcd3Version_1_22 = "3.5.9" + DefaultEtcd3Version_1_22 = "3.5.13" ) // BuildOptions is responsible for filling in the defaults for the etcd cluster model diff --git a/pkg/model/components/etcdmanager/options.go b/pkg/model/components/etcdmanager/options.go index c47564886542a..1b6b4039faaff 100644 --- a/pkg/model/components/etcdmanager/options.go +++ b/pkg/model/components/etcdmanager/options.go @@ -79,13 +79,14 @@ type etcdVersion struct { var etcdSupportedImages = []etcdVersion{ {Version: "3.4.3", SymlinkToVersion: "3.4.13"}, {Version: "3.4.13", Image: "registry.k8s.io/etcd:3.4.13-0"}, - {Version: "3.5.0", SymlinkToVersion: "3.5.9"}, - {Version: "3.5.1", SymlinkToVersion: "3.5.9"}, - {Version: "3.5.3", SymlinkToVersion: "3.5.9"}, - {Version: "3.5.4", SymlinkToVersion: "3.5.9"}, - {Version: "3.5.6", SymlinkToVersion: "3.5.9"}, - {Version: "3.5.7", SymlinkToVersion: "3.5.9"}, - {Version: "3.5.9", Image: "registry.k8s.io/etcd:3.5.9-0"}, + {Version: "3.5.0", SymlinkToVersion: "3.5.13"}, + {Version: "3.5.1", SymlinkToVersion: "3.5.13"}, + {Version: "3.5.3", SymlinkToVersion: "3.5.13"}, + {Version: "3.5.4", SymlinkToVersion: "3.5.13"}, + {Version: "3.5.6", SymlinkToVersion: "3.5.13"}, + {Version: "3.5.7", SymlinkToVersion: "3.5.13"}, + {Version: "3.5.9", SymlinkToVersion: "3.5.13"}, + {Version: "3.5.13", Image: "registry.k8s.io/etcd:3.5.13-0"}, } func etcdSupportedVersions() []etcdVersion { diff --git a/pkg/model/components/etcdmanager/tests/interval/tasks.yaml b/pkg/model/components/etcdmanager/tests/interval/tasks.yaml index 8dee19a78c937..b009084060b6e 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -164,12 +164,13 @@ Contents: | - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -272,13 +273,13 @@ Contents: | - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -304,12 +305,13 @@ Contents: | - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt diff --git a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml index d2c1f7d93557a..0bae8f736d024 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -163,12 +163,13 @@ Contents: | - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -270,13 +271,13 @@ Contents: | - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -302,12 +303,13 @@ Contents: | - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt diff --git a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml index c3573cb7b6b40..74684f3e692f4 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -166,12 +166,13 @@ Contents: | - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -276,13 +277,13 @@ Contents: | - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -308,12 +309,13 @@ Contents: | - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt diff --git a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml index bd66b4f93af92..c4ab5808f966a 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -172,12 +172,13 @@ Contents: | - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -288,13 +289,13 @@ Contents: | - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -320,12 +321,13 @@ Contents: | - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 58e9c7768bb34..33d8650995984 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.9 + version: 3.5.13 - backups: backupStore: memfs://tests/additionalobjects.example.com/backups/etcd/events cpuRequest: 100m @@ -54,7 +54,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.9 + version: 3.5.13 externalDns: provider: dns-controller iam: diff --git a/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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3347987941180..852abb92553e4 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 1f09e3258cd05..44f018cb48724 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 0e8a6d939490b..bd9b3e36d0620 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 619b52247586a..20e23d845fa36 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -102,12 +102,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 a5070de8de2e1..3e1ca4e586103 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -102,12 +102,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 262a7f107793c..7236886b58185 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 f235878644e14..6d716ed9ac47f 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 dde0314e54cb4..ce52df218a5a8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 6738866a76b30..5074127ad4d39 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3b9fdf7ff9738..b2f918a3992b8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 5e763297aa082..4236ed5f445b5 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 e8d7769c6b20a..01a183e276d8c 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 @@ -64,7 +64,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.9 + version: 3.5.13 - backups: backupStore: memfs://clusters.example.com/cas-priority-expander-custom.example.com/backups/etcd/events etcdMembers: @@ -73,7 +73,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 b3bc97b0afc0b..a154cfce46d8d 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 a296a6e718a70..d883ce45f6c58 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 6425d9920b801..4af18e515bae0 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 @@ -57,7 +57,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.9 + version: 3.5.13 - backups: backupStore: memfs://clusters.example.com/cas-priority-expander.example.com/backups/etcd/events etcdMembers: @@ -66,7 +66,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 da1da98c62231..8987532b965af 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 9cf2464b724fb..87e04ee139b24 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 26f8b1fa79112..dcc2a4bd3d3f0 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 @@ -62,7 +62,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.9 + version: 3.5.13 - backups: backupStore: memfs://clusters.example.com/complex.example.com/backups/etcd/events etcdMembers: @@ -71,7 +71,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 dea074021f056..5db4d5f918a13 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 5b1d1c5fd9f6b..0877fef004c09 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 04066128ed839..f38a71b433b9f 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 94b474befe300..0f5108de259d4 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 28b3a452e9436..412cc22608b00 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 67b3bd717d064..b8d22d3e56f17 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 b64b6b5ea2500..11c1671fce8db 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 0cf8fa98050a3..01525780eed19 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 b826a75cfdc8d..259215a829ba9 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 b64b6b5ea2500..11c1671fce8db 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 0cf8fa98050a3..01525780eed19 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 9289971376b7a..07bcaf75040ff 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 8ad8658e0dafd..69169c27a9834 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 f7cb500f92544..d2b45777e52d4 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 57b996010275f..fe60f44412390 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 d880dbd4a4bbd..bc6b401bb72d6 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.9" + "etcdVersion": "3.5.13" } 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 d880dbd4a4bbd..bc6b401bb72d6 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.9" + "etcdVersion": "3.5.13" } 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 8eb6b96d59aac..6a7ee030ae2be 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 8eb6b96d59aac..6a7ee030ae2be 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 8eb6b96d59aac..6a7ee030ae2be 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 df7f477d80f57..62e85023161d9 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 df7f477d80f57..62e85023161d9 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 df7f477d80f57..62e85023161d9 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 c7f9bf175f3d7..e7f18a5668a31 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 d880dbd4a4bbd..bc6b401bb72d6 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.9" + "etcdVersion": "3.5.13" } 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 d880dbd4a4bbd..bc6b401bb72d6 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.9" + "etcdVersion": "3.5.13" } 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 a31d4abb2f801..03931e8fa3dc4 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 a31d4abb2f801..03931e8fa3dc4 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 a31d4abb2f801..03931e8fa3dc4 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 ebbbee2dff07a..c2b481ade1991 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 ebbbee2dff07a..c2b481ade1991 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 ebbbee2dff07a..c2b481ade1991 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 f6207ec946af0..28c38e5477807 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 f235878644e14..6d716ed9ac47f 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 dde0314e54cb4..ce52df218a5a8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 768f5e56aa972..0c044fd06f59b 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 f235878644e14..6d716ed9ac47f 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 dde0314e54cb4..ce52df218a5a8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 eb35c70d6fa6d..057362a8cf2b5 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3ec0196aef90b..aa51d30a3f312 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 b69634ecf240c..e28b41cec6ace 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 6bb2223bbbb6c..25714e0d9b17f 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 613eca1e6a9f3..443a0f8811721 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 b582d2a3b7ecc..de770b20fc96d 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 c15acda1c8368..905127668ebc5 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.9 + version: 3.5.13 - backups: backupStore: memfs://tests/ha.example.com/backups/etcd/events etcdMembers: @@ -56,7 +56,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.9 + version: 3.5.13 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 d880dbd4a4bbd..bc6b401bb72d6 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.9" + "etcdVersion": "3.5.13" } 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 d880dbd4a4bbd..bc6b401bb72d6 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.9" + "etcdVersion": "3.5.13" } 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 80c83d074dd8d..849aef5264b92 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 80c83d074dd8d..849aef5264b92 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 80c83d074dd8d..849aef5264b92 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 a452e273691e0..d49cd1f0574b2 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 a452e273691e0..d49cd1f0574b2 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 a452e273691e0..d49cd1f0574b2 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 73de1fa7ca155..a327a71c0e050 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 @@ -49,7 +49,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.9 + version: 3.5.13 - backups: backupStore: memfs://tests/ha-gce.example.com/backups/etcd/events cpuRequest: 100m @@ -64,7 +64,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.9 + version: 3.5.13 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 d880dbd4a4bbd..bc6b401bb72d6 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.9" + "etcdVersion": "3.5.13" } 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 d880dbd4a4bbd..bc6b401bb72d6 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.9" + "etcdVersion": "3.5.13" } 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 819f7d9a510b2..8dea4e3c7ed1a 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 819f7d9a510b2..8dea4e3c7ed1a 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 819f7d9a510b2..8dea4e3c7ed1a 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 fb889732790c1..9f9a0df275df6 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 fb889732790c1..9f9a0df275df6 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 fb889732790c1..9f9a0df275df6 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 bb13e90fe1b87..f9f715e6c3ca2 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 f235878644e14..6d716ed9ac47f 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 dde0314e54cb4..ce52df218a5a8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 a399db1ab6b26..c6742b4061659 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 f235878644e14..6d716ed9ac47f 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 dde0314e54cb4..ce52df218a5a8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 e0d5380c4b1bf..53cab56012fd9 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 @@ -60,7 +60,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.9 + version: 3.5.13 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -69,7 +69,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 f235878644e14..6d716ed9ac47f 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 dde0314e54cb4..ce52df218a5a8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content index 89390fdbe1dc1..35a45bd9ce64d 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content @@ -61,7 +61,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.9 + version: 3.5.13 - 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.9 + version: 3.5.13 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_etcd-cluster-spec-events_content index 3bde2f95b6324..5a36c3ebf46dc 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.9" + "etcdVersion": "3.5.13" } diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_etcd-cluster-spec-main_content index 3bde2f95b6324..5a36c3ebf46dc 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.9" + "etcdVersion": "3.5.13" } diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index f235878644e14..6d716ed9ac47f 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index dde0314e54cb4..ce52df218a5a8 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content index cd5fcae8d8624..fdee397870c4a 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content @@ -60,7 +60,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.9 + version: 3.5.13 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -69,7 +69,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.9 + version: 3.5.13 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_etcd-cluster-spec-events_content index 3bde2f95b6324..5a36c3ebf46dc 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.9" + "etcdVersion": "3.5.13" } diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_etcd-cluster-spec-main_content index 3bde2f95b6324..5a36c3ebf46dc 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.9" + "etcdVersion": "3.5.13" } diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index f235878644e14..6d716ed9ac47f 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index dde0314e54cb4..ce52df218a5a8 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content index ef210a7cc7cfe..21378def3b3dc 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content @@ -60,7 +60,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.9 + version: 3.5.13 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -69,7 +69,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.9 + version: 3.5.13 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_etcd-cluster-spec-events_content index 3bde2f95b6324..5a36c3ebf46dc 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.9" + "etcdVersion": "3.5.13" } diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_etcd-cluster-spec-main_content index 3bde2f95b6324..5a36c3ebf46dc 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.9" + "etcdVersion": "3.5.13" } diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index f235878644e14..6d716ed9ac47f 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index dde0314e54cb4..ce52df218a5a8 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 1743d91020619..95e4dd588cbb0 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 @@ -61,7 +61,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 f235878644e14..6d716ed9ac47f 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 dde0314e54cb4..ce52df218a5a8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 d89b8ecf7d8fb..f7616b9a6605c 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 @@ -63,7 +63,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.9 + version: 3.5.13 - backups: backupStore: memfs://tests/minimal.example.com/backups/etcd/events cpuRequest: 100m @@ -74,7 +74,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 c9b4db63080ea..38d99acafaba8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 c823bb4ec0a50..807836cc807b0 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 5d2664dfcd422..46b71d5d89d06 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 @@ -63,7 +63,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.9 + version: 3.5.13 - backups: backupStore: memfs://tests/many-addons.example.com/backups/etcd/events etcdMembers: @@ -72,7 +72,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 843b8b80084ee..8d90f29bc5205 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 14b6a05d665f6..c8780ec866421 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content index 35b5bcb549b80..f37df5359f97e 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content @@ -43,7 +43,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.9 + version: 3.5.13 - 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.9 + version: 3.5.13 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_etcd-cluster-spec-events_content index 3bde2f95b6324..5a36c3ebf46dc 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.9" + "etcdVersion": "3.5.13" } diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_etcd-cluster-spec-main_content index 3bde2f95b6324..5a36c3ebf46dc 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.9" + "etcdVersion": "3.5.13" } diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 41407838f6c2b..ef6f90d8bdcb0 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.24/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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 45c8144c636c6..9eccfbbaaef53 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.24/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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content index 4626a01324126..161ed14a4bba3 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content @@ -42,7 +42,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.9 + version: 3.5.13 - backups: backupStore: memfs://tests/minimal.example.com/backups/etcd/events cpuRequest: 100m @@ -54,7 +54,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.9 + version: 3.5.13 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_etcd-cluster-spec-events_content index 3bde2f95b6324..5a36c3ebf46dc 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.9" + "etcdVersion": "3.5.13" } diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_etcd-cluster-spec-main_content index 3bde2f95b6324..5a36c3ebf46dc 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.9" + "etcdVersion": "3.5.13" } diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 41407838f6c2b..ef6f90d8bdcb0 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.25/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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 45c8144c636c6..9eccfbbaaef53 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.25/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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content index c3fd9df3081ad..47921ac3f9617 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content @@ -42,7 +42,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.9 + version: 3.5.13 - backups: backupStore: memfs://tests/minimal.example.com/backups/etcd/events cpuRequest: 100m @@ -54,7 +54,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.9 + version: 3.5.13 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_etcd-cluster-spec-events_content index 3bde2f95b6324..5a36c3ebf46dc 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.9" + "etcdVersion": "3.5.13" } diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_etcd-cluster-spec-main_content index 3bde2f95b6324..5a36c3ebf46dc 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.9" + "etcdVersion": "3.5.13" } diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 41407838f6c2b..ef6f90d8bdcb0 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.26/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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 45c8144c636c6..9eccfbbaaef53 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.26/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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 911f77d43bdd3..e411f130c7e66 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 41407838f6c2b..ef6f90d8bdcb0 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 45c8144c636c6..9eccfbbaaef53 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 bcde30839cf09..5d37af8c10d21 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 41407838f6c2b..ef6f90d8bdcb0 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 45c8144c636c6..9eccfbbaaef53 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 017fe141f919d..0de38e17bb224 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 41407838f6c2b..ef6f90d8bdcb0 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 45c8144c636c6..9eccfbbaaef53 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 5fe505c3a1109..2cceea4937677 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 4a8664ceda0e3..89b30d20c6202 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 d60f048a2cb4a..3b7e77da84b55 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 f505ab0a30971..42bc71a1d824b 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 41407838f6c2b..ef6f90d8bdcb0 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 45c8144c636c6..9eccfbbaaef53 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 8938d3201bf96..944639ef3e23d 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 6283baaddcde6..fd53b1cf22fd9 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -102,12 +102,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 fcbc7ed655102..8c974fe6eb901 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 2eea8ffe13fc0..d50e170b5d0ae 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 f235878644e14..6d716ed9ac47f 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 dde0314e54cb4..ce52df218a5a8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 9fc45eeab5b97..ee4a3fc5bea32 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 b6f0133fef800..64f45fd0d61d8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 c77054a2ca3d0..0fcee40e5e9ac 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 983c2de42dce3..a2181f31ecd7f 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 b6f0133fef800..64f45fd0d61d8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 c77054a2ca3d0..0fcee40e5e9ac 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 4c9dec17266f8..f96df053d6ddc 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 b6f0133fef800..64f45fd0d61d8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 c77054a2ca3d0..0fcee40e5e9ac 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 ed6f1f5f1be77..3620ad485f009 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 b6f0133fef800..64f45fd0d61d8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 c77054a2ca3d0..0fcee40e5e9ac 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 32001a247a954..e16e577ece533 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 b44c20c4348e9..6499e9687f798 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 113aa5cac2b1f..edb682a57c36c 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 1f48c1aa00afb..5a5e2d76044e8 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 d9bde56bc8ccb..aa8e4eb77837a 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 19da3658663a6..daaf40245db32 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 588d336a73f6a..bb0871b5bdc3b 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 @@ -45,7 +45,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.9 + version: 3.5.13 - backups: backupStore: memfs://tests/minimal-gce.example.com/backups/etcd/events cpuRequest: 100m @@ -56,7 +56,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 0d8c5d9d664af..e6c9a4569cbcf 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 ab79612f61d87..da9b7b382c110 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 bb472ddea2470..63afb5879a744 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 0d8c5d9d664af..e6c9a4569cbcf 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 ab79612f61d87..da9b7b382c110 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 9989e804ae544..1a22fafbf614d 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 @@ -49,7 +49,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.9 + version: 3.5.13 - backups: backupStore: memfs://tests/minimal-gce-ilb.example.com/backups/etcd/events cpuRequest: 100m @@ -60,7 +60,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 857bbb92cdf17..853c4ad4d2226 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 3611e1464ae4a..4828b93e23d13 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 b963938ec0341..ba21d87ec663e 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 @@ -49,7 +49,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.9 + version: 3.5.13 - backups: backupStore: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com/backups/etcd/events cpuRequest: 100m @@ -60,7 +60,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3b7082fdefd4f..edd4728c0c966 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 e4355c8996056..e9ec616b889bf 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 b0d589ef462f3..3fe7bb3cc95d1 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 @@ -45,7 +45,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.9 + version: 3.5.13 - backups: backupStore: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com/backups/etcd/events cpuRequest: 100m @@ -56,7 +56,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3b7082fdefd4f..edd4728c0c966 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 e4355c8996056..e9ec616b889bf 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 e29c300caeae2..0f7ce0f0e073a 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 @@ -49,7 +49,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.9 + version: 3.5.13 - backups: backupStore: memfs://tests/minimal-gce-plb.example.com/backups/etcd/events cpuRequest: 100m @@ -60,7 +60,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 edf22a786b960..39ee5d47d6ba7 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 365ac5639d45b..395bc8d9a0c96 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 82d7507108aeb..6caac9c23325c 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 @@ -45,7 +45,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.9 + version: 3.5.13 - backups: backupStore: memfs://tests/minimal-gce-private.example.com/backups/etcd/events cpuRequest: 100m @@ -56,7 +56,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 7fd1ceb16da56..f8de302a2ed1a 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 3202d2baf8dd4..2f10f568f75d5 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 96a83150f018e..ae34a4c5175cb 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3e44759bbc5f1..238f69edf05ed 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 bdd1cca0be679..535ed7f42e7f7 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 6bc58f432f7a9..73dc56c6b9ca7 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3e44759bbc5f1..238f69edf05ed 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 bdd1cca0be679..535ed7f42e7f7 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 3d9c2ae27eb67..3111d1b666fb4 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 75f2e8eb1cca0..86a1e194f7960 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -101,12 +101,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 a3753991a89ae..7653cdfc6696f 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -101,12 +101,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 16ce9da2de469..3e529f9cd5641 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 bf3bd71072f0a..bcdeec25e7218 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -103,12 +103,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 41a54f14c05b0..b4fa96dbc1530 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -103,12 +103,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 520eed839b097..f4f729939aa0a 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 d880dbd4a4bbd..bc6b401bb72d6 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.9" + "etcdVersion": "3.5.13" } 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 d880dbd4a4bbd..bc6b401bb72d6 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.9" + "etcdVersion": "3.5.13" } 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 3cf12300cd048..ba30d855cf268 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 3cf12300cd048..ba30d855cf268 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 3cf12300cd048..ba30d855cf268 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 bae0bb9d21184..7f4d3e5751e10 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 bae0bb9d21184..7f4d3e5751e10 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 bae0bb9d21184..7f4d3e5751e10 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 520eed839b097..f4f729939aa0a 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 d880dbd4a4bbd..bc6b401bb72d6 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.9" + "etcdVersion": "3.5.13" } 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 d880dbd4a4bbd..bc6b401bb72d6 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.9" + "etcdVersion": "3.5.13" } 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 3cf12300cd048..ba30d855cf268 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 3cf12300cd048..ba30d855cf268 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 3cf12300cd048..ba30d855cf268 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 bae0bb9d21184..7f4d3e5751e10 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 bae0bb9d21184..7f4d3e5751e10 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 bae0bb9d21184..7f4d3e5751e10 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 1bcfa99ca852a..4eaa0f018a374 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 0e417ca7d8953..53d7bcfd06d8e 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 b06fd41dfd8c9..e0fc2d5d10b12 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 2152467dea608..18a94528b48f7 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 0e417ca7d8953..53d7bcfd06d8e 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 b06fd41dfd8c9..e0fc2d5d10b12 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 1f0e524fa13ae..22c2c5475b881 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 f235878644e14..6d716ed9ac47f 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 dde0314e54cb4..ce52df218a5a8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 ce40d041fa5fd..3dcaa271d9c86 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 c8456989d8a48..e801519f9d371 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 9ce3b08042058..bb0607c4fc612 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 7c11e103f4acc..d70583b25ac98 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 cc7239402f705..d98554cb571d9 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 be4e031528698..644561d2d0285 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 9548c630fae93..07bab273a784a 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 7e9a479474dd6..6151dee9667a3 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 d7bcab96085c3..18f8b61f16307 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 2e32509632cff..94f51b7ba0cb1 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 285d0a8af8021..96fbcfc4e5632 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 6d1a4894b549a..2b56cc27de2fa 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 aefdee5d630ca..c3a4f6524e00e 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 7e6937a69edb9..5341636020c65 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 f8a93b928393f..53b472bbedcf8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 7e06143d4fb60..adfcada3f8845 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 7e6937a69edb9..5341636020c65 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 f8a93b928393f..53b472bbedcf8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 5d68f19c61c0a..8e16255d609af 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 @@ -44,7 +44,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.9 + version: 3.5.13 - backups: backupStore: memfs://clusters.example.com/privatecilium.example.com/backups/etcd/events etcdMembers: @@ -53,7 +53,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 7e6937a69edb9..5341636020c65 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 f8a93b928393f..53b472bbedcf8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 7bb2b158e37ab..e1a1546678300 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 c3abdd517787e..f492994439b0a 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 3d6d98877f93a..fa1b542febfa2 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 3ac2846f23ff7..84651f2ae3fe4 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 d9ddcdbc683d6..833669047bf71 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 32a6e87719442..93871510ed6c1 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 a7d9f653b47cd..2f02316c4259a 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 fb29afb68edf8..2585b736ada60 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 c25119608bc7c..ffbe4352fc33e 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 4defeb7061e54..33756dbac27a5 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 15bcb9624922d..b1e121b0ccdf1 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 f138e4ba63502..dd48c3d65f18b 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 e67d37f171bfc..dff79392a32ae 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 0bf01efff6e32..908b46b3328fd 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 708f27f86abef..1df9665859fa5 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 a22e7ff73b248..44dbfafc3d59a 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 3729d4e820761..b42bce5e0c6b2 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 @@ -40,7 +40,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.9 + version: 3.5.13 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -49,7 +49,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 f235878644e14..6d716ed9ac47f 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 dde0314e54cb4..ce52df218a5a8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 4f0bcaed810b1..62bf4fcfd73e6 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 53e98e735c26f..cc4a48bfa1abe 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 2ec40795194c8..9ccd83991ffaa 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 8d68ac0bb4be2..952cd3e0a3ccb 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 adf1f625f2e7a..1de8e17069c21 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 596bba641faee..57e4d1f4b96f5 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 97d703f44f846..b352d3841b489 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 b6f0133fef800..64f45fd0d61d8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 c77054a2ca3d0..0fcee40e5e9ac 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -100,12 +100,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 2603fd9f5f4b7..9a7f7f7eec4f5 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 745148eedb1d9..5f3c8db744c93 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 471959cf271aa..0260a798b7e00 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 7cc63ec36a95b..2ed66b190c87c 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.9 + version: 3.5.13 - 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.9 + version: 3.5.13 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 3bde2f95b6324..5a36c3ebf46dc 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.9" + "etcdVersion": "3.5.13" } 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 f235878644e14..6d716ed9ac47f 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt 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 dde0314e54cb4..ce52df218a5a8 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.9 + - --target-dir=/opt/etcd-v3.5.13 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.9-0 - name: init-etcd-3-5-9 + image: registry.k8s.io/etcd:3.5.13-0 + name: init-etcd-3-5-13 resources: {} volumeMounts: - mountPath: /opt @@ -99,12 +99,13 @@ spec: - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - - --src=/opt/etcd-v3.5.9/etcd - - --src=/opt/etcd-v3.5.9/etcdctl + - --target-dir=/opt/etcd-v3.5.9 + - --src=/opt/etcd-v3.5.13/etcd + - --src=/opt/etcd-v3.5.13/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.29.0-beta.1 - name: init-etcd-symlinks-3-5-9 + name: init-etcd-symlinks-3-5-13 resources: {} volumeMounts: - mountPath: /opt