From f8fa17329c169ffd6cf48a9fbbe1de7b85819d73 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Thu, 2 Jan 2025 11:13:55 +0200 Subject: [PATCH 1/2] Update etcd to v3.5.17 --- pkg/model/components/etcd.go | 2 +- pkg/model/components/etcdmanager/options.go | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkg/model/components/etcd.go b/pkg/model/components/etcd.go index 0ac503ef9e2ae..db7d616c6b8fc 100644 --- a/pkg/model/components/etcd.go +++ b/pkg/model/components/etcd.go @@ -29,7 +29,7 @@ type EtcdOptionsBuilder struct { var _ loader.ClusterOptionsBuilder = &EtcdOptionsBuilder{} const ( - DefaultEtcd3Version_1_22 = "3.5.13" + DefaultEtcd3Version_1_22 = "3.5.17" ) // BuildOptions is responsible for filling in the defaults for the etcd cluster model diff --git a/pkg/model/components/etcdmanager/options.go b/pkg/model/components/etcdmanager/options.go index 595fae80f2247..25105505aabab 100644 --- a/pkg/model/components/etcdmanager/options.go +++ b/pkg/model/components/etcdmanager/options.go @@ -79,14 +79,15 @@ type etcdVersion struct { var etcdSupportedImages = []etcdVersion{ {Version: "3.4.3", SymlinkToVersion: "3.4.13"}, {Version: "3.4.13", Image: "registry.k8s.io/etcd:3.4.13-0"}, - {Version: "3.5.0", SymlinkToVersion: "3.5.13"}, - {Version: "3.5.1", SymlinkToVersion: "3.5.13"}, - {Version: "3.5.3", SymlinkToVersion: "3.5.13"}, - {Version: "3.5.4", SymlinkToVersion: "3.5.13"}, - {Version: "3.5.6", SymlinkToVersion: "3.5.13"}, - {Version: "3.5.7", SymlinkToVersion: "3.5.13"}, - {Version: "3.5.9", SymlinkToVersion: "3.5.13"}, - {Version: "3.5.13", Image: "registry.k8s.io/etcd:3.5.13-0"}, + {Version: "3.5.0", SymlinkToVersion: "3.5.17"}, + {Version: "3.5.1", SymlinkToVersion: "3.5.17"}, + {Version: "3.5.3", SymlinkToVersion: "3.5.17"}, + {Version: "3.5.4", SymlinkToVersion: "3.5.17"}, + {Version: "3.5.6", SymlinkToVersion: "3.5.17"}, + {Version: "3.5.7", SymlinkToVersion: "3.5.17"}, + {Version: "3.5.9", SymlinkToVersion: "3.5.17"}, + {Version: "3.5.13", SymlinkToVersion: "3.5.17"}, + {Version: "3.5.17", Image: "registry.k8s.io/etcd:3.5.17-0"}, } func etcdSupportedVersions() []etcdVersion { From c3a748f65a4655caecea636c507ef5c3ef7430e0 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Thu, 2 Jan 2025 11:49:17 +0200 Subject: [PATCH 2/2] hack/update-expected.sh --- .../etcdmanager/tests/interval/tasks.yaml | 26 ++++++++++--------- .../etcdmanager/tests/minimal/tasks.yaml | 26 ++++++++++--------- .../tests/overwrite_settings/tasks.yaml | 26 ++++++++++--------- .../etcdmanager/tests/proxy/tasks.yaml | 26 ++++++++++--------- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...cdmanager-events-master-us-test-1b_content | 13 +++++----- ...cdmanager-events-master-us-test-1c_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1b_content | 13 +++++----- ...etcdmanager-main-master-us-test-1c_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...cdmanager-events-master-us-test-1b_content | 13 +++++----- ...cdmanager-events-master-us-test-1c_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1b_content | 13 +++++----- ...etcdmanager-main-master-us-test-1c_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...cdmanager-events-master-us-test-1b_content | 13 +++++----- ...cdmanager-events-master-us-test-1c_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1b_content | 13 +++++----- ...etcdmanager-main-master-us-test-1c_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test1-a_content | 13 +++++----- ...cdmanager-events-master-us-test1-b_content | 13 +++++----- ...cdmanager-events-master-us-test1-c_content | 13 +++++----- ...etcdmanager-main-master-us-test1-a_content | 13 +++++----- ...etcdmanager-main-master-us-test1-b_content | 13 +++++----- ...etcdmanager-main-master-us-test1-c_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test1-a_content | 13 +++++----- ...etcdmanager-main-master-us-test1-a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test1-a_content | 13 +++++----- ...etcdmanager-main-master-us-test1-a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test1-a_content | 13 +++++----- ...etcdmanager-main-master-us-test1-a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test1-a_content | 13 +++++----- ...etcdmanager-main-master-us-test1-a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test1-a_content | 13 +++++----- ...etcdmanager-main-master-us-test1-a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test1-a_content | 13 +++++----- ...etcdmanager-main-master-us-test1-a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test1-a_content | 13 +++++----- ...etcdmanager-main-master-us-test1-a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test1-a_content | 13 +++++----- ...etcdmanager-main-master-us-test1-a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...sts-etcdmanager-events-master-fsn1_content | 13 +++++----- ...fests-etcdmanager-main-master-fsn1_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...ager-events-control-plane-fr-par-1_content | 13 +++++----- ...anager-main-control-plane-fr-par-1_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...cdmanager-events-master-us-test-1b_content | 13 +++++----- ...cdmanager-events-master-us-test-1c_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1b_content | 13 +++++----- ...etcdmanager-main-master-us-test-1c_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...cdmanager-events-master-us-test-1b_content | 13 +++++----- ...cdmanager-events-master-us-test-1c_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1b_content | 13 +++++----- ...etcdmanager-main-master-us-test-1c_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 6 ++--- ...s3_object_etcd-cluster-spec-cilium_content | 2 +- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-cilium-master-us-test-1a_content | 13 +++++----- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- ...s_s3_object_cluster-completed.spec_content | 4 +-- ...s3_object_etcd-cluster-spec-events_content | 2 +- ...s_s3_object_etcd-cluster-spec-main_content | 2 +- ...cdmanager-events-master-us-test-1a_content | 13 +++++----- ...etcdmanager-main-master-us-test-1a_content | 13 +++++----- 415 files changed, 1619 insertions(+), 1432 deletions(-) diff --git a/pkg/model/components/etcdmanager/tests/interval/tasks.yaml b/pkg/model/components/etcdmanager/tests/interval/tasks.yaml index 24a0eea2a6089..84c400dce400b 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -160,17 +160,18 @@ Contents: | - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -273,13 +274,13 @@ Contents: | - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -301,17 +302,18 @@ Contents: | - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml index 12fe82b42661b..4834ae7cfabda 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -159,17 +159,18 @@ Contents: | - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -271,13 +272,13 @@ Contents: | - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -299,17 +300,18 @@ Contents: | - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml index 07eda3ac0cc8a..87de9e55ef840 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -162,17 +162,18 @@ Contents: | - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -277,13 +278,13 @@ Contents: | - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -305,17 +306,18 @@ Contents: | - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml index 7409ab07e1ebb..9ed19d7b7398d 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -168,17 +168,18 @@ Contents: | - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -289,13 +290,13 @@ Contents: | - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -317,17 +318,18 @@ Contents: | - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 0c5ed8b036c7e..5449bc75556e6 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.13 + version: 3.5.17 - backups: backupStore: memfs://tests/additionalobjects.example.com/backups/etcd/events cpuRequest: 100m @@ -54,7 +54,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.13 + version: 3.5.17 externalDns: provider: dns-controller iam: diff --git a/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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 06b7d369f9954..7c9286df55b16 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 cf94a82eda99b..24261d5c087d3 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 26f139167bb03..af085a05a3bde 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 655d1efb97bf9..2485e98ed6dac 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -98,17 +98,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 a23083840aa7e..0729845d19d20 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -98,17 +98,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 0dd6af64887fa..54a65826bdebf 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 7e887481147c8..4eb0d5b03a1b5 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 eedf9b76e981c..e2d9e5d30ab76 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 7380ed06d9021..937b98eba7990 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 31250a330f531..8672b321a7859 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 524fc37e055e0..274cea185c161 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 e8d6145720558..2b84a79cf48c8 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content @@ -65,7 +65,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.13 + version: 3.5.17 - backups: backupStore: memfs://clusters.example.com/cas-priority-expander-custom.example.com/backups/etcd/events etcdMembers: @@ -74,7 +74,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 17759a869df61..2c3cb1003d156 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 8e8394ab8ca40..9d77086cb1a35 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 e89dc6a80c3b1..5369855aa7897 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content @@ -58,7 +58,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.13 + version: 3.5.17 - backups: backupStore: memfs://clusters.example.com/cas-priority-expander.example.com/backups/etcd/events etcdMembers: @@ -67,7 +67,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 21a95051018e6..ab0b75e80da67 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 ca109f11763bc..cac7c0933e198 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 f4819fc064fd9..6e680d42cf5d1 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content @@ -61,7 +61,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.13 + version: 3.5.17 - backups: backupStore: memfs://clusters.example.com/complex.example.com/backups/etcd/events etcdMembers: @@ -70,7 +70,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 e30333414a069..2c353fa62e020 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 b4133bedad8ea..4dfbd960b4ead 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 c8222c08beddd..56b3e867ef97a 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 ff1ab6484431f..17563c629750a 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 b9b2d32e4c8c5..b45e7d9c12d08 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 f01d13d004d01..dcac79dd07927 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 d88ac8a7296b7..8116d80295100 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 4ea75eb4f06b0..5e34d8bad7887 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 1c9bfac88706b..f96bc35ccae38 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 d88ac8a7296b7..8116d80295100 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 4ea75eb4f06b0..5e34d8bad7887 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 f60d299b62f4b..0b8a3781b6c90 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 d7a4d33420c66..b29bad8d0bfbb 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 90309c4976adc..70b55208b62c5 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 bf259e5a1deb7..da77333a79782 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 bc6b401bb72d6..9353816affed3 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.13" + "etcdVersion": "3.5.17" } 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 bc6b401bb72d6..9353816affed3 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.13" + "etcdVersion": "3.5.17" } 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 7cab7d7a35ef9..28766cee9175f 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 7cab7d7a35ef9..28766cee9175f 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 7cab7d7a35ef9..28766cee9175f 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 bfa0292b53f6e..d06d316cefa0e 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 bfa0292b53f6e..d06d316cefa0e 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 bfa0292b53f6e..d06d316cefa0e 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 94b3398401aeb..942d890b4facd 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 bc6b401bb72d6..9353816affed3 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.13" + "etcdVersion": "3.5.17" } 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 bc6b401bb72d6..9353816affed3 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.13" + "etcdVersion": "3.5.17" } 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 35c6b458fdfd0..4e9dd92b465d4 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 35c6b458fdfd0..4e9dd92b465d4 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 35c6b458fdfd0..4e9dd92b465d4 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 e3ce2d5f0aba9..ad1d894cc6db1 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 e3ce2d5f0aba9..ad1d894cc6db1 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 e3ce2d5f0aba9..ad1d894cc6db1 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 4873839afb6e3..2bbc6f112dc54 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 7e887481147c8..4eb0d5b03a1b5 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 eedf9b76e981c..e2d9e5d30ab76 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 fabe9406b7cdf..09f19a3f115c7 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 7e887481147c8..4eb0d5b03a1b5 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 eedf9b76e981c..e2d9e5d30ab76 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 9b1320e6192a4..a8f65ce01fc0d 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5c9ca327e5e59..93bd002dba31e 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 dc32356347fa9..4f8d06c1cf84f 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 348a102e22fec..409af0556771d 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 e24108b0536c1..b5a0159754ed3 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 05863b5939ebd..519aba24c375b 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 08db981f396e0..66faa6f69ab61 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.13 + version: 3.5.17 - backups: backupStore: memfs://tests/ha.example.com/backups/etcd/events etcdMembers: @@ -56,7 +56,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.13 + version: 3.5.17 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 bc6b401bb72d6..9353816affed3 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.13" + "etcdVersion": "3.5.17" } 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 bc6b401bb72d6..9353816affed3 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.13" + "etcdVersion": "3.5.17" } 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 be2a115b0bb83..b682611014adc 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 be2a115b0bb83..b682611014adc 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 be2a115b0bb83..b682611014adc 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 3535423e1a21c..688e8078ae2c4 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 3535423e1a21c..688e8078ae2c4 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 3535423e1a21c..688e8078ae2c4 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 44dd296dfd44f..014c64bcac808 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content @@ -50,7 +50,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.13 + version: 3.5.17 - backups: backupStore: memfs://tests/ha-gce.example.com/backups/etcd/events cpuRequest: 100m @@ -65,7 +65,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.13 + version: 3.5.17 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 bc6b401bb72d6..9353816affed3 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.13" + "etcdVersion": "3.5.17" } 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 bc6b401bb72d6..9353816affed3 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.13" + "etcdVersion": "3.5.17" } 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 b680640374afb..9405689fd1a3e 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 b680640374afb..9405689fd1a3e 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 b680640374afb..9405689fd1a3e 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 2ac4c21901220..dc3f3dabaa119 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 2ac4c21901220..dc3f3dabaa119 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 2ac4c21901220..dc3f3dabaa119 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 d0d0fb2d51fb9..da3ba0353bb30 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 7e887481147c8..4eb0d5b03a1b5 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 eedf9b76e981c..e2d9e5d30ab76 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 1e138e6814d2f..2d1c8189d9c8e 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 7e887481147c8..4eb0d5b03a1b5 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 eedf9b76e981c..e2d9e5d30ab76 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 2a03ba034af8b..2a336e3a983e6 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content @@ -61,7 +61,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 7e887481147c8..4eb0d5b03a1b5 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 eedf9b76e981c..e2d9e5d30ab76 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 f8c612068e496..ffc4f28dcec85 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 @@ -61,7 +61,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 7e887481147c8..4eb0d5b03a1b5 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 eedf9b76e981c..e2d9e5d30ab76 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 252a5d9f05fc9..f3474a4cf8d60 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 @@ -61,7 +61,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 7e887481147c8..4eb0d5b03a1b5 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 eedf9b76e981c..e2d9e5d30ab76 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 da8b7b957ebeb..c58319695083d 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content @@ -62,7 +62,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.13 + version: 3.5.17 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -71,7 +71,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 7e887481147c8..4eb0d5b03a1b5 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 eedf9b76e981c..e2d9e5d30ab76 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 a77f3cc8fb702..e62f20dfe8e21 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content @@ -64,7 +64,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.13 + version: 3.5.17 - backups: backupStore: memfs://tests/minimal.example.com/backups/etcd/events cpuRequest: 100m @@ -75,7 +75,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 0c2597e0ef0fe..850d5a89e97aa 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 a1bde34e79855..70c90275a0348 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 39282f99dbfb2..f222beddf7370 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content @@ -64,7 +64,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.13 + version: 3.5.17 - backups: backupStore: memfs://tests/many-addons.example.com/backups/etcd/events etcdMembers: @@ -73,7 +73,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 f714f4c6d116a..7302244ee63f8 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 be01a0c94c5a9..79743022ee858 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 1f7753e438212..b552c7bf6216a 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 33b21b33747ba..a03d158d73354 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 83d945d484441..45f73818f0c77 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 83a1bcbfa7aa8..cca92986344f8 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 33b21b33747ba..a03d158d73354 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 83d945d484441..45f73818f0c77 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 eb06a026c8252..a7157be42d189 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 33b21b33747ba..a03d158d73354 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 83d945d484441..45f73818f0c77 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 123c2ed5f701b..b89f474cb3df2 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 33b21b33747ba..a03d158d73354 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 83d945d484441..45f73818f0c77 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 a8ac9ac523170..c586a3065f48a 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 33b21b33747ba..a03d158d73354 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 83d945d484441..45f73818f0c77 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_cluster-completed.spec_content index 9458b2588cce8..037b3853ca670 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_cluster-completed.spec_content @@ -42,7 +42,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.13 + version: 3.5.17 - 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.13 + version: 3.5.17 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_etcd-cluster-spec-events_content index 5a36c3ebf46dc..432cd0d5554c5 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.13" + "etcdVersion": "3.5.17" } diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_etcd-cluster-spec-main_content index 5a36c3ebf46dc..432cd0d5554c5 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.13" + "etcdVersion": "3.5.17" } diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 33b21b33747ba..a03d158d73354 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 83d945d484441..45f73818f0c77 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -67,13 +67,13 @@ spec: - mountPath: /opt name: opt - args: - - --target-dir=/opt/etcd-v3.5.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 e41826ca9214f..cb738cd694167 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 ca0e5ad40eadf..970e7feff2bcd 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 d26d8c9dcf7ea..d622ad4fe598c 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 186ad7c34ab99..56a58e2873ecf 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 33b21b33747ba..a03d158d73354 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 83d945d484441..45f73818f0c77 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 242c499f22512..6c0ff0dd9cfc2 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 7be10a72c4373..b4f9ad6082681 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -98,17 +98,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 06e445060a3d6..0f467e40e92b7 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 33027606fe3b7..327a76caa5e9e 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 7e887481147c8..4eb0d5b03a1b5 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 eedf9b76e981c..e2d9e5d30ab76 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 f699aedb6868b..30ebaa15859b8 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 82844f517df0e..3d7dd831fcb2c 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 d91c7879afea8..3c81f11e74e1a 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 2c7a2ffea8866..07fa74602c995 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 82844f517df0e..3d7dd831fcb2c 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 d91c7879afea8..3c81f11e74e1a 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 b6280be26f414..c17dd8fc0bca7 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 82844f517df0e..3d7dd831fcb2c 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 d91c7879afea8..3c81f11e74e1a 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 10536b591a3be..d7a6962ff42b3 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 82844f517df0e..3d7dd831fcb2c 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 d91c7879afea8..3c81f11e74e1a 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 b431d0791e937..004c60ee98bf4 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 d5a98ff928624..33ee996670928 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 f6839118ffcad..b69423be97ecd 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 ac75a5fa17b61..f1d4a76d1bee8 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 f41c6305ff7ea..3197b67b8d674 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 409af139170ac..a5f5eee546ccf 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 19589621ad2de..6ba20b7eed717 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content @@ -46,7 +46,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.13 + version: 3.5.17 - backups: backupStore: memfs://tests/minimal-gce.example.com/backups/etcd/events cpuRequest: 100m @@ -57,7 +57,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 97624b935f534..638d5d63fe19c 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 57d1281d1b105..d564337489e6f 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 63afb5879a744..2b46837e926b9 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 97624b935f534..638d5d63fe19c 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 57d1281d1b105..d564337489e6f 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 9e9a6fce14ef5..6b740d89531ce 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content @@ -50,7 +50,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.13 + version: 3.5.17 - backups: backupStore: memfs://tests/minimal-gce-ilb.example.com/backups/etcd/events cpuRequest: 100m @@ -61,7 +61,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 9435984311672..33eaa3802580e 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 1fcaa9c6b3eb8..96d03e2af8fea 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 3851eb7f1bc90..eb8a41dcafb45 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -50,7 +50,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.13 + version: 3.5.17 - backups: backupStore: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com/backups/etcd/events cpuRequest: 100m @@ -61,7 +61,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 3329e72895165..95ce03dc562d0 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 2602e43180ec2..e5ae7aeb8c098 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 2fdc6cf298ebe..07e8b9c149100 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -47,7 +47,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.13 + version: 3.5.17 - backups: backupStore: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com/backups/etcd/events cpuRequest: 100m @@ -58,7 +58,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 3329e72895165..95ce03dc562d0 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 2602e43180ec2..e5ae7aeb8c098 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 6246827e2d09e..eb7f538a782b9 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content @@ -50,7 +50,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.13 + version: 3.5.17 - backups: backupStore: memfs://tests/minimal-gce-plb.example.com/backups/etcd/events cpuRequest: 100m @@ -61,7 +61,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 eb56ec80e643c..f3a812443bd50 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 c9291bfbbd15c..b4a44c83df37e 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 aae477e9bd31e..4d9c881583155 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content @@ -46,7 +46,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: main - version: 3.5.13 + version: 3.5.17 - backups: backupStore: memfs://tests/minimal-gce-private.example.com/backups/etcd/events cpuRequest: 100m @@ -57,7 +57,7 @@ spec: backupRetentionDays: 90 memoryRequest: 100Mi name: events - version: 3.5.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 da8d429441c34..635d90cc3cfac 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 b203810b1a816..59ce1c9a99fcf 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 0cab6c92a5fe7..ebf0b180a6583 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 7d50218b639c0..f9e2664dd41f6 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 b6c6b557aa847..838175933e8a2 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 cfb7e2d043bf4..2d8388c8d6d35 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 7d50218b639c0..f9e2664dd41f6 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 b6c6b557aa847..838175933e8a2 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 3111d1b666fb4..c34b013cbfaa0 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 69ab7b2b1c38d..bada6c9e18772 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 978ab7b22676b..880ef0d7179d8 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -97,17 +97,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 857d2dccaae70..0559d842dbd44 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 c90074fef0fcb..2c4a6f2258bdb 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -99,17 +99,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 84a3f47eb8828..77385a16ab5ff 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -99,17 +99,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 b915f27b6c9c7..7cc92d9e44aae 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 bc6b401bb72d6..9353816affed3 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.13" + "etcdVersion": "3.5.17" } 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 bc6b401bb72d6..9353816affed3 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.13" + "etcdVersion": "3.5.17" } 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 1557d78be08f0..9f2e78ee3886b 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 1557d78be08f0..9f2e78ee3886b 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 1557d78be08f0..9f2e78ee3886b 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 859a6800a8ed9..000601d378c4d 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 859a6800a8ed9..000601d378c4d 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 859a6800a8ed9..000601d378c4d 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 b915f27b6c9c7..7cc92d9e44aae 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 bc6b401bb72d6..9353816affed3 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.13" + "etcdVersion": "3.5.17" } 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 bc6b401bb72d6..9353816affed3 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.13" + "etcdVersion": "3.5.17" } 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 1557d78be08f0..9f2e78ee3886b 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 1557d78be08f0..9f2e78ee3886b 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 1557d78be08f0..9f2e78ee3886b 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 859a6800a8ed9..000601d378c4d 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 859a6800a8ed9..000601d378c4d 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 859a6800a8ed9..000601d378c4d 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 6b0cb4e2b44e9..969dc2a0fe129 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 9277d863e456b..36dc34cc5cdde 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 6a0fe8c31adc1..3e39519e12d4e 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 d44b060198ebc..1c01cddfd8eef 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 9277d863e456b..36dc34cc5cdde 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 6a0fe8c31adc1..3e39519e12d4e 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 de425e1c20835..3ebc1735e3d7e 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 7e887481147c8..4eb0d5b03a1b5 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 eedf9b76e981c..e2d9e5d30ab76 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 f9e55583f7a28..d598dd881eb74 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 a0db1a5bd865a..6626c6fa64b17 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 87fb75a3764cf..5f3961f5d28cb 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 3e092fd1ea800..567f3acbf50f5 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 21f0cd58ff294..033c321c854d9 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 dac91e8bc8b82..cc47ba771841b 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 9de232b51a89c..7643828e7066b 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 cad920e9236e6..88f3801dd4b2f 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 692519d3525f8..9fb0119874ff9 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 7dc07a82bfdf7..5a40e570a09bc 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 837f9f07a5ee1..7eee1c8a02cac 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 5d165d8932ce7..f387b96b0be10 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 6ee353486dee7..7ccc5648b5f80 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 60dbeacb74f84..2dffff1f73097 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 4b846a8bc2930..ad4de2c82f1b0 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 9bd83a3457546..4e2615bc9af9a 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 60dbeacb74f84..2dffff1f73097 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 4b846a8bc2930..ad4de2c82f1b0 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 af5330ec0515d..07f08c8cb3210 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content @@ -43,7 +43,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.13 + version: 3.5.17 - backups: backupStore: memfs://clusters.example.com/privatecilium.example.com/backups/etcd/events etcdMembers: @@ -52,7 +52,7 @@ spec: manager: backupRetentionDays: 90 name: events - version: 3.5.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 60dbeacb74f84..2dffff1f73097 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 4b846a8bc2930..ad4de2c82f1b0 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 edb18900b7c4f..db628f8467f09 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 911a78a91d2d9..e0e832863597f 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 93552f460b189..de651f657b03a 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 98204a69c3ff8..b396341a335d3 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 2762f960c780d..dd977df788783 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 73eae4e8b6a8d..e349fec4d3a46 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 5d0fed4126718..a51d54ea11c5e 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 05d9c4ecee9ff..0200472505394 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 e132d4647fb2f..f101207516e14 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 7eb3bec40e3e7..a62d1330da134 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 03ea9f5a021f4..2fb8a8f295d07 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 09de0f467cfa4..1a4c1845c903b 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 69280d3104664..ec54d6fb2f6b0 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 fd23a695a4817..5cc152fd65dc0 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 8659e279a0a24..9715ea2fe3d61 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 93c7dc8c261c9..0564cfb3f74e1 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 8bfa58986ed0b..1ad93c35f6e26 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content @@ -39,7 +39,7 @@ spec: manager: backupRetentionDays: 90 name: main - version: 3.5.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 7e887481147c8..4eb0d5b03a1b5 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 eedf9b76e981c..e2d9e5d30ab76 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 105f1b24ae9b0..b3b33c55ca462 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 8e73bf822a681..a1effbab2df70 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 4862d1830bca5..c38027317046c 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 4c4b3dcad673a..7f875ef4a1466 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 affa254df4446..6c8057b471d95 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 4bb753e89b4d5..8cdc3e9c49d50 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 30c6199995a78..9f2909b246e88 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 82844f517df0e..3d7dd831fcb2c 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 d91c7879afea8..3c81f11e74e1a 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -96,17 +96,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 6b7c3410a1354..986a3a53dc002 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 39638af4b4c82..4bcc457033cad 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 d7a93541526b8..c5692069765f9 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 31c401c972b60..147a4de6431d5 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.13 + version: 3.5.17 - 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.13 + version: 3.5.17 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 5a36c3ebf46dc..432cd0d5554c5 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.13" + "etcdVersion": "3.5.17" } 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 7e887481147c8..4eb0d5b03a1b5 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt diff --git a/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 eedf9b76e981c..e2d9e5d30ab76 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.13 + - --target-dir=/opt/etcd-v3.5.17 - --src=/usr/local/bin/etcd - --src=/usr/local/bin/etcdctl command: - /opt/kops-utils/kops-utils-cp - image: registry.k8s.io/etcd:3.5.13-0 - name: init-etcd-3-5-13 + image: registry.k8s.io/etcd:3.5.17-0 + name: init-etcd-3-5-17 resources: {} volumeMounts: - mountPath: /opt @@ -95,17 +95,18 @@ spec: - --symlink - --target-dir=/opt/etcd-v3.5.0 - --target-dir=/opt/etcd-v3.5.1 + - --target-dir=/opt/etcd-v3.5.13 - --target-dir=/opt/etcd-v3.5.3 - --target-dir=/opt/etcd-v3.5.4 - --target-dir=/opt/etcd-v3.5.6 - --target-dir=/opt/etcd-v3.5.7 - --target-dir=/opt/etcd-v3.5.9 - - --src=/opt/etcd-v3.5.13/etcd - - --src=/opt/etcd-v3.5.13/etcdctl + - --src=/opt/etcd-v3.5.17/etcd + - --src=/opt/etcd-v3.5.17/etcdctl command: - /opt/kops-utils/kops-utils-cp image: registry.k8s.io/kops/kops-utils-cp:1.31.0-beta.1 - name: init-etcd-symlinks-3-5-13 + name: init-etcd-symlinks-3-5-17 resources: {} volumeMounts: - mountPath: /opt