From 2f07263d3dc42e78a3c288adae53b8e06f898ba7 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 21 May 2023 06:35:40 +0300 Subject: [PATCH 1/6] Update etcd to v3.5.9 --- pkg/apis/kops/validation/validation.go | 13 +++---------- pkg/model/components/etcd.go | 3 +-- pkg/model/components/etcdmanager/options.go | 2 +- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/pkg/apis/kops/validation/validation.go b/pkg/apis/kops/validation/validation.go index 742e53dffd..78dae17564 100644 --- a/pkg/apis/kops/validation/validation.go +++ b/pkg/apis/kops/validation/validation.go @@ -1419,19 +1419,12 @@ func validateEtcdStorage(specs []kops.EtcdClusterSpec, fieldPath *field.Path) fi } // validateEtcdVersion is responsible for validating the storage version of etcd -// @TODO semvar package doesn't appear to ignore a 'v' in v1.1.1; could be a problem later down the line func validateEtcdVersion(spec kops.EtcdClusterSpec, fieldPath *field.Path, minimalVersion *semver.Version) field.ErrorList { - // @check if the storage is specified that it's valid - - if minimalVersion == nil { - v := semver.MustParse("0.0.0") - minimalVersion = &v + if spec.Version == "" { + return nil } version := spec.Version - if spec.Version == "" { - version = components.DefaultEtcd3Version_1_20 - } sem, err := semver.Parse(strings.TrimPrefix(version, "v")) if err != nil { @@ -1440,7 +1433,7 @@ func validateEtcdVersion(spec kops.EtcdClusterSpec, fieldPath *field.Path, minim // we only support v3 for now if sem.Major == 3 { - if sem.LT(*minimalVersion) { + if minimalVersion != nil && sem.LT(*minimalVersion) { return field.ErrorList{field.Invalid(fieldPath.Child("version"), version, fmt.Sprintf("minimum version required is %s", minimalVersion.String()))} } return nil diff --git a/pkg/model/components/etcd.go b/pkg/model/components/etcd.go index 4c3277d8cc..ddd297c8e9 100644 --- a/pkg/model/components/etcd.go +++ b/pkg/model/components/etcd.go @@ -29,8 +29,7 @@ type EtcdOptionsBuilder struct { var _ loader.OptionsBuilder = &EtcdOptionsBuilder{} const ( - DefaultEtcd3Version_1_20 = "3.4.13" - DefaultEtcd3Version_1_22 = "3.5.7" + DefaultEtcd3Version_1_22 = "3.5.9" ) // 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 dd625f9eee..e272a53232 100644 --- a/pkg/model/components/etcdmanager/options.go +++ b/pkg/model/components/etcdmanager/options.go @@ -69,7 +69,7 @@ var etcdSupportedImages = map[string]string{ "3.2.24": "registry.k8s.io/etcd:3.2.24-1", "3.3.17": "registry.k8s.io/etcd:3.3.17-0", "3.4.13": "registry.k8s.io/etcd:3.4.13-0", - "3.5.7": "registry.k8s.io/etcd:3.5.7-0", + "3.5.9": "registry.k8s.io/etcd:3.5.9-0", } func etcdSupportedVersions() []string { From 77130df276cd2ba3399147ae04fb010535380bbd Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 21 May 2023 06:38:23 +0300 Subject: [PATCH 2/6] hack/update-expected.sh --- .../components/etcdmanager/tests/interval/tasks.yaml | 12 ++++++------ .../components/etcdmanager/tests/minimal/tasks.yaml | 12 ++++++------ .../etcdmanager/tests/overwrite_settings/tasks.yaml | 12 ++++++------ .../components/etcdmanager/tests/proxy/tasks.yaml | 12 ++++++------ ...a.masters.additionalobjects.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-1a.masters.bastionuserdata.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...as-priority-expander-custom.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...sters.cas-priority-expander.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.complex.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...us-test-1a.masters.compress.example.com_user_data | 2 +- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-test-1a.masters.containerd.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-test-1a.masters.containerd.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...ster-us-test-1a.masters.123.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...r-us-test-1a.masters.docker.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...est-1a.masters.existing-iam.example.com_user_data | 4 ++-- ...est-1b.masters.existing-iam.example.com_user_data | 4 ++-- ...est-1c.masters.existing-iam.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ests-etcdmanager-events-master-us-test-1b_content | 6 +++--- ...ests-etcdmanager-events-master-us-test-1c_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1b_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1c_content | 6 +++--- ...-test-1a.masters.existingsg.example.com_user_data | 4 ++-- ...-test-1b.masters.existingsg.example.com_user_data | 4 ++-- ...-test-1c.masters.existingsg.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ests-etcdmanager-events-master-us-test-1b_content | 6 +++--- ...ests-etcdmanager-events-master-us-test-1c_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1b_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1c_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-test-1a.masters.externallb.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...1a.masters.externalpolicies.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...aster-us-test-1a.masters.ha.example.com_user_data | 4 ++-- ...aster-us-test-1b.masters.ha.example.com_user_data | 4 ++-- ...aster-us-test-1c.masters.ha.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ests-etcdmanager-events-master-us-test-1b_content | 6 +++--- ...ests-etcdmanager-events-master-us-test-1c_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1b_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1c_content | 6 +++--- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test1-a_content | 6 +++--- ...ests-etcdmanager-events-master-us-test1-b_content | 6 +++--- ...ests-etcdmanager-events-master-us-test1-c_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test1-a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test1-b_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test1-c_content | 6 +++--- ...est1-a-ha-gce-example-com_metadata_startup-script | 4 ++-- ...est1-b-ha-gce-example-com_metadata_startup-script | 4 ++-- ...est1-c-ha-gce-example-com_metadata_startup-script | 4 ++-- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test1-a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test1-a_content | 6 +++--- ...st1-a-minimal-example-com_metadata_startup-script | 4 ++-- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...est-1a.masters.minimal-etcd.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...est-1a.masters.minimal-ipv6.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...est-1a.masters.minimal-ipv6.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...est-1a.masters.minimal-ipv6.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...est-1a.masters.minimal-ipv6.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...y.long.cluster-name.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...1a.masters.minimal-warmpool.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test1-a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test1-a_content | 6 +++--- ...a-minimal-gce-example-com_metadata_startup-script | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test1-a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test1-a_content | 6 +++--- ...a-minimal-gce-example-com_metadata_startup-script | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test1-a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test1-a_content | 6 +++--- ...nimal-gce-ilb-example-com_metadata_startup-script | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test1-a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test1-a_content | 6 +++--- ...ery-long-name-example-com_metadata_startup-script | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test1-a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test1-a_content | 6 +++--- ...ery-long-name-example-com_metadata_startup-script | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test1-a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test1-a_content | 6 +++--- ...nimal-gce-plb-example-com_metadata_startup-script | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test1-a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test1-a_content | 6 +++--- ...l-gce-private-example-com_metadata_startup-script | 4 ++-- ...er-us-test-1a.masters.minimal.k8s.local_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...er-us-test-1a.masters.minimal.k8s.local_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ..._manifests-etcdmanager-events-master-fsn1_content | 6 +++--- ...ct_manifests-etcdmanager-main-master-fsn1_content | 6 +++--- .../data/hcloud_server_master-fsn1_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...etcdmanager-events-control-plane-fr-par-1_content | 6 +++--- ...s-etcdmanager-main-control-plane-fr-par-1_content | 6 +++--- ..._instance_server_control-plane-fr-par-1_user_data | 4 ++-- ...t-1a.masters.mixedinstances.example.com_user_data | 4 ++-- ...t-1b.masters.mixedinstances.example.com_user_data | 4 ++-- ...t-1c.masters.mixedinstances.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ests-etcdmanager-events-master-us-test-1b_content | 6 +++--- ...ests-etcdmanager-events-master-us-test-1c_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1b_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1c_content | 6 +++--- ...t-1a.masters.mixedinstances.example.com_user_data | 4 ++-- ...t-1b.masters.mixedinstances.example.com_user_data | 4 ++-- ...t-1c.masters.mixedinstances.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ests-etcdmanager-events-master-us-test-1b_content | 6 +++--- ...ests-etcdmanager-events-master-us-test-1c_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1b_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1c_content | 6 +++--- ...dsprocessor.longclustername.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...dsprocessor.longclustername.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...a.masters.private-shared-ip.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...sters.private-shared-subnet.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...st-1a.masters.privatecalico.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...est-1a.masters.privatecanal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...st-1a.masters.privatecilium.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...st-1a.masters.privatecilium.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...st-1a.masters.privatecilium.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...sters.privateciliumadvanced.example.com_user_data | 6 +++--- .../aws_s3_object_cluster-completed.spec_content | 6 +++--- .../aws_s3_object_etcd-cluster-spec-cilium_content | 2 +- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-cilium-master-us-test-1a_content | 6 +++--- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...test-1a.masters.privatedns1.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...test-1a.masters.privatedns2.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...t-1a.masters.privateflannel.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...st-1a.masters.privatekopeio.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...est-1a.masters.privateweave.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...est-1a.masters.sharedsubnet.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...s-test-1a.masters.sharedvpc.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...est-1a.masters.minimal-ipv6.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...s-test-1a.masters.unmanaged.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../aws_s3_object_cluster-completed.spec_content | 4 ++-- .../aws_s3_object_etcd-cluster-spec-events_content | 2 +- .../aws_s3_object_etcd-cluster-spec-main_content | 2 +- ...ests-etcdmanager-events-master-us-test-1a_content | 6 +++--- ...ifests-etcdmanager-main-master-us-test-1a_content | 6 +++--- 516 files changed, 1073 insertions(+), 1073 deletions(-) diff --git a/pkg/model/components/etcdmanager/tests/interval/tasks.yaml b/pkg/model/components/etcdmanager/tests/interval/tasks.yaml index 9e273af724..be118a465c 100644 --- a/pkg/model/components/etcdmanager/tests/interval/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/interval/tasks.yaml @@ -145,11 +145,11 @@ Contents: | name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt @@ -265,11 +265,11 @@ Contents: | name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 662a0fe048..aed9be52c1 100644 --- a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml @@ -144,11 +144,11 @@ Contents: | name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt @@ -263,11 +263,11 @@ Contents: | name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 41fdd1265b..e37f250632 100644 --- a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml @@ -147,11 +147,11 @@ Contents: | name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt @@ -269,11 +269,11 @@ Contents: | name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 b47c9298a4..3b7bd8f010 100644 --- a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml @@ -153,11 +153,11 @@ Contents: | name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt @@ -281,11 +281,11 @@ Contents: | name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data index 038f5b52ed..d6c1518179 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data +++ b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data @@ -135,7 +135,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 main: cpuRequest: 200m manager: @@ -144,7 +144,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 4fae7bbc42..4ba4f7f7bc 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: value: 90d memoryRequest: 100Mi name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://tests/additionalobjects.example.com/backups/etcd/events cpuRequest: 100m @@ -57,7 +57,7 @@ spec: value: 90d memoryRequest: 100Mi name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 f55d5a15d8..30696c6b70 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 b089d3ad32..0822d1c605 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index c03b374b37..183dd3d798 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 22191b0334..54f5ceefcb 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 @@ -37,7 +37,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -49,7 +49,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 de0d364672..a115e8a85f 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 @@ -83,11 +83,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 0874dc455d..1181d737de 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 @@ -83,11 +83,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index ce52ec1e72..225b9c9f23 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 5167c1baf8..bad3f82466 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 @@ -51,7 +51,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -63,7 +63,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 9e5c959b43..ac34ae7ab7 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 0e0a58a552..45bfdf6f77 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data index 5516968bed..63e32ce94d 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 98441438f1..321edda2cd 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 @@ -49,7 +49,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/bastionuserdata.example.com/backups/etcd/events etcdMembers: @@ -61,7 +61,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 be18fbfc6b..bdeb41a856 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 7cba02a264..094807a6e7 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data index 06a8a53fd2..27a5afbc81 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 f98b75981c..318fadc943 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 @@ -71,7 +71,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/cas-priority-expander-custom.example.com/backups/etcd/events etcdMembers: @@ -83,7 +83,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 7fa0e7bc73..e8d2a845be 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 fc53c6dad0..dbbd47d5ae 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data index a3dfdd6b6d..a561db22c5 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 a9309c5d5a..5144424718 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 @@ -64,7 +64,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/cas-priority-expander.example.com/backups/etcd/events etcdMembers: @@ -76,7 +76,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 2b0850aa52..bfb5b3741c 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 a040020c17..37a1693f28 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data index a72731cf14..e55b0184a8 100644 --- a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data +++ b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data @@ -142,14 +142,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 5b826ce912..41e7949975 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 @@ -69,7 +69,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/complex.example.com/backups/etcd/events etcdMembers: @@ -81,7 +81,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 1a22a57200..0efad1c7ec 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 8ebdf9f52a..86a597ceda 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data index ae6905d43c..6c1a4cf8e3 100644 --- a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data +++ b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data @@ -131,7 +131,7 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -echo "H4sIAAAAAAAA/+xWXW/bNhe+968g+qJ3tWQ3afpW6I1qZ4mW2PXkZNmuApo8lrlQpHZIKvF+/UBSsp00GTYMK3pRFGjM88Xz8ZyHYlI7PtFqLapsQEhNFa1gaTXSCiaSGgMmIxYdDEAx3DZWaNWZE+WkHIBlfCKdsYDGR4AWlA2/+mgYD4SsKLtzTQkWlA8zpVuTkQ+jTguq7Q2HRNEaMnJ6NZnezvJ5fnZa3k7z4vLX20/55OJ6sbwtT69O51fF53nnQkhLpQMfjwdRC2iEVhk5St4l70NpQn1zad25FeSLYgnYxoSolPp+gaIVEirgXe8JoUqrba2dyZ3dZGRNpQniRuSOC1AMQs+HxEdEBRZMYlqWcFhTJ200jddMtFM2I2Mvc3ajUfxBfeEzzSEjubynW5P7NAaErITiOecIxmRklIR/A0ICahaoW8EBMwIPFlBR6cev6EpCzmthfJ0L6SqhutTmtAbTUAaXYg1syyQE8aWohS2pqgDD2WcpGOSM+USDaBqrOMTlofxKS8BQwxKYVjwqZ85SK1S1S+YGVhut74LyZyoFf1k91xxKMBYF82GDrASjHTL4yWlLfamW8djRrr6NtY3J0nT89n3o1Dg7Ho3Gjy0/t4AoeD+tNK7L/551fTsgZA3UOoQzaqFbqsmymIkqlpvfLDPyykPkVdAV6goBYtPzm+W1QqiEX80DK1HTCjISNbhN7v5vEqFTj5shbYSJUGzHyduTMGuvkGAXCGtAhB4OV9umL6JQcfzFIhzPtbF+UcLh9OFAJ3V1CS3IjPjSEH53YOwGKAcMgAMeIBKj0qpCqKjV+NT29MEiPQ8/fVbioXf5ZVhCrS0Mg8Xwqd8ZatdEv6cOQfXU/tr41Gt43sVrB4QYYA5hodFm5Pj4KEgO8VsY43z/+wnTRiSia1jCdN34ZibwQOtGghd8EeHHm4vldVn8gxCpbkAJnrbj9Lf7O7OP2BF1sQjrlpHxaJScHHvEpeOQelywT5TdgeJZAO5RIKmJVha1lICzPXt6smLUgt+WSTEtzZ6urKVsMwX/f+l3kgkJy61iC0CheUbG9cj8JZGwmKoPG/P8cBLzHO+V80DHLzSRhVfKIUz8HaV2foN2xPl194rtujfsH5/9gskIagmBamIyB7JdTx9vjzPwmCgnCNy/YFT2Y/BXL9kGuJNxXl+3aLO7+t/V2hFQ9vIryCq/vlMUnrmI2RoLNd/JS61tRtK/g7bpfHmwFOPRgUaH74f+mHjg79+7KaxcVQlVnVPFpeeKvhBo4wtyTpFnpIZa4zahLRXS+30cj0Yz8UZpDmvzSPy6Fwr/1/yAAB/fvX4T+v2FaS99ZPufzNvPIi7WgvoJpC3FVIpV2g0p3Rt8gdhG80KtkXoqoUIBFs+Dp6HOQHaUnESfGVViDcZ2F4Jl6f4bJ607rSeTBrUFZi+8TnafBvtJ9NV0G+Gbt9OZjbNc36szpAx6ijoKDPWMaoLCCkblQnPj4WIGNfWRL74D9TtQv22g/gkAAP//AQAA///KG9Hm7w0AAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml +echo "H4sIAAAAAAAA/+xW3W7bNhS+91MQHXpXS3aTZqvQG9XOEi2x68nJsl0FNHksc6FI7ZBU4j39QFKynTQZNgwrelEUaMzzx/PznY9iUjs+0WotqmxASE0VrWBpNdIKJpIaAyYjFh0MQDHcNlZo1ZkT5aQcgGV8Ip2xgMZHgBaUDb/6aBgPhKwou3NNCRaUDzOlW5OR96NOC6rtDYdE0Roycno1md7O8nl+dlreTvPi8rfbj/nk4nqxvC1Pr07nV8WneedCSEulAx+PB1ELaIRWGTlK3iXvQ2lCfXVp3bkV5ItiCdjGhKiU+n6BohUSKuBd7wmhSqttrZ3Jnd1kZE2lCeJG5I4LUAxCz4fER0QFFkxiWpZwWFMnbTSN10y0UzYjYy9zdqNR/El94TPNISO5vKdbk/s0BoSshOI55wjGZGSUhH8DQgJqFqhbwQEzAg8WUFHpx6/oSkLOa2F8nQvpKqG61Oa0BtNQBpdiDWzLJATxpaiFLamqAMPZZykY5Iz5RINoGqs4xOWh/EpLwFDDEphWPCpnzlIrVLVL5gZWG63vgvIXKgV/WT3XHEowFgXzYYOsBKMdMvjZaUt9qZbx2NGuvo21jcnSdPz2+9CpcXY8Go0fW35qAVHwflppXJfvnnV9OyBkDdQ6hDNqoVuqybKYiSqWm98sM/LKQ+RV0BXqCgFi0/Ob5bVCqIRfzQMrUdMKMhI1uE3ufjCJ0KnHzZA2wkQotuPk7UmYtVdIsAuENSBCD4erbdMXUag4/mIRjufaWL8o4XD6cKCTurqEFmRGfGkIfzgwdgOUAwbAAQ8QiVFpVSFU1Gp8anv6YJGeh58+K/HQu/w6LKHWFobBYvjU7wy1a6LfU4egemp/bXzqNTzv4rUDQgwwh7DQaDNyfHwUJIf4LYxxvv/9hGkjEtE1LGG6bnwzE3igdSPBCz6L8NPNxfK6LP5FiFQ3oARP23H6+/2d2UfsiLpYhHXLyHg0Sk6OPeLScUg9LthHyu5A8SwA9yiQ1EQri1pKwNmePT1ZMWrBb8ukmJZmT1fWUraZgv+/9DvJhITlVrEFoNA8I+N6ZP6WSFhM1YeNeb4/iXmO98p5oOMXmsjCK+UQJv6OUju/QTvi/LJ7xXbdG/aPz37BZAS1hEA1MZkD2a6nj7fHGXhMlBME7l8wKvsx+KuXbAPcyTivL1u02V3932rtCCh7+RVklV/fKQrPXMRsjYWa7+Sl1jYj6T9B23S+PFiK8ehAo8P3Q39MPPD3790UVq6qhKrOqeLSc0VfCLTxBTmnyDNSQ61xm9CWCun9PoxHo5l4ozSHtXkkft0Lhf9rfkSAD+9evwn9/sy0lz6y/V/m7WcRF2tB/QTSlmIqxSrthpTuDT5DbKN5odZIPZVQoQCL58HTUGcgO0pOos+MKrEGY7sLwbJ0/42T1p3Wk0mD2gKzF14nu0+D/ST6arqN8M3b6czGWa7v1RlSBj1FHQWGekY1QWEFo3KhufFwMYOa+sgX34D6DahfN1D/AgAA//8BAAD//+WvOXbvDQAA" | base64 -d | gzip -d > conf/cluster_spec.yaml echo "H4sIAAAAAAAA/2zOwUrEMBDG8XueIvelW6peDHhwg+wWskupB8HbkE5rJcmETKLt24v0VNj7/8f3aUdl6BL9zAMmJeGXhXaFM6YbeFTSko8JmY+4gI8Oj5a80BTGeToBo5Ie/ciqru2mdmF9V7eBMwSL50Qlbise/m1VuMrIuWpgH/XkUElNISdynYOA4kYDlrgduQB/KWmW59NHa2OeWV+M/VzNw3XK703zdNArmEN//n7r3fUxta8v4g8AAP//AQAA//8oNJ5B9wAAAA==" | base64 -d | gzip -d > conf/kube_env.yaml 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 ba8f228bb1..8713070b8d 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 @@ -47,7 +47,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/compress.example.com/backups/etcd/events etcdMembers: @@ -59,7 +59,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 d1993a3cf5..62ce3f9085 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 676ba02f94..e792dbbf11 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data index dd6d21521f..71507ea108 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 8cc36008fe..27d52803cf 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 @@ -55,7 +55,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/containerd.example.com/backups/etcd/events etcdMembers: @@ -67,7 +67,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 9fce0271f4..aaff79a39e 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 2fce0234a4..2dd527c77e 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data b/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data index 077f63a68c..92132f3251 100644 --- a/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 54b3a77902..67d8999f31 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 @@ -47,7 +47,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/containerd.example.com/backups/etcd/events etcdMembers: @@ -59,7 +59,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 9fce0271f4..aaff79a39e 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 2fce0234a4..2dd527c77e 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data b/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data index 43c508d2d4..7fc9f702e2 100644 --- a/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data +++ b/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 62b8874540..c8b89f922e 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 @@ -47,7 +47,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/123.example.com/backups/etcd/events etcdMembers: @@ -59,7 +59,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 e2c58aca43..d7eb48d31b 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 c427518a24..257d47e71f 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data index b6031d8c0d..1c83435d32 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data +++ b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_cluster-completed.spec_content index d5d762cb70..d8629bc841 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_cluster-completed.spec_content @@ -53,7 +53,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/docker.example.com/backups/etcd/events etcdMembers: @@ -65,7 +65,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_etcd-cluster-spec-events_content index 4d56ccb4c8..3bde2f95b6 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.7" + "etcdVersion": "3.5.9" } diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_etcd-cluster-spec-main_content index 4d56ccb4c8..3bde2f95b6 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.7" + "etcdVersion": "3.5.9" } diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 0267330d7f..e4ef2ef3d9 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 68bbdb037c..c59c51bbf4 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data index ae93b8430d..673330a9ac 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data @@ -137,7 +137,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 @@ -148,7 +148,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data index 7e69875fdf..bf3961bdef 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data @@ -137,7 +137,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 @@ -148,7 +148,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data index aaa37627f9..a7a129d076 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data @@ -137,7 +137,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 @@ -148,7 +148,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 24dffeb8dd..671a6d559a 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 @@ -55,7 +55,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://tests/existing-iam.example.com/backups/etcd/events etcdMembers: @@ -75,7 +75,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 19826e453c..d880dbd4a4 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.7" + "etcdVersion": "3.5.9" } 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 19826e453c..d880dbd4a4 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.7" + "etcdVersion": "3.5.9" } 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 17591f464c..9874053948 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 4b749a21e7..d9504787ef 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 @@ -82,11 +82,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 e5d9fa1dc4..5ce9465938 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 @@ -84,11 +84,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 0523aacdcb..0ddb35a896 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 11991ba859..6d2c75310d 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 @@ -82,11 +82,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 555f8d54bf..c89e934781 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 @@ -84,11 +84,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data index 7bc04d3169..1046e41c3d 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data @@ -137,7 +137,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 @@ -148,7 +148,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data index ad9e3a8baa..de78fa8405 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data @@ -137,7 +137,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 @@ -148,7 +148,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data index 53803125ae..73afbb94bd 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data @@ -137,7 +137,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 @@ -148,7 +148,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 4ab1baf58e..eed4a3ee20 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 @@ -58,7 +58,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/existingsg.example.com/backups/etcd/events etcdMembers: @@ -78,7 +78,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 19826e453c..d880dbd4a4 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.7" + "etcdVersion": "3.5.9" } 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 19826e453c..d880dbd4a4 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.7" + "etcdVersion": "3.5.9" } 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 0d7230c8e4..f20274b722 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 ae3ff04352..0443a27ea4 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 @@ -83,11 +83,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 73474a8d9e..d7a295c00c 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 @@ -85,11 +85,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 8cd13c9eab..dbf750185d 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 6fb24f2737..eb4164f2e9 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 @@ -83,11 +83,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 58182224a7..3fa0e2c7b3 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 @@ -85,11 +85,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 26092711c3..cf47df5ec7 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 eb34cd51a7..8dc3a55581 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 @@ -47,7 +47,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -59,7 +59,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 9e5c959b43..ac34ae7ab7 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 0e0a58a552..45bfdf6f77 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index ce52ec1e72..225b9c9f23 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 8664a8b967..36372f4ac2 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 @@ -47,7 +47,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -59,7 +59,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 9e5c959b43..ac34ae7ab7 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 0e0a58a552..45bfdf6f77 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data index c7d633e168..061bd8083e 100644 --- a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data +++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 1808d9f6ec..137df52f54 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 @@ -47,7 +47,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/externallb.example.com/backups/etcd/events etcdMembers: @@ -59,7 +59,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 8f4a9b85ef..bd4e8a397e 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 81d158fb3f..39f7cec1b5 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data index 637ef8b258..213659611f 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data +++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 e1095681f2..9f291ae719 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 @@ -55,7 +55,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/externalpolicies.example.com/backups/etcd/events etcdMembers: @@ -67,7 +67,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 fa536f5742..46dd757196 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 db9019d9cc..afc5f9c2e9 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data index 2af4eaceba..f7be182aec 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data @@ -137,7 +137,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 @@ -148,7 +148,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data index 645f087adf..0b478bf693 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data @@ -137,7 +137,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 @@ -148,7 +148,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data index a47b3dc4e9..9ce34098d7 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data @@ -137,7 +137,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 @@ -148,7 +148,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 b05efd5b1e..238f5814ac 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 @@ -55,7 +55,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://tests/ha.example.com/backups/etcd/events etcdMembers: @@ -75,7 +75,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 19826e453c..d880dbd4a4 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.7" + "etcdVersion": "3.5.9" } 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 19826e453c..d880dbd4a4 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.7" + "etcdVersion": "3.5.9" } 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 8274d55ee7..0b3b41d4ce 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 e59a3ddf78..3650c63c72 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 @@ -82,11 +82,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 b197fe6983..1bfb3785a3 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 @@ -84,11 +84,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 44d26ac6ef..86d7d201cd 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 bac90c68f7..b459488bf3 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 @@ -82,11 +82,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 021a9e8567..e1e22e6b97 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 @@ -84,11 +84,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 846f9c830a..ecb8ee092c 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 @@ -60,7 +60,7 @@ spec: value: 90d memoryRequest: 100Mi name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://tests/ha-gce.example.com/backups/etcd/events cpuRequest: 100m @@ -82,7 +82,7 @@ spec: value: 90d memoryRequest: 100Mi name: events - version: 3.5.7 + version: 3.5.9 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 19826e453c..d880dbd4a4 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.7" + "etcdVersion": "3.5.9" } 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 19826e453c..d880dbd4a4 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.7" + "etcdVersion": "3.5.9" } 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 df32e32b11..6ff3cd5d4e 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 668642d03f..bebe875e67 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 @@ -82,11 +82,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 e9778de643..dea93cf0dc 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 @@ -84,11 +84,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 fd5b57c1f6..a74c8a8ef3 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 4b124f85f4..2ca088e753 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 @@ -82,11 +82,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 016589d82a..177db41cd0 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 @@ -84,11 +84,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script index 47e872ca03..2be54644c9 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script @@ -138,7 +138,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 main: cpuRequest: 200m manager: @@ -151,7 +151,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script index 45700598aa..3801e0cdaa 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script @@ -138,7 +138,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 main: cpuRequest: 200m manager: @@ -151,7 +151,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script index ceba71e822..3a79236768 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script @@ -138,7 +138,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 main: cpuRequest: 200m manager: @@ -151,7 +151,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index ce52ec1e72..225b9c9f23 100644 --- a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 d627f4da41..10976ed607 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 @@ -49,7 +49,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -61,7 +61,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 9e5c959b43..ac34ae7ab7 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 0e0a58a552..45bfdf6f77 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 4bfe032916..1b85e79e31 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 06a4d2c56a..647888df8f 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 @@ -47,7 +47,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -59,7 +59,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 9e5c959b43..ac34ae7ab7 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 0e0a58a552..45bfdf6f77 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 847355515d..4962179782 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 681a32df88..d5bd8a57b7 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 @@ -67,7 +67,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -79,7 +79,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 9e5c959b43..ac34ae7ab7 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 0e0a58a552..45bfdf6f77 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 5bcd440cc1..597041f7d7 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content index 84f0270472..7943672c54 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content @@ -67,7 +67,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -79,7 +79,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_etcd-cluster-spec-events_content index 4d56ccb4c8..3bde2f95b6 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.7" + "etcdVersion": "3.5.9" } diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_etcd-cluster-spec-main_content index 4d56ccb4c8..3bde2f95b6 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.7" + "etcdVersion": "3.5.9" } diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 9e5c959b43..ac34ae7ab7 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 0e0a58a552..45bfdf6f77 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 7bb75b2026..e3f23fb84b 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content index e00b74338e..b93fc2ed7c 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content @@ -68,7 +68,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -80,7 +80,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_etcd-cluster-spec-events_content index 4d56ccb4c8..3bde2f95b6 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.7" + "etcdVersion": "3.5.9" } diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_etcd-cluster-spec-main_content index 4d56ccb4c8..3bde2f95b6 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.7" + "etcdVersion": "3.5.9" } diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 9e5c959b43..ac34ae7ab7 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 0e0a58a552..45bfdf6f77 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index e71f65a819..f0e65609ae 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 4485e6ad44..689e3d373c 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 @@ -67,7 +67,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -79,7 +79,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 9e5c959b43..ac34ae7ab7 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 0e0a58a552..45bfdf6f77 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 5d03f96af3..57be549f18 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 ec34692b34..e3b33489f6 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 @@ -67,7 +67,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -79,7 +79,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 9e5c959b43..ac34ae7ab7 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 0e0a58a552..45bfdf6f77 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 91cade85fe..91be5afc4a 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 c59e37ee63..063a62bf00 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 @@ -67,7 +67,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -79,7 +79,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 9e5c959b43..ac34ae7ab7 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 0e0a58a552..45bfdf6f77 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 a10b40695e..5a533febf2 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 @@ -69,7 +69,7 @@ spec: value: 90d memoryRequest: 100Mi name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://tests/minimal.example.com/backups/etcd/events cpuRequest: 100m @@ -83,7 +83,7 @@ spec: value: 90d memoryRequest: 100Mi name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 cf60d522d6..3132f87114 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 e9a61a44c7..b1e2c4db7e 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script index 269575c4c6..fa5796af62 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script @@ -134,7 +134,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 main: cpuRequest: 200m manager: @@ -143,7 +143,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 91cade85fe..91be5afc4a 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 04778d4ebc..920b80a061 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 @@ -68,7 +68,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -80,7 +80,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 9e5c959b43..ac34ae7ab7 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 0e0a58a552..45bfdf6f77 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index d0049d66e9..ba64b5f805 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -135,7 +135,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 main: cpuRequest: 200m manager: @@ -144,7 +144,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content index 246e5114b3..662b21cfe3 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content @@ -42,7 +42,7 @@ spec: value: 90d memoryRequest: 100Mi name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://tests/minimal.example.com/backups/etcd/events cpuRequest: 100m @@ -57,7 +57,7 @@ spec: value: 90d memoryRequest: 100Mi name: events - version: 3.5.7 + version: 3.5.9 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_etcd-cluster-spec-events_content index 4d56ccb4c8..3bde2f95b6 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.7" + "etcdVersion": "3.5.9" } diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_etcd-cluster-spec-main_content index 4d56ccb4c8..3bde2f95b6 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.7" + "etcdVersion": "3.5.9" } diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index ea93688859..e0cb8be7f4 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 9c318b73c3..a268a737c2 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index cf54bba3a8..7ea4208d10 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -135,7 +135,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 main: cpuRequest: 200m manager: @@ -144,7 +144,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content index ef72d6869c..380216cf9a 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content @@ -51,7 +51,7 @@ spec: value: 90d memoryRequest: 100Mi name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://tests/minimal.example.com/backups/etcd/events cpuRequest: 100m @@ -66,7 +66,7 @@ spec: value: 90d memoryRequest: 100Mi name: events - version: 3.5.7 + version: 3.5.9 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_etcd-cluster-spec-events_content index 4d56ccb4c8..3bde2f95b6 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.7" + "etcdVersion": "3.5.9" } diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_etcd-cluster-spec-main_content index 4d56ccb4c8..3bde2f95b6 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.7" + "etcdVersion": "3.5.9" } diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index ea93688859..e0cb8be7f4 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 9c318b73c3..a268a737c2 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 3116cf31af..ae97fea256 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -135,7 +135,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 main: cpuRequest: 200m manager: @@ -144,7 +144,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 14cfde09bb..b39d041f9b 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 @@ -50,7 +50,7 @@ spec: value: 90d memoryRequest: 100Mi name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://tests/minimal.example.com/backups/etcd/events cpuRequest: 100m @@ -65,7 +65,7 @@ spec: value: 90d memoryRequest: 100Mi name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 ea93688859..e0cb8be7f4 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 9c318b73c3..a268a737c2 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 0b94eb8712..791c1a018b 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -135,7 +135,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 main: cpuRequest: 200m manager: @@ -144,7 +144,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 35cd25461d..0797f17788 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 @@ -50,7 +50,7 @@ spec: value: 90d memoryRequest: 100Mi name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://tests/minimal.example.com/backups/etcd/events cpuRequest: 100m @@ -65,7 +65,7 @@ spec: value: 90d memoryRequest: 100Mi name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 ea93688859..e0cb8be7f4 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 9c318b73c3..a268a737c2 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 60dc8ad788..722e9b74f2 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -135,7 +135,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 main: cpuRequest: 200m manager: @@ -144,7 +144,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 0984d46ab9..accee8c53a 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 @@ -51,7 +51,7 @@ spec: value: 90d memoryRequest: 100Mi name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://tests/minimal.example.com/backups/etcd/events cpuRequest: 100m @@ -66,7 +66,7 @@ spec: value: 90d memoryRequest: 100Mi name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 ea93688859..e0cb8be7f4 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 9c318b73c3..a268a737c2 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data index a91ce60f9f..16cd4c455a 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data @@ -139,7 +139,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc - version: 3.5.7 + version: 3.5.9 main: etcdMembers: - name: us-test-1a @@ -151,7 +151,7 @@ etcdClusters: value: 90d image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc logLevel: 10 - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 b36f8e0adc..3bf165d3c1 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 @@ -50,7 +50,7 @@ spec: image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc logLevel: 10 name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal-etcd.example.com/backups/etcd/events etcdMembers: @@ -66,7 +66,7 @@ spec: value: 90d image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 1685b88dcf..811104b53b 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 @@ -83,11 +83,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 7dc0ded08b..efd6a408db 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 14cc007c77..7deef47c8d 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -136,7 +136,7 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: etcdMembers: - name: us-test-1a @@ -146,7 +146,7 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 b37052f4eb..72824fed91 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 @@ -51,7 +51,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -65,7 +65,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 9e5c959b43..ac34ae7ab7 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 0e0a58a552..45bfdf6f77 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 130a7f70fb..38c5dd0014 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 01137362a8..ea4cfa5c10 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 @@ -52,7 +52,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal-ipv6.example.com/backups/etcd/events etcdMembers: @@ -64,7 +64,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 bd50364797..27a285c25c 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 6037d4a038..15a4796124 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index ad9d34f8d8..c4bd803b3a 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 84ef74a768..7426f737b1 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 @@ -52,7 +52,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal-ipv6.example.com/backups/etcd/events etcdMembers: @@ -64,7 +64,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 bd50364797..27a285c25c 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 6037d4a038..15a4796124 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 002dedda60..66fc6ad7cd 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 1bbe37dab8..a63bcf4458 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 @@ -52,7 +52,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal-ipv6.example.com/backups/etcd/events etcdMembers: @@ -64,7 +64,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 bd50364797..27a285c25c 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 6037d4a038..15a4796124 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 002dedda60..66fc6ad7cd 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 4392fdc68a..dea8e34ac5 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 @@ -52,7 +52,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal-ipv6.example.com/backups/etcd/events etcdMembers: @@ -64,7 +64,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 bd50364797..27a285c25c 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 6037d4a038..15a4796124 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data index 516f7b17d1..03069630b0 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 fb1395064a..c279b612e7 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 @@ -47,7 +47,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/backups/etcd/events etcdMembers: @@ -59,7 +59,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 7dc5e09aad..78b5613c9a 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 596cab55e1..233fff360a 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data index 812321ca21..14ad9c2b3c 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 17d26b76ec..916e88743a 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 @@ -47,7 +47,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal-warmpool.example.com/backups/etcd/events etcdMembers: @@ -59,7 +59,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 989e9fabe7..136c93bdf2 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 5abeafc85c..844107551a 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index dd1e53de6f..76e0a31e42 100644 --- a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content index 471f8502c0..10c5c2c39f 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content @@ -47,7 +47,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -59,7 +59,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 externalDns: provider: dns-controller keyStore: memfs://clusters.example.com/minimal.example.com/pki diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_etcd-cluster-spec-events_content index 4d56ccb4c8..3bde2f95b6 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.7" + "etcdVersion": "3.5.9" } diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_etcd-cluster-spec-main_content index 4d56ccb4c8..3bde2f95b6 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.7" + "etcdVersion": "3.5.9" } diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 9e5c959b43..ac34ae7ab7 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 0e0a58a552..45bfdf6f77 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 e2a187f7ac..e6a9f21653 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 @@ -52,7 +52,7 @@ spec: value: 90d memoryRequest: 100Mi name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://tests/minimal-gce.example.com/backups/etcd/events cpuRequest: 100m @@ -66,7 +66,7 @@ spec: value: 90d memoryRequest: 100Mi name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 3ee76cedb7..f6afc93998 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 acbcb912bb..6c2993d791 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script index 441569f5e7..791fc77078 100644 --- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script @@ -134,7 +134,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 main: cpuRequest: 200m manager: @@ -143,7 +143,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 b03943ce28..946f2d065a 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 @@ -55,7 +55,7 @@ spec: value: 90d memoryRequest: 100Mi name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://tests/minimal-gce.example.com/backups/etcd/events cpuRequest: 100m @@ -69,7 +69,7 @@ spec: value: 90d memoryRequest: 100Mi name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 3ee76cedb7..f6afc93998 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 acbcb912bb..6c2993d791 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script index 6bbc3f53a5..77505f618c 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script @@ -134,7 +134,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 main: cpuRequest: 200m manager: @@ -143,7 +143,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 3a806e82e4..c807ef066d 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 @@ -56,7 +56,7 @@ spec: value: 90d memoryRequest: 100Mi name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://tests/minimal-gce-ilb.example.com/backups/etcd/events cpuRequest: 100m @@ -70,7 +70,7 @@ spec: value: 90d memoryRequest: 100Mi name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 cfc31f05c8..8f6adad62c 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 aa4d98c1a1..a198ae214b 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script index 9a3c30e15d..024b5618c3 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script @@ -134,7 +134,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 main: cpuRequest: 200m manager: @@ -143,7 +143,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 a0f3d1e6a1..7b530b6d3a 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 @@ -56,7 +56,7 @@ spec: value: 90d memoryRequest: 100Mi name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com/backups/etcd/events cpuRequest: 100m @@ -70,7 +70,7 @@ spec: value: 90d memoryRequest: 100Mi name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 3737f6516f..f872d73404 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 a1d0bbcdc3..6a2b99cb91 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script index 0d05741a04..3b32fb336e 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script @@ -134,7 +134,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 main: cpuRequest: 200m manager: @@ -143,7 +143,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 d891f665ce..eecce816e2 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 @@ -52,7 +52,7 @@ spec: value: 90d memoryRequest: 100Mi name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com/backups/etcd/events cpuRequest: 100m @@ -66,7 +66,7 @@ spec: value: 90d memoryRequest: 100Mi name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 3737f6516f..f872d73404 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 a1d0bbcdc3..6a2b99cb91 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script index 0d05741a04..3b32fb336e 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script @@ -134,7 +134,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 main: cpuRequest: 200m manager: @@ -143,7 +143,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 4176dc040b..04cee6f3eb 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 @@ -56,7 +56,7 @@ spec: value: 90d memoryRequest: 100Mi name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://tests/minimal-gce-plb.example.com/backups/etcd/events cpuRequest: 100m @@ -70,7 +70,7 @@ spec: value: 90d memoryRequest: 100Mi name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 11784cccec..fd2f847903 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 470f5e56bc..424a48bf09 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script index 2a86186fa4..2c1c10ce56 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script @@ -134,7 +134,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 main: cpuRequest: 200m manager: @@ -143,7 +143,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 790e1a3cc7..f4bb421179 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 @@ -52,7 +52,7 @@ spec: value: 90d memoryRequest: 100Mi name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://tests/minimal-gce-private.example.com/backups/etcd/events cpuRequest: 100m @@ -66,7 +66,7 @@ spec: value: 90d memoryRequest: 100Mi name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 d993fd12db..b73efd7f94 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 57b2a07fdf..995a5e7532 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script index 33488761bc..1311057e60 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script @@ -134,7 +134,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 main: cpuRequest: 200m manager: @@ -143,7 +143,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data index 5b7e2d2635..9515ba8ee0 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 c6d941b3c3..d42db346c9 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 @@ -46,7 +46,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal.k8s.local/backups/etcd/events etcdMembers: @@ -58,7 +58,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 295a2e5b02..d3c5e789c9 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 543dc03ccb..0a7dd578fe 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data index e699837a67..baf0b5760c 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 0701c82f5a..6c72e3e772 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 @@ -46,7 +46,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal.k8s.local/backups/etcd/events etcdMembers: @@ -58,7 +58,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 295a2e5b02..d3c5e789c9 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 543dc03ccb..0a7dd578fe 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 bf6f2dfe35..74467d0f3f 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 @@ -47,7 +47,7 @@ spec: value: 90d memoryRequest: 100Mi name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://tests/minimal.example.com/backups/etcd/events cpuRequest: 100m @@ -61,7 +61,7 @@ spec: value: 90d memoryRequest: 100Mi name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 2b91ee680e..a7af9ef21d 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 @@ -82,11 +82,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 6399de4718..bddf324719 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 @@ -82,11 +82,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data index 0520672c95..429078bb0e 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data +++ b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data @@ -135,7 +135,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 main: cpuRequest: 200m manager: @@ -144,7 +144,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 c05c4a79a6..c55e2f24a9 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 @@ -38,7 +38,7 @@ spec: value: 90d memoryRequest: 100Mi name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://tests/scw-minimal.k8s.local/backups/etcd/events cpuRequest: 100m @@ -52,7 +52,7 @@ spec: value: 90d memoryRequest: 100Mi name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 8ff5795298..25c05dd40d 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 @@ -84,11 +84,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 e7845b6759..739d8a6891 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 @@ -84,11 +84,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data index a185cbd886..ded26f2256 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data +++ b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data @@ -137,7 +137,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 main: cpuRequest: 200m manager: @@ -146,7 +146,7 @@ etcdClusters: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d memoryRequest: 100Mi - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index 9911460c63..1a9c76ee1e 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -137,7 +137,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 @@ -148,7 +148,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index 0d406f628d..6840a0b0a6 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -137,7 +137,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 @@ -148,7 +148,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index a9eb91685a..e01672b0fd 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -137,7 +137,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 @@ -148,7 +148,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 131c6f3386..864dd32411 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 @@ -55,7 +55,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/mixedinstances.example.com/backups/etcd/events etcdMembers: @@ -75,7 +75,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 19826e453c..d880dbd4a4 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.7" + "etcdVersion": "3.5.9" } 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 19826e453c..d880dbd4a4 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.7" + "etcdVersion": "3.5.9" } 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 f522f7d7f4..4a28a73e11 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 39af852c99..322dafdcd7 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 @@ -83,11 +83,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 cd085275e7..1fcdfe88e4 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 @@ -85,11 +85,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 ac7b128c19..f1eac36b24 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 9e73078cf5..3c61d93006 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 @@ -83,11 +83,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 f01ab075b0..82b459868b 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 @@ -85,11 +85,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index 9911460c63..1a9c76ee1e 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -137,7 +137,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 @@ -148,7 +148,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index 0d406f628d..6840a0b0a6 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -137,7 +137,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 @@ -148,7 +148,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index a9eb91685a..e01672b0fd 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -137,7 +137,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 @@ -148,7 +148,7 @@ etcdClusters: value: 90d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 131c6f3386..864dd32411 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 @@ -55,7 +55,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/mixedinstances.example.com/backups/etcd/events etcdMembers: @@ -75,7 +75,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 19826e453c..d880dbd4a4 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.7" + "etcdVersion": "3.5.9" } 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 19826e453c..d880dbd4a4 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.7" + "etcdVersion": "3.5.9" } 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 f522f7d7f4..4a28a73e11 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 39af852c99..322dafdcd7 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 @@ -83,11 +83,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 cd085275e7..1fcdfe88e4 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 @@ -85,11 +85,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 ac7b128c19..f1eac36b24 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 9e73078cf5..3c61d93006 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 @@ -83,11 +83,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 f01ab075b0..82b459868b 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 @@ -85,11 +85,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data index 17366a5aa1..b934124325 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 63bfe54737..f1fbd1a5de 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 @@ -47,7 +47,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com/backups/etcd/events etcdMembers: @@ -59,7 +59,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 b654edcb4b..143f159e9d 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 ea8dd791a7..be5b15f071 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data index b57efed464..9b2ad589a3 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 caa7a5696f..37d129cc32 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 @@ -47,7 +47,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com/backups/etcd/events etcdMembers: @@ -59,7 +59,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 b654edcb4b..143f159e9d 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 ea8dd791a7..be5b15f071 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 24d7ca039f..6f5b242a40 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 ab0b22f9b6..d0e89b8b28 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 @@ -50,7 +50,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -62,7 +62,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 9e5c959b43..ac34ae7ab7 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 0e0a58a552..45bfdf6f77 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data index 1ffc2e81f2..26e1626e35 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 35f05b6ed9..8490b4471d 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 @@ -49,7 +49,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/private-shared-ip.example.com/backups/etcd/events etcdMembers: @@ -61,7 +61,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 299ccc0a60..f70b962994 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 5bbac42a1d..09b512da94 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data index b5ba409382..36b96bcf5d 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 f301f3fdf5..5c34d9b0d6 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 @@ -49,7 +49,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/private-shared-subnet.example.com/backups/etcd/events etcdMembers: @@ -61,7 +61,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 2ae980e39c..452e026611 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 442a9ec3c1..687029b1ba 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data index b44fcb4b19..3c0f015439 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data +++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 0686bf1bb6..bfee9c6a3e 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 @@ -49,7 +49,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/privatecalico.example.com/backups/etcd/events etcdMembers: @@ -61,7 +61,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 a88ca58b0b..213bafefa4 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 07cc4c789f..ec7d399eb7 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data index 44450bd551..739b76072c 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data +++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 41f68aa9e4..18cc55910b 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 @@ -49,7 +49,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/privatecanal.example.com/backups/etcd/events etcdMembers: @@ -61,7 +61,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4c892c99a9..82cd3dc714 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 92a5e29bc9..83844b832d 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index afc79a0b6c..105de6b13c 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 bd1bebc8d8..e7c2d2b595 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 @@ -49,7 +49,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/privatecilium.example.com/backups/etcd/events etcdMembers: @@ -61,7 +61,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 e910d4f93e..c623a19745 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 9c84b508bb..b74b775b0c 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index 71b4b7c843..96f96019b8 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 23084a1116..10e1f0f45b 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 @@ -49,7 +49,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/privatecilium.example.com/backups/etcd/events etcdMembers: @@ -61,7 +61,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 e910d4f93e..c623a19745 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 9c84b508bb..b74b775b0c 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index fb95bc8400..847e4ebcbd 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 db57e23f8e..00b25aad85 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 @@ -52,7 +52,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/privatecilium.example.com/backups/etcd/events etcdMembers: @@ -64,7 +64,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 e910d4f93e..c623a19745 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 9c84b508bb..b74b775b0c 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data index ed61973651..42b14a36ff 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data @@ -133,21 +133,21 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 events: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 721ec36332..d76523dc78 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 @@ -49,7 +49,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/privateciliumadvanced.example.com/backups/etcd/events etcdMembers: @@ -61,7 +61,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/privateciliumadvanced.example.com/backups/etcd/cilium etcdMembers: @@ -73,7 +73,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: cilium - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 7701433caf..c246d24cd9 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 64ee944a44..8d8ba30a28 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 c93127eac5..e9bfe5ed34 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data index e4da92ba9b..3dd2bd4ed1 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data +++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 15acb1115f..81786a144f 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 @@ -42,7 +42,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/privatedns1.example.com/backups/etcd/events etcdMembers: @@ -54,7 +54,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 5e3cc8f559..5d32266a6e 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 77dde514f9..6ead4a1350 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data index 2bfe0654a2..9537552ae9 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data +++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 7726596222..302522fa0c 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 @@ -49,7 +49,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/privatedns2.example.com/backups/etcd/events etcdMembers: @@ -61,7 +61,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 d21394211d..2a5cceb1c6 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 4e72b1893f..34b325e03c 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data index fa5a100a3f..133ee5326d 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data +++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 e461edb4e4..a26695b01f 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 @@ -49,7 +49,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/privateflannel.example.com/backups/etcd/events etcdMembers: @@ -61,7 +61,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 ba31f633ab..e3be1e7c38 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 8a32d92786..cda672daef 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data index 020c3b68f6..e82e0ee972 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data +++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 7f21642082..49a78c16f8 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 @@ -49,7 +49,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/privatekopeio.example.com/backups/etcd/events etcdMembers: @@ -61,7 +61,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 ec4632994a..fe1dbd2649 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 fd9b8d9693..33140edaef 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data index cd4ce67f97..0d9d4e6a3f 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data +++ b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_cluster-completed.spec_content index 2ecf6d87ef..95b612229c 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_cluster-completed.spec_content @@ -39,7 +39,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/privateweave.example.com/backups/etcd/events etcdMembers: @@ -51,7 +51,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 externalDns: provider: dns-controller iam: diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_etcd-cluster-spec-events_content index 4d56ccb4c8..3bde2f95b6 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.7" + "etcdVersion": "3.5.9" } diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_etcd-cluster-spec-main_content index 4d56ccb4c8..3bde2f95b6 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.5.7" + "etcdVersion": "3.5.9" } diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index af6b8d832e..8672a4b1bf 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index eff10aa481..35df7eb6af 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 6d7bc68000..b8cc97cc54 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 02ac128eaa..fff6b41534 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 @@ -48,7 +48,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -60,7 +60,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 9e5c959b43..ac34ae7ab7 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 0e0a58a552..45bfdf6f77 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data index afa03a823a..0955da2e6d 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data +++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 a2cc095feb..243b4e5c8f 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 @@ -47,7 +47,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/sharedsubnet.example.com/backups/etcd/events etcdMembers: @@ -59,7 +59,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 01a0045887..03007775b4 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 78b90eadac..b8e377dccc 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data index 097e82138e..8949b16fa1 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 7425696f88..125a24c5a7 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 @@ -47,7 +47,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/sharedvpc.example.com/backups/etcd/events etcdMembers: @@ -59,7 +59,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 692a74886a..94551193ea 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 1deeb71381..7ebb4f8fa9 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 002dedda60..66fc6ad7cd 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 9d64e4f7d1..f452e85ccd 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 @@ -52,7 +52,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal-ipv6.example.com/backups/etcd/events etcdMembers: @@ -64,7 +64,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 bd50364797..27a285c25c 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 6037d4a038..15a4796124 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 @@ -81,11 +81,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data index dcb79c3b27..54e4107154 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data +++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 d01a103572..a28248858a 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 @@ -49,7 +49,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/unmanaged.example.com/backups/etcd/events etcdMembers: @@ -61,7 +61,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 551bf16d80..aa88edb625 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 1f07683f3d..e005d52c52 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt diff --git a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index ce52ec1e72..225b9c9f23 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -133,14 +133,14 @@ etcdClusters: env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 main: manager: backupRetentionDays: 90 env: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d - version: 3.5.7 + version: 3.5.9 kubeAPIServer: allowPrivileged: true anonymousAuth: false 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 d99643aaf2..7d4908917d 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 @@ -47,7 +47,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: main - version: 3.5.7 + version: 3.5.9 - backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events etcdMembers: @@ -59,7 +59,7 @@ spec: - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION value: 90d name: events - version: 3.5.7 + version: 3.5.9 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 4d56ccb4c8..3bde2f95b6 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.7" + "etcdVersion": "3.5.9" } 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 9e5c959b43..ac34ae7ab7 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 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 0e0a58a552..45bfdf6f77 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 @@ -80,11 +80,11 @@ spec: name: bin - args: - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.7/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.7/etcdctl + - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl command: - /bin/sh - image: registry.k8s.io/etcd:3.5.7-0 - name: init-etcd-3-5-7 + image: registry.k8s.io/etcd:3.5.9-0 + name: init-etcd-3-5-9 resources: {} volumeMounts: - mountPath: /opt From f51e347f99be952a47aec04c2401834496f38e22 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 21 May 2023 08:00:01 +0300 Subject: [PATCH 3/6] Build and use cp replacement --- Makefile | 42 +++++++++- cmd/kops-copy/main.go | 81 ++++++++++++++++++ hack/set-version | 2 + pkg/model/components/etcdmanager/model.go | 29 ++++--- .../etcdmanager/tests/interval/tasks.yaml | 82 ++++++++++++------- .../etcdmanager/tests/minimal/tasks.yaml | 82 ++++++++++++------- .../tests/overwrite_settings/tasks.yaml | 82 ++++++++++++------- .../etcdmanager/tests/proxy/tasks.yaml | 82 ++++++++++++------- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1b_content | 41 ++++++---- ...cdmanager-events-master-us-test-1c_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1b_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1c_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1b_content | 41 ++++++---- ...cdmanager-events-master-us-test-1c_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1b_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1c_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1b_content | 41 ++++++---- ...cdmanager-events-master-us-test-1c_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1b_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1c_content | 41 ++++++---- ...cdmanager-events-master-us-test1-a_content | 41 ++++++---- ...cdmanager-events-master-us-test1-b_content | 41 ++++++---- ...cdmanager-events-master-us-test1-c_content | 41 ++++++---- ...etcdmanager-main-master-us-test1-a_content | 41 ++++++---- ...etcdmanager-main-master-us-test1-b_content | 41 ++++++---- ...etcdmanager-main-master-us-test1-c_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test1-a_content | 41 ++++++---- ...etcdmanager-main-master-us-test1-a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test1-a_content | 41 ++++++---- ...etcdmanager-main-master-us-test1-a_content | 41 ++++++---- ...cdmanager-events-master-us-test1-a_content | 41 ++++++---- ...etcdmanager-main-master-us-test1-a_content | 41 ++++++---- ...cdmanager-events-master-us-test1-a_content | 41 ++++++---- ...etcdmanager-main-master-us-test1-a_content | 41 ++++++---- ...cdmanager-events-master-us-test1-a_content | 41 ++++++---- ...etcdmanager-main-master-us-test1-a_content | 41 ++++++---- ...cdmanager-events-master-us-test1-a_content | 41 ++++++---- ...etcdmanager-main-master-us-test1-a_content | 41 ++++++---- ...cdmanager-events-master-us-test1-a_content | 41 ++++++---- ...etcdmanager-main-master-us-test1-a_content | 41 ++++++---- ...cdmanager-events-master-us-test1-a_content | 41 ++++++---- ...etcdmanager-main-master-us-test1-a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...sts-etcdmanager-events-master-fsn1_content | 41 ++++++---- ...fests-etcdmanager-main-master-fsn1_content | 41 ++++++---- ...ager-events-control-plane-fr-par-1_content | 41 ++++++---- ...anager-main-control-plane-fr-par-1_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1b_content | 41 ++++++---- ...cdmanager-events-master-us-test-1c_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1b_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1c_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1b_content | 41 ++++++---- ...cdmanager-events-master-us-test-1c_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1b_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1c_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-cilium-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- ...cdmanager-events-master-us-test-1a_content | 41 ++++++---- ...etcdmanager-main-master-us-test-1a_content | 41 ++++++---- tools/get_workspace_status.sh | 6 +- upup/pkg/fi/cloudup/apply_cluster.go | 2 +- 193 files changed, 5302 insertions(+), 2691 deletions(-) create mode 100644 cmd/kops-copy/main.go diff --git a/Makefile b/Makefile index b329496714..9692949523 100644 --- a/Makefile +++ b/Makefile @@ -65,6 +65,9 @@ GITSHA := $(shell cd ${KOPS_ROOT}; git describe --always) # We lock the versions of our controllers also # We need to keep in sync with: +# pkg/model/components/etcdmanager/model.go +KOPS_COPY_TAG=1.27.0-alpha.2 +KOPS_COPY_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_COPY_TAG | awk '{print $$2}') # upup/models/cloudup/resources/addons/dns-controller/ DNS_CONTROLLER_TAG=1.27.0-alpha.2 DNS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_DNS_CONTROLLER_TAG | awk '{print $$2}') @@ -112,7 +115,7 @@ nodeup-install: nodeup all-install: all kops-install channels-install nodeup-install .PHONY: all -all: kops protokube nodeup channels ko-kops-controller-export ko-dns-controller-export ko-kube-apiserver-healthcheck-export +all: kops protokube nodeup channels ko-kops-controller-export ko-dns-controller-export ko-kops-copy-export ko-kube-apiserver-healthcheck-export include tests/e2e/e2e.mk @@ -305,6 +308,13 @@ dns-controller-push: ko-dns-controller-push ko-dns-controller-push: KO_DOCKER_REPO="${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}dns-controller" GOFLAGS="-tags=peer_name_alternative,peer_name_hash" ${KO} build --tags ${DNS_CONTROLLER_PUSH_TAG} --platform=linux/amd64,linux/arm64 --bare ./dns-controller/cmd/dns-controller/ +.PHONY: kops-copy-push +kops-copy-push-push: ko-kops-copy-push + +.PHONY: ko-kops-copy-push +ko-kops-copy-push: + KO_DOCKER_REPO="${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kops-copy" ${KO} build --tags ${KOPS_COPY_PUSH_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/kops-copy/ + # -------------------------------------------------- # development targets @@ -541,6 +551,17 @@ ko-dns-controller-export-linux-amd64 ko-dns-controller-export-linux-arm64: ko-dn ko-dns-controller-export: ko-dns-controller-export-linux-amd64 ko-dns-controller-export-linux-arm64 echo "Done exporting dns-controller images" +.PHONY: ko-kops-copy-export-linux-amd64 ko-kops-copy-export-linux-arm64 +ko-kops-copy-export-linux-amd64 ko-kops-copy-export-linux-arm64: ko-kops-copy-export-linux-%: + mkdir -p ${IMAGES} + KO_DOCKER_REPO="registry.k8s.io/kops" ${KO} build --tags ${KOPS_COPY_TAG} --platform=linux/$* -B --push=false --tarball=${IMAGES}/kops-copy-$*.tar ./cmd/kops-copy/ + gzip -f ${IMAGES}/kops-copy-$*.tar + tools/sha256 ${IMAGES}/kops-copy-$*.tar.gz ${IMAGES}/kops-copy-$*.tar.gz.sha256 + +.PHONY: ko-kops-copy-export +ko-kops-copy-export: ko-kops-copy-export-linux-amd64 ko-kops-copy-export-linux-arm64 + echo "Done exporting kops-copy images" + .PHONY: version-dist version-dist: dev-version-dist-amd64 dev-version-dist-arm64 crossbuild mkdir -p ${UPLOAD}/kops/${VERSION}/linux/amd64/ @@ -696,11 +717,28 @@ dev-upload-dns-controller: version-dist-dns-controller dev-upload-dns-controller-amd64 dev-upload-dns-controller-arm64: dev-upload-dns-controller-%: version-dist-dns-controller-% ${UPLOAD_CMD} ${UPLOAD}/ ${UPLOAD_DEST} +# dev-upload-kops-copy uploads kops-copy +.PHONY: version-dist-kops-copy version-dist-kops-copy-amd64 version-dist-kops-copy-arm64 +version-dist-kops-copy: version-dist-kops-copy-amd64 version-dist-kops-copy-arm64 + +version-dist-kops-copy-amd64 version-dist-kops-copy-arm64: version-dist-kops-copy-%: ko-kops-copy-export-linux-% + mkdir -p ${UPLOAD}/kops/${VERSION}/images/ + cp -fp ${IMAGES}/kops-copy-$*.tar.gz ${UPLOAD}/kops/${VERSION}/images/kops-copy-$*.tar.gz + cp -fp ${IMAGES}/kops-copy-$*.tar.gz.sha256 ${UPLOAD}/kops/${VERSION}/images/kops-copy-$*.tar.gz.sha256 + +.PHONY: dev-upload-kops-copy +dev-upload-kops-copy: version-dist-kops-copy + ${UPLOAD_CMD} ${UPLOAD}/ ${UPLOAD_DEST} + +.PHONY: dev-upload-kops-copy-amd64 dev-upload-kops-copy-arm64 +dev-upload-kops-copy-amd64 dev-upload-kops-copy-arm64: dev-upload-kops-copy-%: version-dist-kops-copy-% + ${UPLOAD_CMD} ${UPLOAD}/ ${UPLOAD_DEST} + # dev-upload-linux-amd64 does a faster build and uploads to GCS / S3 .PHONY: dev-version-dist dev-version-dist-amd64 dev-version-dist-arm64 dev-version-dist: dev-version-dist-amd64 dev-version-dist-arm64 -dev-version-dist-amd64 dev-version-dist-arm64: dev-version-dist-%: version-dist-nodeup-% version-dist-channels-% version-dist-protokube-% version-dist-kops-controller-% version-dist-kube-apiserver-healthcheck-% version-dist-dns-controller-% +dev-version-dist-amd64 dev-version-dist-arm64: dev-version-dist-%: version-dist-nodeup-% version-dist-channels-% version-dist-protokube-% version-dist-kops-controller-% version-dist-kube-apiserver-healthcheck-% version-dist-dns-controller-% version-dist-kops-copy-% .PHONY: dev-upload-linux-amd64 dev-upload-linux-arm64 dev-upload-linux-amd64 dev-upload-linux-arm64: dev-upload-linux-%: dev-version-dist-% diff --git a/cmd/kops-copy/main.go b/cmd/kops-copy/main.go new file mode 100644 index 0000000000..f3b3021471 --- /dev/null +++ b/cmd/kops-copy/main.go @@ -0,0 +1,81 @@ +/* +Copyright 2023 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package main + +import ( + "fmt" + "io" + "log" + "os" + "path" + + "k8s.io/klog/v2" +) + +func copyFile(source, target string) error { + klog.Infof("Copying source file %q to target directory %q", source, target) + + sf, err := os.Open(source) + if err != nil { + return fmt.Errorf("unable to open source file %q: %w", source, err) + } + defer sf.Close() + + fi, err := sf.Stat() + if err != nil { + return fmt.Errorf("unable to stat source file %q: %w", source, err) + } + + fn := path.Join(target, path.Base(source)) + df, err := os.Create(fn) + if err != nil { + return fmt.Errorf("unable to create target file %q: %w", fn, err) + } + defer df.Close() + + _, err = io.Copy(df, sf) + if err != nil { + return fmt.Errorf("unable to copy source file %q contents to target file %q: %w", source, fn, err) + } + + if err := df.Close(); err != nil { + return fmt.Errorf("unable to close target file %q: %w", fn, err) + } + if err := os.Chmod(fn, fi.Mode()); err != nil { + return fmt.Errorf("unable to change mode of target file %q: %w", fn, err) + } + + return nil +} + +func main() { + if len(os.Args) < 3 { + log.Fatal("Usage: kops-copy SOURCE ... TARGET") + } + + target := os.Args[len(os.Args)-1] + + if err := os.MkdirAll(target, 0755); err != nil { + klog.Exitf("unable to create target directory %q: %v", target, err) + } + + for _, src := range os.Args[1 : len(os.Args)-1] { + if err := copyFile(src, target); err != nil { + klog.Exitf("unable to copy source file %q to target directory %q: %v", src, target, err) + } + } +} diff --git a/hack/set-version b/hack/set-version index 6061c11904..3cf8ad5a57 100755 --- a/hack/set-version +++ b/hack/set-version @@ -56,6 +56,7 @@ KOPS_CI_VERSION=`grep 'KOPS_CI_VERSION\s*=' kops-version.go | awk '{print $3}' echo "KOPS_RELEASE_VERSION ${KOPS_RELEASE_VERSION} -> ${NEW_RELEASE_VERSION}" echo "KOPS_CI_VERSION ${KOPS_CI_VERSION} -> ${NEW_CI_VERSION}" +sed -i.bak -e "s@KOPS_COPY_TAG=${KOPS_RELEASE_VERSION}@KOPS_COPY_TAG=${NEW_RELEASE_VERSION}@g" Makefile sed -i.bak -e "s@DNS_CONTROLLER_TAG=${KOPS_RELEASE_VERSION}@DNS_CONTROLLER_TAG=${NEW_RELEASE_VERSION}@g" Makefile sed -i.bak -e "s@KOPS_CONTROLLER_TAG=${KOPS_RELEASE_VERSION}@KOPS_CONTROLLER_TAG=${NEW_RELEASE_VERSION}@g" Makefile sed -i.bak -e "s@KUBE_APISERVER_HEALTHCHECK_TAG=${KOPS_RELEASE_VERSION}@KUBE_APISERVER_HEALTHCHECK_TAG=${NEW_RELEASE_VERSION}@g" Makefile @@ -68,6 +69,7 @@ git grep -l "version..v${KOPS_RELEASE_VERSION}" upup/models/cloudup/resources/ad git grep -l registry.k8s.io/kops/kops-controller | xargs -I {} sed -i.bak -e "s@kops-controller:${KOPS_RELEASE_VERSION}@kops-controller:${NEW_RELEASE_VERSION}@g" {} git grep -l "version..v${KOPS_RELEASE_VERSION}" upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/ | xargs -I {} sed -i.bak -e "s@version: v${KOPS_RELEASE_VERSION}@version: v${NEW_RELEASE_VERSION}@g" {} +git grep -l registry.k8s.io/kops/kops-copy | xargs -I {} sed -i.bak -e "s@kops-copy:${KOPS_RELEASE_VERSION}@kops-copy:${NEW_RELEASE_VERSION}@g" {} git grep -l registry.k8s.io/kops/kube-apiserver-healthcheck | xargs -I {} sed -i.bak -e "s@kube-apiserver-healthcheck:${KOPS_RELEASE_VERSION}@kube-apiserver-healthcheck:${NEW_RELEASE_VERSION}@g" {} git grep -l "version..${KOPS_RELEASE_VERSION}" upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/ | xargs -I {} sed -i.bak -e "s@version: ${KOPS_RELEASE_VERSION}@version: ${NEW_RELEASE_VERSION}@g" {} diff --git a/pkg/model/components/etcdmanager/model.go b/pkg/model/components/etcdmanager/model.go index 27a7d9edf8..e0d3f0c69e 100644 --- a/pkg/model/components/etcdmanager/model.go +++ b/pkg/model/components/etcdmanager/model.go @@ -22,7 +22,6 @@ import ( "strconv" "strings" - "github.com/blang/semver/v4" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/klog/v2" @@ -201,6 +200,18 @@ spec: name: bin hostNetwork: true hostPID: true # helps with mounting volumes from inside a container + initContainers: + - args: + - /ko-app/kops-copy + - /opt/bin + command: + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin volumes: - hostPath: path: / @@ -249,9 +260,11 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instance initContainer := v1.Container{ Name: "init-etcd-" + strings.ReplaceAll(etcdVersion, ".", "-"), Image: etcdSupportedImages[etcdVersion], - Command: []string{"/bin/sh"}, + Command: []string{"/opt/bin/kops-copy"}, Args: []string{ - "-c", + "/usr/local/bin/etcd", + "/usr/local/bin/etcdctl", + "/opt/etcd-v" + etcdVersion, }, VolumeMounts: []v1.VolumeMount{ { @@ -260,16 +273,6 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instance }, }, } - // Add the command for copying the etcd binaries - var command string - if semver.MustParse(etcdVersion).GE(semver.MustParse("3.4.13")) { - // Newer images bundle a custom go based `cp` utility that recursively creates the necessary dirs - // https://github.com/kubernetes/kubernetes/pull/91171 - command = "cp /usr/local/bin/etcd /opt/etcd-v" + etcdVersion + "/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v" + etcdVersion + "/etcdctl" - } else { - command = "mkdir -p /opt/etcd-v" + etcdVersion + "/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl /opt/etcd-v" + etcdVersion + "/" - } - initContainer.Args = append(initContainer.Args, command) // Remap image via AssetBuilder remapped, err := b.AssetBuilder.RemapImage(initContainer.Image) if err != nil { diff --git a/pkg/model/components/etcdmanager/tests/interval/tasks.yaml b/pkg/model/components/etcdmanager/tests/interval/tasks.yaml index be118a465c..e214c6c7a9 100644 --- a/pkg/model/components/etcdmanager/tests/interval/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/interval/tasks.yaml @@ -109,11 +109,22 @@ Contents: | hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -121,11 +132,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -133,10 +144,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -144,10 +156,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} @@ -229,11 +242,22 @@ Contents: | hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -241,11 +265,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -253,10 +277,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -264,10 +289,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} diff --git a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml index aed9be52c1..6a70e20ce5 100644 --- a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml @@ -108,11 +108,22 @@ Contents: | hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -120,11 +131,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -132,10 +143,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -143,10 +155,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} @@ -227,11 +240,22 @@ Contents: | hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -239,11 +263,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -251,10 +275,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -262,10 +287,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} diff --git a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml index e37f250632..1a1c0aee8c 100644 --- a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml @@ -111,11 +111,22 @@ Contents: | hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -123,11 +134,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -135,10 +146,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -146,10 +158,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} @@ -233,11 +246,22 @@ Contents: | hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -245,11 +269,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -257,10 +281,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -268,10 +293,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} diff --git a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml index 3b7bd8f010..1931a7c236 100644 --- a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml @@ -117,11 +117,22 @@ Contents: | hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -129,11 +140,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -141,10 +152,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -152,10 +164,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} @@ -245,11 +258,22 @@ Contents: | hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -257,11 +281,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -269,10 +293,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -280,10 +305,11 @@ Contents: | - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 30696c6b70..13ffb624df 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 0822d1c605..146b41d3be 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 a115e8a85f..3a68fdac5c 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 @@ -47,11 +47,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -59,11 +70,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -71,10 +82,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -82,10 +94,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 1181d737de..2e2cad5c4f 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 @@ -47,11 +47,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -59,11 +70,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -71,10 +82,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -82,10 +94,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 ac34ae7ab7..e7c9b5a812 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 45bfdf6f77..55204626f4 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 bdeb41a856..c52e5907e9 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 094807a6e7..96ca1485c2 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 e8d2a845be..833b952ec6 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 dbbd47d5ae..671b54cedd 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 bfb5b3741c..80863a2b73 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 37a1693f28..d429b5d67d 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 0efad1c7ec..4f69589dd6 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 86a597ceda..531324c436 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 62ce3f9085..36c57a4d82 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 e792dbbf11..d484309169 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 aaff79a39e..ad1df99fc1 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 2dd527c77e..1e5cbbd452 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 aaff79a39e..ad1df99fc1 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 2dd527c77e..1e5cbbd452 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 d7eb48d31b..d28d4761cd 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 257d47e71f..759ea1fd2a 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index e4ef2ef3d9..0738b6b050 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index c59c51bbf4..318d041c9a 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 9874053948..a4a7d66bce 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 d9504787ef..5f0c1e3e44 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 @@ -46,11 +46,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -58,11 +69,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -70,10 +81,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -81,10 +93,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 5ce9465938..930a96dda6 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 @@ -48,11 +48,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -60,11 +71,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -72,10 +83,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -83,10 +95,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 0ddb35a896..cf4bf7e053 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 6d2c75310d..62bd518432 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 @@ -46,11 +46,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -58,11 +69,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -70,10 +81,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -81,10 +93,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 c89e934781..7a74cf0ed9 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 @@ -48,11 +48,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -60,11 +71,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -72,10 +83,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -83,10 +95,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 f20274b722..9c6f2979ac 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 0443a27ea4..313be4983e 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 @@ -47,11 +47,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -59,11 +70,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -71,10 +82,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -82,10 +94,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 d7a295c00c..1590d3741f 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 @@ -49,11 +49,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -61,11 +72,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -73,10 +84,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -84,10 +96,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 dbf750185d..d721f15374 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 eb4164f2e9..e6b67ab5bf 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 @@ -47,11 +47,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -59,11 +70,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -71,10 +82,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -82,10 +94,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 3fa0e2c7b3..b4dcd49eb7 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 @@ -49,11 +49,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -61,11 +72,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -73,10 +84,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -84,10 +96,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 ac34ae7ab7..e7c9b5a812 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 45bfdf6f77..55204626f4 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 ac34ae7ab7..e7c9b5a812 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 45bfdf6f77..55204626f4 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 bd4e8a397e..5aded6254a 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 39f7cec1b5..64a9f3fe24 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 46dd757196..a904931c7e 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 afc5f9c2e9..c559eda0a2 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 0b3b41d4ce..0d4394f7b1 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 3650c63c72..b17c09c381 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 @@ -46,11 +46,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -58,11 +69,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -70,10 +81,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -81,10 +93,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 1bfb3785a3..0d0b171a7b 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 @@ -48,11 +48,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -60,11 +71,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -72,10 +83,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -83,10 +95,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 86d7d201cd..ba509a6770 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 b459488bf3..53e4a60491 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 @@ -46,11 +46,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -58,11 +69,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -70,10 +81,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -81,10 +93,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 e1e22e6b97..2e31c1df63 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 @@ -48,11 +48,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -60,11 +71,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -72,10 +83,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -83,10 +95,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 6ff3cd5d4e..0b55173ea3 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 bebe875e67..3e217d0242 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 @@ -46,11 +46,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -58,11 +69,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -70,10 +81,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -81,10 +93,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 dea93cf0dc..bc4c73ed75 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 @@ -48,11 +48,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -60,11 +71,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -72,10 +83,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -83,10 +95,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 a74c8a8ef3..97166a74b1 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 2ca088e753..1d2b210180 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 @@ -46,11 +46,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -58,11 +69,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -70,10 +81,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -81,10 +93,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 177db41cd0..445e388f1f 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 @@ -48,11 +48,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -60,11 +71,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -72,10 +83,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -83,10 +95,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 ac34ae7ab7..e7c9b5a812 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 45bfdf6f77..55204626f4 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 ac34ae7ab7..e7c9b5a812 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 45bfdf6f77..55204626f4 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 ac34ae7ab7..e7c9b5a812 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 45bfdf6f77..55204626f4 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index ac34ae7ab7..e7c9b5a812 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 45bfdf6f77..55204626f4 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index ac34ae7ab7..e7c9b5a812 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 45bfdf6f77..55204626f4 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 ac34ae7ab7..e7c9b5a812 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 45bfdf6f77..55204626f4 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 ac34ae7ab7..e7c9b5a812 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 45bfdf6f77..55204626f4 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 ac34ae7ab7..e7c9b5a812 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 45bfdf6f77..55204626f4 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 3132f87114..9f0964b8c1 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 b1e2c4db7e..ec458dcce9 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 ac34ae7ab7..e7c9b5a812 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 45bfdf6f77..55204626f4 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index e0cb8be7f4..bcfef61bc7 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index a268a737c2..4282c41d8f 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index e0cb8be7f4..bcfef61bc7 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index a268a737c2..4282c41d8f 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 e0cb8be7f4..bcfef61bc7 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 a268a737c2..4282c41d8f 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 e0cb8be7f4..bcfef61bc7 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 a268a737c2..4282c41d8f 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 e0cb8be7f4..bcfef61bc7 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 a268a737c2..4282c41d8f 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 811104b53b..848d48864f 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 @@ -47,11 +47,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -59,11 +70,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -71,10 +82,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -82,10 +94,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 efd6a408db..7e463fa8db 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 ac34ae7ab7..e7c9b5a812 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 45bfdf6f77..55204626f4 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 27a285c25c..52c92ad730 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 15a4796124..ca027fdf54 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 27a285c25c..52c92ad730 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 15a4796124..ca027fdf54 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 27a285c25c..52c92ad730 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 15a4796124..ca027fdf54 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 27a285c25c..52c92ad730 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 15a4796124..ca027fdf54 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 78b5613c9a..248763f749 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 233fff360a..c4f8d75e5e 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 136c93bdf2..02f9a446b2 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 844107551a..67dcfd5766 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index ac34ae7ab7..e7c9b5a812 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 45bfdf6f77..55204626f4 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 f6afc93998..15fafec7d6 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 6c2993d791..87366cfc7a 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 f6afc93998..15fafec7d6 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 6c2993d791..87366cfc7a 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 8f6adad62c..0801c83b95 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 a198ae214b..fdaf6025ce 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 f872d73404..3092706c74 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 6a2b99cb91..8513e24508 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 f872d73404..3092706c74 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 6a2b99cb91..8513e24508 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 fd2f847903..2f0fff264a 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 424a48bf09..a181d9fad4 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 b73efd7f94..b44d0043f4 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 995a5e7532..1bce067ee3 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 d3c5e789c9..4dcf69c589 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 0a7dd578fe..2366fe2494 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 d3c5e789c9..4dcf69c589 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 0a7dd578fe..2366fe2494 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 a7af9ef21d..b0b22d0b2c 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 @@ -46,11 +46,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -58,11 +69,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -70,10 +81,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -81,10 +93,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 bddf324719..6e2db6d921 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 @@ -46,11 +46,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -58,11 +69,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -70,10 +81,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -81,10 +93,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 25c05dd40d..f0b8d48c06 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 @@ -48,11 +48,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -60,11 +71,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -72,10 +83,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -83,10 +95,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 739d8a6891..ce2618f91c 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 @@ -48,11 +48,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -60,11 +71,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -72,10 +83,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -83,10 +95,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 4a28a73e11..aeffca6e54 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 322dafdcd7..8b8d76f938 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 @@ -47,11 +47,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -59,11 +70,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -71,10 +82,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -82,10 +94,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 1fcdfe88e4..23c1e9b92e 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 @@ -49,11 +49,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -61,11 +72,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -73,10 +84,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -84,10 +96,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 f1eac36b24..5ac1d4f71c 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 3c61d93006..1aa3567a8f 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 @@ -47,11 +47,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -59,11 +70,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -71,10 +82,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -82,10 +94,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 82b459868b..c1b1feed25 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 @@ -49,11 +49,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -61,11 +72,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -73,10 +84,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -84,10 +96,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 4a28a73e11..aeffca6e54 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 322dafdcd7..8b8d76f938 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 @@ -47,11 +47,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -59,11 +70,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -71,10 +82,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -82,10 +94,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 1fcdfe88e4..23c1e9b92e 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 @@ -49,11 +49,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -61,11 +72,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -73,10 +84,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -84,10 +96,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 f1eac36b24..5ac1d4f71c 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 3c61d93006..1aa3567a8f 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 @@ -47,11 +47,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -59,11 +70,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -71,10 +82,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -82,10 +94,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 82b459868b..c1b1feed25 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 @@ -49,11 +49,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -61,11 +72,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -73,10 +84,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -84,10 +96,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 143f159e9d..3a2e169782 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 be5b15f071..2c5bb90fb0 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 143f159e9d..3a2e169782 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 be5b15f071..2c5bb90fb0 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 ac34ae7ab7..e7c9b5a812 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 45bfdf6f77..55204626f4 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 f70b962994..ad3324a38a 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 09b512da94..5be85ba91c 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 452e026611..5f5b500124 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 687029b1ba..3f7ab2d088 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 213bafefa4..2a971ae0cc 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 ec7d399eb7..57eb14509a 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 82cd3dc714..cc9e03cad3 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 83844b832d..8c8e715589 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 c623a19745..897ff25b10 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 b74b775b0c..39287c3236 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 c623a19745..897ff25b10 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 b74b775b0c..39287c3236 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 c623a19745..897ff25b10 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 b74b775b0c..39287c3236 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 c246d24cd9..2d2c1df348 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 8d8ba30a28..e303cfac6c 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 e9bfe5ed34..8e3293358a 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 5d32266a6e..5ca240d126 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 6ead4a1350..00910e439b 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 2a5cceb1c6..6f6f8c0ce7 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 34b325e03c..aa32feea27 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 e3be1e7c38..ed37fcfc96 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 cda672daef..f2892f9284 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 fe1dbd2649..b33e8ab6bc 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 33140edaef..1301d461b5 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 8672a4b1bf..ea1d9a0cbf 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 35df7eb6af..d97cbababc 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 ac34ae7ab7..e7c9b5a812 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 45bfdf6f77..55204626f4 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 03007775b4..0064009b02 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 b8e377dccc..98f8684378 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 94551193ea..cd86fb19d9 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 7ebb4f8fa9..20b6a4d363 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 27a285c25c..52c92ad730 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 15a4796124..ca027fdf54 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 @@ -45,11 +45,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -57,11 +68,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -69,10 +80,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -80,10 +92,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 aa88edb625..9eec0040aa 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 e005d52c52..33366aa94b 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 ac34ae7ab7..e7c9b5a812 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} 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 45bfdf6f77..55204626f4 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 @@ -44,11 +44,22 @@ spec: hostPID: true initContainers: - args: - - -c - - mkdir -p /opt/etcd-v3.2.24/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.2.24/ + - /ko-app/kops-copy + - /opt/bin command: - - /bin/sh + - /ko-app/kops-copy + image: registry.k8s.io/kops/kops-copy:1.27.0-alpha.2 + name: kops-copy + resources: {} + volumeMounts: + - mountPath: /opt + name: bin + - args: + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.2.24 + command: + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.2.24-1 name: init-etcd-3-2-24 resources: {} @@ -56,11 +67,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - mkdir -p /opt/etcd-v3.3.17/ && cp /usr/local/bin/etcd /usr/local/bin/etcdctl - /opt/etcd-v3.3.17/ + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.3.17 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.3.17-0 name: init-etcd-3-3-17 resources: {} @@ -68,10 +79,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.4.13/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.4.13/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.4.13 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.4.13-0 name: init-etcd-3-4-13 resources: {} @@ -79,10 +91,11 @@ spec: - mountPath: /opt name: bin - args: - - -c - - cp /usr/local/bin/etcd /opt/etcd-v3.5.9/etcd && cp /usr/local/bin/etcdctl /opt/etcd-v3.5.9/etcdctl + - /usr/local/bin/etcd + - /usr/local/bin/etcdctl + - /opt/etcd-v3.5.9 command: - - /bin/sh + - /opt/bin/kops-copy image: registry.k8s.io/etcd:3.5.9-0 name: init-etcd-3-5-9 resources: {} diff --git a/tools/get_workspace_status.sh b/tools/get_workspace_status.sh index 373168da22..fedce8b1f6 100755 --- a/tools/get_workspace_status.sh +++ b/tools/get_workspace_status.sh @@ -67,8 +67,12 @@ if [[ -z "${DNS_CONTROLLER_TAG}" ]]; then fi echo "STABLE_DNS_CONTROLLER_TAG ${DNS_CONTROLLER_TAG}" +if [[ -z "${KOPS_COPY_TAG}" ]]; then + KOPS_COPY_TAG="${PROTOKUBE_TAG}" +fi +echo "STABLE_KOPS_COPY_TAG ${KOPS_COPY_TAG}" + if [[ -z "${KUBE_APISERVER_HEALTHCHECK_TAG}" ]]; then KUBE_APISERVER_HEALTHCHECK_TAG="${PROTOKUBE_TAG}" fi echo "STABLE_KUBE_APISERVER_HEALTHCHECK_TAG ${KUBE_APISERVER_HEALTHCHECK_TAG}" - diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go index 9b23c83842..94c2f40ebb 100644 --- a/upup/pkg/fi/cloudup/apply_cluster.go +++ b/upup/pkg/fi/cloudup/apply_cluster.go @@ -1240,7 +1240,7 @@ func newNodeUpConfigBuilder(cluster *kops.Cluster, assetBuilder *assets.AssetBui // don't need to push/pull from a registry if os.Getenv("KOPS_BASE_URL") != "" && isMaster { for _, arch := range architectures.GetSupported() { - for _, name := range []string{"kops-controller", "dns-controller", "kube-apiserver-healthcheck"} { + for _, name := range []string{"kops-copy", "kops-controller", "dns-controller", "kube-apiserver-healthcheck"} { baseURL, err := url.Parse(os.Getenv("KOPS_BASE_URL")) if err != nil { return nil, err From f246cbe4f93d90a18d5428dfb8986c29ca8651ba Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Wed, 31 May 2023 07:44:13 +0300 Subject: [PATCH 4/6] Use `filepath` instead of `path` --- cmd/kops-copy/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/kops-copy/main.go b/cmd/kops-copy/main.go index f3b3021471..c97a3a28f8 100644 --- a/cmd/kops-copy/main.go +++ b/cmd/kops-copy/main.go @@ -21,7 +21,7 @@ import ( "io" "log" "os" - "path" + "path/filepath" "k8s.io/klog/v2" ) @@ -40,7 +40,7 @@ func copyFile(source, target string) error { return fmt.Errorf("unable to stat source file %q: %w", source, err) } - fn := path.Join(target, path.Base(source)) + fn := filepath.Join(target, filepath.Base(source)) df, err := os.Create(fn) if err != nil { return fmt.Errorf("unable to create target file %q: %w", fn, err) From 071d272ad3a98705fd6c9dac36e185e3f59be8fb Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Wed, 31 May 2023 08:32:05 +0300 Subject: [PATCH 5/6] Use `opt` instead for volume name --- pkg/model/components/etcdmanager/model.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/model/components/etcdmanager/model.go b/pkg/model/components/etcdmanager/model.go index e0d3f0c69e..beb718118c 100644 --- a/pkg/model/components/etcdmanager/model.go +++ b/pkg/model/components/etcdmanager/model.go @@ -197,7 +197,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt hostNetwork: true hostPID: true # helps with mounting volumes from inside a container initContainers: @@ -211,7 +211,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt volumes: - hostPath: path: / @@ -225,7 +225,7 @@ spec: path: /etc/kubernetes/pki/etcd-manager type: DirectoryOrCreate name: pki - - name: bin + - name: opt emptyDir: {} ` @@ -269,7 +269,7 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instance VolumeMounts: []v1.VolumeMount{ { MountPath: "/opt", - Name: "bin", + Name: "opt", }, }, } From 9201263abb7c598867046b9ffe5918e7fdc1578e Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Wed, 31 May 2023 08:38:48 +0300 Subject: [PATCH 6/6] hack/update-expected.sh --- .../etcdmanager/tests/interval/tasks.yaml | 28 +++++++++---------- .../etcdmanager/tests/minimal/tasks.yaml | 28 +++++++++---------- .../tests/overwrite_settings/tasks.yaml | 28 +++++++++---------- .../etcdmanager/tests/proxy/tasks.yaml | 28 +++++++++---------- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1b_content | 14 +++++----- ...cdmanager-events-master-us-test-1c_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1b_content | 14 +++++----- ...etcdmanager-main-master-us-test-1c_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1b_content | 14 +++++----- ...cdmanager-events-master-us-test-1c_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1b_content | 14 +++++----- ...etcdmanager-main-master-us-test-1c_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1b_content | 14 +++++----- ...cdmanager-events-master-us-test-1c_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1b_content | 14 +++++----- ...etcdmanager-main-master-us-test-1c_content | 14 +++++----- ...cdmanager-events-master-us-test1-a_content | 14 +++++----- ...cdmanager-events-master-us-test1-b_content | 14 +++++----- ...cdmanager-events-master-us-test1-c_content | 14 +++++----- ...etcdmanager-main-master-us-test1-a_content | 14 +++++----- ...etcdmanager-main-master-us-test1-b_content | 14 +++++----- ...etcdmanager-main-master-us-test1-c_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test1-a_content | 14 +++++----- ...etcdmanager-main-master-us-test1-a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test1-a_content | 14 +++++----- ...etcdmanager-main-master-us-test1-a_content | 14 +++++----- ...cdmanager-events-master-us-test1-a_content | 14 +++++----- ...etcdmanager-main-master-us-test1-a_content | 14 +++++----- ...cdmanager-events-master-us-test1-a_content | 14 +++++----- ...etcdmanager-main-master-us-test1-a_content | 14 +++++----- ...cdmanager-events-master-us-test1-a_content | 14 +++++----- ...etcdmanager-main-master-us-test1-a_content | 14 +++++----- ...cdmanager-events-master-us-test1-a_content | 14 +++++----- ...etcdmanager-main-master-us-test1-a_content | 14 +++++----- ...cdmanager-events-master-us-test1-a_content | 14 +++++----- ...etcdmanager-main-master-us-test1-a_content | 14 +++++----- ...cdmanager-events-master-us-test1-a_content | 14 +++++----- ...etcdmanager-main-master-us-test1-a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...sts-etcdmanager-events-master-fsn1_content | 14 +++++----- ...fests-etcdmanager-main-master-fsn1_content | 14 +++++----- ...ager-events-control-plane-fr-par-1_content | 14 +++++----- ...anager-main-control-plane-fr-par-1_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1b_content | 14 +++++----- ...cdmanager-events-master-us-test-1c_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1b_content | 14 +++++----- ...etcdmanager-main-master-us-test-1c_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1b_content | 14 +++++----- ...cdmanager-events-master-us-test-1c_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1b_content | 14 +++++----- ...etcdmanager-main-master-us-test-1c_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-cilium-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- ...cdmanager-events-master-us-test-1a_content | 14 +++++----- ...etcdmanager-main-master-us-test-1a_content | 14 +++++----- 187 files changed, 1337 insertions(+), 1337 deletions(-) diff --git a/pkg/model/components/etcdmanager/tests/interval/tasks.yaml b/pkg/model/components/etcdmanager/tests/interval/tasks.yaml index e214c6c7a9..365e5b938d 100644 --- a/pkg/model/components/etcdmanager/tests/interval/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/interval/tasks.yaml @@ -102,7 +102,7 @@ Contents: | - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -118,7 +118,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -130,7 +130,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -142,7 +142,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -154,7 +154,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -166,7 +166,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -185,7 +185,7 @@ Contents: | type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate @@ -235,7 +235,7 @@ Contents: | - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -251,7 +251,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -263,7 +263,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -275,7 +275,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -287,7 +287,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -299,7 +299,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -318,7 +318,7 @@ Contents: | type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml index 6a70e20ce5..1574743995 100644 --- a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml @@ -101,7 +101,7 @@ Contents: | - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -117,7 +117,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -129,7 +129,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -141,7 +141,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -153,7 +153,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -165,7 +165,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -184,7 +184,7 @@ Contents: | type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate @@ -233,7 +233,7 @@ Contents: | - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -249,7 +249,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -261,7 +261,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -273,7 +273,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -285,7 +285,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -297,7 +297,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -316,7 +316,7 @@ Contents: | type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml index 1a1c0aee8c..4821cc842d 100644 --- a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml @@ -104,7 +104,7 @@ Contents: | - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -120,7 +120,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -132,7 +132,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -144,7 +144,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -156,7 +156,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -168,7 +168,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -187,7 +187,7 @@ Contents: | type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate @@ -239,7 +239,7 @@ Contents: | - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -255,7 +255,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -267,7 +267,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -279,7 +279,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -291,7 +291,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -303,7 +303,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -322,7 +322,7 @@ Contents: | type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml index 1931a7c236..c8e35c1e42 100644 --- a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml @@ -110,7 +110,7 @@ Contents: | - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -126,7 +126,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -138,7 +138,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -150,7 +150,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -162,7 +162,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -174,7 +174,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -193,7 +193,7 @@ Contents: | type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate @@ -251,7 +251,7 @@ Contents: | - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -267,7 +267,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -279,7 +279,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -291,7 +291,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -303,7 +303,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -315,7 +315,7 @@ Contents: | resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -334,7 +334,7 @@ Contents: | type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 13ffb624df..47af9e8f4d 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 146b41d3be..7fd0233a41 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 3a68fdac5c..e9f9dcce64 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 @@ -40,7 +40,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -56,7 +56,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -68,7 +68,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -80,7 +80,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -92,7 +92,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -104,7 +104,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -123,7 +123,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 2e2cad5c4f..6154e59193 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 @@ -40,7 +40,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -56,7 +56,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -68,7 +68,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -80,7 +80,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -92,7 +92,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -104,7 +104,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -123,7 +123,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 e7c9b5a812..81c8d77486 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 55204626f4..988235b8bd 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 c52e5907e9..5788f37488 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 96ca1485c2..14ff7c3b56 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 833b952ec6..0fc3f520f1 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 671b54cedd..ffa53214e1 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 80863a2b73..d7ee49c07f 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 d429b5d67d..b3e65e8f01 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 4f69589dd6..ffafa35b06 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 531324c436..f86266d757 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 36c57a4d82..1c84d5576c 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 d484309169..154a857fcb 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 ad1df99fc1..29ea1dea66 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 1e5cbbd452..b70de80421 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 ad1df99fc1..29ea1dea66 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 1e5cbbd452..b70de80421 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 d28d4761cd..5b363d6698 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 759ea1fd2a..a767f25c1a 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index 0738b6b050..f55361c24c 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 318d041c9a..633e6a91f6 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 a4a7d66bce..399e58e978 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 5f0c1e3e44..ac1f915a9c 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 @@ -39,7 +39,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -55,7 +55,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -67,7 +67,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -79,7 +79,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -91,7 +91,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -103,7 +103,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -122,7 +122,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 930a96dda6..f3a0bcec1e 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 @@ -41,7 +41,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -57,7 +57,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -69,7 +69,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -81,7 +81,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -93,7 +93,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -105,7 +105,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -124,7 +124,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 cf4bf7e053..7cf30ad177 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 62bd518432..5a21ac50be 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 @@ -39,7 +39,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -55,7 +55,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -67,7 +67,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -79,7 +79,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -91,7 +91,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -103,7 +103,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -122,7 +122,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 7a74cf0ed9..c68d334cb6 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 @@ -41,7 +41,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -57,7 +57,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -69,7 +69,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -81,7 +81,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -93,7 +93,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -105,7 +105,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -124,7 +124,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 9c6f2979ac..c400ad117b 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 313be4983e..00f77a63d1 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 @@ -40,7 +40,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -56,7 +56,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -68,7 +68,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -80,7 +80,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -92,7 +92,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -104,7 +104,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -123,7 +123,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 1590d3741f..1d2dc4a682 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 @@ -42,7 +42,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -58,7 +58,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -70,7 +70,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -82,7 +82,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -94,7 +94,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -106,7 +106,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -125,7 +125,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 d721f15374..01bac840ff 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 e6b67ab5bf..213c9ea3d4 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 @@ -40,7 +40,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -56,7 +56,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -68,7 +68,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -80,7 +80,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -92,7 +92,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -104,7 +104,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -123,7 +123,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 b4dcd49eb7..1285b4218a 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 @@ -42,7 +42,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -58,7 +58,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -70,7 +70,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -82,7 +82,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -94,7 +94,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -106,7 +106,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -125,7 +125,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 e7c9b5a812..81c8d77486 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 55204626f4..988235b8bd 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 e7c9b5a812..81c8d77486 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 55204626f4..988235b8bd 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 5aded6254a..de0e6a718f 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 64a9f3fe24..9c333d5604 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 a904931c7e..146e861142 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 c559eda0a2..72552faa96 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 0d4394f7b1..0cf3fac68a 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 b17c09c381..aac21b3c91 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 @@ -39,7 +39,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -55,7 +55,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -67,7 +67,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -79,7 +79,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -91,7 +91,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -103,7 +103,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -122,7 +122,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 0d0b171a7b..ce8a51af91 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 @@ -41,7 +41,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -57,7 +57,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -69,7 +69,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -81,7 +81,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -93,7 +93,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -105,7 +105,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -124,7 +124,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 ba509a6770..ee65300839 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 53e4a60491..52ccff50e1 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 @@ -39,7 +39,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -55,7 +55,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -67,7 +67,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -79,7 +79,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -91,7 +91,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -103,7 +103,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -122,7 +122,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 2e31c1df63..14df3d1510 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 @@ -41,7 +41,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -57,7 +57,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -69,7 +69,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -81,7 +81,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -93,7 +93,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -105,7 +105,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -124,7 +124,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 0b55173ea3..32e2cf6170 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 3e217d0242..a31af3b73a 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 @@ -39,7 +39,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -55,7 +55,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -67,7 +67,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -79,7 +79,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -91,7 +91,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -103,7 +103,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -122,7 +122,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 bc4c73ed75..65d9e02ac9 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 @@ -41,7 +41,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -57,7 +57,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -69,7 +69,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -81,7 +81,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -93,7 +93,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -105,7 +105,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -124,7 +124,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 97166a74b1..0ce5cbd222 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 1d2b210180..8cfa8c78a7 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 @@ -39,7 +39,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -55,7 +55,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -67,7 +67,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -79,7 +79,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -91,7 +91,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -103,7 +103,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -122,7 +122,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 445e388f1f..4c2e357e20 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 @@ -41,7 +41,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -57,7 +57,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -69,7 +69,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -81,7 +81,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -93,7 +93,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -105,7 +105,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -124,7 +124,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 e7c9b5a812..81c8d77486 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 55204626f4..988235b8bd 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 e7c9b5a812..81c8d77486 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 55204626f4..988235b8bd 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 e7c9b5a812..81c8d77486 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 55204626f4..988235b8bd 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index e7c9b5a812..81c8d77486 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 55204626f4..988235b8bd 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index e7c9b5a812..81c8d77486 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 55204626f4..988235b8bd 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 e7c9b5a812..81c8d77486 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 55204626f4..988235b8bd 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 e7c9b5a812..81c8d77486 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 55204626f4..988235b8bd 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 e7c9b5a812..81c8d77486 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 55204626f4..988235b8bd 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 9f0964b8c1..d763c91044 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 ec458dcce9..f916de0df0 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 e7c9b5a812..81c8d77486 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 55204626f4..988235b8bd 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index bcfef61bc7..83e5710b8d 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 4282c41d8f..96faf5327f 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index bcfef61bc7..83e5710b8d 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 4282c41d8f..96faf5327f 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 bcfef61bc7..83e5710b8d 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 4282c41d8f..96faf5327f 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 bcfef61bc7..83e5710b8d 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 4282c41d8f..96faf5327f 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 bcfef61bc7..83e5710b8d 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 4282c41d8f..96faf5327f 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 848d48864f..26c6b0aea6 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 @@ -40,7 +40,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -56,7 +56,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -68,7 +68,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -80,7 +80,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -92,7 +92,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -104,7 +104,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -123,7 +123,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 7e463fa8db..aa8118a161 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 e7c9b5a812..81c8d77486 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 55204626f4..988235b8bd 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 52c92ad730..6c0d576a4b 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 ca027fdf54..62043d9c98 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 52c92ad730..6c0d576a4b 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 ca027fdf54..62043d9c98 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 52c92ad730..6c0d576a4b 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 ca027fdf54..62043d9c98 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 52c92ad730..6c0d576a4b 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 ca027fdf54..62043d9c98 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 248763f749..d8c32d0ea2 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 c4f8d75e5e..56bbe3b2b4 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 02f9a446b2..d77cd8b7af 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 67dcfd5766..4045aee8d4 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index e7c9b5a812..81c8d77486 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index 55204626f4..988235b8bd 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 15fafec7d6..0137dc4c17 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 87366cfc7a..96b7a4612a 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 15fafec7d6..0137dc4c17 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 87366cfc7a..96b7a4612a 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 0801c83b95..2bfc482cc3 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 fdaf6025ce..f226e84ef2 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 3092706c74..fd9ed79ab6 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 8513e24508..8d708d6592 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 3092706c74..fd9ed79ab6 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 8513e24508..8d708d6592 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 2f0fff264a..19b36a4353 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 a181d9fad4..7221157f60 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 b44d0043f4..a3f1a5a477 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 1bce067ee3..1e1e0c0831 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 4dcf69c589..2842e47083 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 2366fe2494..88aef52e8e 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 4dcf69c589..2842e47083 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 2366fe2494..88aef52e8e 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 b0b22d0b2c..9b95d4f69b 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 @@ -39,7 +39,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -55,7 +55,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -67,7 +67,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -79,7 +79,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -91,7 +91,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -103,7 +103,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -122,7 +122,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 6e2db6d921..79952de0a1 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 @@ -39,7 +39,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -55,7 +55,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -67,7 +67,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -79,7 +79,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -91,7 +91,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -103,7 +103,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -122,7 +122,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 f0b8d48c06..c503fc68f6 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 @@ -41,7 +41,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -57,7 +57,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -69,7 +69,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -81,7 +81,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -93,7 +93,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -105,7 +105,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -124,7 +124,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 ce2618f91c..d630216cf5 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 @@ -41,7 +41,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -57,7 +57,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -69,7 +69,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -81,7 +81,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -93,7 +93,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -105,7 +105,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -124,7 +124,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 aeffca6e54..2e881d4296 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 8b8d76f938..452f580df8 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 @@ -40,7 +40,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -56,7 +56,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -68,7 +68,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -80,7 +80,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -92,7 +92,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -104,7 +104,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -123,7 +123,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 23c1e9b92e..bca562eaa6 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 @@ -42,7 +42,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -58,7 +58,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -70,7 +70,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -82,7 +82,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -94,7 +94,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -106,7 +106,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -125,7 +125,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 5ac1d4f71c..8f8341c3ad 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 1aa3567a8f..e54ad46226 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 @@ -40,7 +40,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -56,7 +56,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -68,7 +68,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -80,7 +80,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -92,7 +92,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -104,7 +104,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -123,7 +123,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 c1b1feed25..10189ad453 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 @@ -42,7 +42,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -58,7 +58,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -70,7 +70,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -82,7 +82,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -94,7 +94,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -106,7 +106,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -125,7 +125,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 aeffca6e54..2e881d4296 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 8b8d76f938..452f580df8 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 @@ -40,7 +40,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -56,7 +56,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -68,7 +68,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -80,7 +80,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -92,7 +92,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -104,7 +104,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -123,7 +123,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 23c1e9b92e..bca562eaa6 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 @@ -42,7 +42,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -58,7 +58,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -70,7 +70,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -82,7 +82,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -94,7 +94,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -106,7 +106,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -125,7 +125,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 5ac1d4f71c..8f8341c3ad 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 1aa3567a8f..e54ad46226 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 @@ -40,7 +40,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -56,7 +56,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -68,7 +68,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -80,7 +80,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -92,7 +92,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -104,7 +104,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -123,7 +123,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 c1b1feed25..10189ad453 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 @@ -42,7 +42,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -58,7 +58,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -70,7 +70,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -82,7 +82,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -94,7 +94,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -106,7 +106,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -125,7 +125,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 3a2e169782..af8a743f77 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 2c5bb90fb0..d6d4112ffb 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 3a2e169782..af8a743f77 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 2c5bb90fb0..d6d4112ffb 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 e7c9b5a812..81c8d77486 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 55204626f4..988235b8bd 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 ad3324a38a..77a0a31652 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 5be85ba91c..96e80a574d 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 5f5b500124..0090f97136 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 3f7ab2d088..871a1dec00 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 2a971ae0cc..37479a2082 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 57eb14509a..758e5bd229 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 cc9e03cad3..601786a1ca 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 8c8e715589..51e68a95d4 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 897ff25b10..661d4662af 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 39287c3236..0c045ae6d2 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 897ff25b10..661d4662af 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 39287c3236..0c045ae6d2 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 897ff25b10..661d4662af 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 39287c3236..0c045ae6d2 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 2d2c1df348..310bc7abfb 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-cilium.log type: FileOrCreate 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 e303cfac6c..839bc155ea 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 8e3293358a..4f3f11f0da 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 5ca240d126..4e7a182f7d 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 00910e439b..dd752e8142 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 6f6f8c0ce7..51634453a6 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 aa32feea27..a0fb0b7878 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 ed37fcfc96..2f5b15377b 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 f2892f9284..faab3f299b 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 b33e8ab6bc..e1d4e3cab5 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 1301d461b5..0e6a0015e2 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content index ea1d9a0cbf..ab5eb0569b 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content index d97cbababc..0bfa5c5a52 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 e7c9b5a812..81c8d77486 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 55204626f4..988235b8bd 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 0064009b02..af69a903f4 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 98f8684378..15e60125a4 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 cd86fb19d9..6c76950291 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 20b6a4d363..fabe4b94d4 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 52c92ad730..6c0d576a4b 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 ca027fdf54..62043d9c98 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 @@ -38,7 +38,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -54,7 +54,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -66,7 +66,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -78,7 +78,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -90,7 +90,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -102,7 +102,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -121,7 +121,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 9eec0040aa..4a7a04eed2 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 33366aa94b..931a6dd728 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate 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 e7c9b5a812..81c8d77486 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd-events.log type: FileOrCreate 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 55204626f4..988235b8bd 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 @@ -37,7 +37,7 @@ spec: - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /opt - name: bin + name: opt - mountPath: /var/log/etcd.log name: varlogetcd hostNetwork: true @@ -53,7 +53,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -65,7 +65,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -77,7 +77,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -89,7 +89,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt - args: - /usr/local/bin/etcd - /usr/local/bin/etcdctl @@ -101,7 +101,7 @@ spec: resources: {} volumeMounts: - mountPath: /opt - name: bin + name: opt priorityClassName: system-cluster-critical tolerations: - key: CriticalAddonsOnly @@ -120,7 +120,7 @@ spec: type: DirectoryOrCreate name: pki - emptyDir: {} - name: bin + name: opt - hostPath: path: /var/log/etcd.log type: FileOrCreate