diff --git a/pkg/model/components/etcd.go b/pkg/model/components/etcd.go index fe4cfc00e9..21634d59bd 100644 --- a/pkg/model/components/etcd.go +++ b/pkg/model/components/etcd.go @@ -24,7 +24,7 @@ import ( "k8s.io/kops/upup/pkg/fi/loader" ) -const DefaultBackupImage = "k8s.gcr.io/etcdadm/etcd-backup:3.0.20210430" +const DefaultBackupImage = "k8s.gcr.io/etcdadm/etcd-backup:3.0.20210707" // EtcdOptionsBuilder adds options for etcd to the model type EtcdOptionsBuilder struct { @@ -35,8 +35,8 @@ var _ loader.OptionsBuilder = &EtcdOptionsBuilder{} const ( DefaultEtcd3Version_1_17 = "3.4.3" - DefaultEtcd3Version_1_19 = "3.4.13" + DefaultEtcd3Version_1_22 = "3.5.0" ) // BuildOptions is responsible for filling in the defaults for the etcd cluster model @@ -52,7 +52,9 @@ func (b *EtcdOptionsBuilder) BuildOptions(o interface{}) error { // Ensure the version is set if c.Version == "" { // We run the k8s-recommended versions of etcd - if b.IsKubernetesGTE("1.19") { + if b.IsKubernetesGTE("1.22") { + c.Version = DefaultEtcd3Version_1_22 + } else if b.IsKubernetesGTE("1.19") { c.Version = DefaultEtcd3Version_1_19 } else { c.Version = DefaultEtcd3Version_1_17 diff --git a/pkg/model/components/etcdmanager/model.go b/pkg/model/components/etcdmanager/model.go index 53ca9551bc..b4c83a4fc8 100644 --- a/pkg/model/components/etcdmanager/model.go +++ b/pkg/model/components/etcdmanager/model.go @@ -183,7 +183,7 @@ metadata: namespace: kube-system spec: containers: - - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/pkg/model/components/etcdmanager/options.go b/pkg/model/components/etcdmanager/options.go index f968b88156..45fdcca140 100644 --- a/pkg/model/components/etcdmanager/options.go +++ b/pkg/model/components/etcdmanager/options.go @@ -67,7 +67,7 @@ func (b *EtcdManagerOptionsBuilder) BuildOptions(o interface{}) error { return nil } -var supportedEtcdVersions = []string{"3.1.12", "3.2.18", "3.2.24", "3.3.10", "3.3.13", "3.3.17", "3.4.3", "3.4.13"} +var supportedEtcdVersions = []string{"3.1.12", "3.2.18", "3.2.24", "3.3.10", "3.3.13", "3.3.17", "3.4.3", "3.4.13", "3.5.0"} func etcdVersionIsSupported(version string) bool { version = strings.TrimPrefix(version, "v") diff --git a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml index a6a847c3ed..02764fb8b6 100644 --- a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml @@ -82,7 +82,7 @@ Contents: | --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: @@ -152,7 +152,7 @@ Contents: | --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml index 8d05812a27..a1732b0d58 100644 --- a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml @@ -85,7 +85,7 @@ Contents: | env: - name: ETCD_QUOTA_BACKEND_BYTES value: "10737418240" - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: @@ -158,7 +158,7 @@ Contents: | env: - name: ETCD_QUOTA_BACKEND_BYTES value: "10737418240" - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/pkg/model/components/etcdmanager/tests/pollinterval/tasks.yaml b/pkg/model/components/etcdmanager/tests/pollinterval/tasks.yaml index c99aafd50e..055670ac26 100644 --- a/pkg/model/components/etcdmanager/tests/pollinterval/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/pollinterval/tasks.yaml @@ -83,7 +83,7 @@ Contents: | --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: @@ -154,7 +154,7 @@ Contents: | --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml index 5006e1c743..69c998890d 100644 --- a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml @@ -91,7 +91,7 @@ Contents: | value: http://proxy.example.com - name: no_proxy value: noproxy.example.com - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: @@ -170,7 +170,7 @@ Contents: | value: http://proxy.example.com - name: no_proxy value: noproxy.example.com - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 1efdf6e9e5..601ff7d547 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index b0a1d53edf..b71cd64309 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index b93173aa00..62c1bfc9a1 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/bastionuserdata.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index d435149b56..638f94b2ab 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/bastionuserdata.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 72e907bcb3..a0dccf34f1 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/complex.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index dcea71f615..7b042fa651 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/complex.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 961c646fb9..d632bb6846 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/compress.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 3017488651..9d99aff19b 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/compress.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index ef3e6d0ada..916e04a890 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -20,7 +20,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 995905373a..a2a829045c 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -20,7 +20,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 5e2f2249c9..b6a00d11ca 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 2f194995aa..66a3dbcf9e 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 1b0d261e10..59a2e9fd5a 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/externallb.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index c1b077ee03..a329085943 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/externallb.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 3519527e61..87c7f9f23a 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/externalpolicies.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index a377249d55..ad0d79a6d5 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/externalpolicies.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index c91df6602d..c1d80da99d 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -20,7 +20,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/ha.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 0bf9f4ae20..abdacb063d 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -20,7 +20,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/ha.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 9513189ee9..d488b3fc75 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -20,7 +20,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-events --volume-provider=gce --volume-tag=k8s-io-cluster-name=ha-gce-example-com --volume-tag=k8s-io-etcd-events --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 011fa2f67a..620b89b8d9 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -20,7 +20,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-main --volume-provider=gce --volume-tag=k8s-io-cluster-name=ha-gce-example-com --volume-tag=k8s-io-etcd-main --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 1efdf6e9e5..601ff7d547 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index b0a1d53edf..b71cd64309 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 1efdf6e9e5..601ff7d547 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index b0a1d53edf..b71cd64309 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 1efdf6e9e5..601ff7d547 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index b0a1d53edf..b71cd64309 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 8f1864644a..466a5ae0a7 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 0e3121df89..8849de222c 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 30fad27f1f..8f530af091 100644 --- a/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal-json.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 44495d9a1c..3fd2217115 100644 --- a/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal-json.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index ed2241261f..f7201c40cf 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal-warmpool.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 663a043990..c472a9c891 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal-warmpool.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 1efdf6e9e5..601ff7d547 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index b0a1d53edf..b71cd64309 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 7351a93a92..0597644ee0 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -20,7 +20,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-events --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-example-com --volume-tag=k8s-io-etcd-events --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index fb6cd20498..41966f2f1b 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -20,7 +20,7 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-main --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-example-com --volume-tag=k8s-io-etcd-main --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index bba78327f8..8abb64dea5 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-private-example-com --volume-tag=k8s-io-etcd-events --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index a01cbe41c0..dfd702daff 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-private-example-com --volume-tag=k8s-io-etcd-main --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 644538aeda..a087cb3a49 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.k8s.local=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 093883108c..057341c708 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.k8s.local=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 3060576885..808f30f251 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 5b30d61862..668303772e 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 3060576885..808f30f251 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 5b30d61862..668303772e 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index fba6b69aef..1f101938e7 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/nthsqsresources.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 582e6e0569..596a118db5 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/nthsqsresources.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index ad6ebc2248..e3633bab2b 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/private-shared-ip.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 229732f0b3..75e703513d 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/private-shared-ip.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 20e177e47a..a6ee201e81 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/private-shared-subnet.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 4eea189b70..ef7936bf70 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/private-shared-subnet.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index d4907de213..4dd10d1577 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privatecalico.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index a5691f9380..244c1eeb7e 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privatecalico.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 841e3c6795..37d31df8e0 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privatecanal.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 475e7edaaa..76d4535f38 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privatecanal.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index a16b1d2306..76f12620ce 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privatecilium.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index cc35f9d824..09106ad0cc 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privatecilium.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index a16b1d2306..76f12620ce 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privatecilium.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index cc35f9d824..09106ad0cc 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privatecilium.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_manifests-etcdmanager-cilium_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_manifests-etcdmanager-cilium_content index 867977884a..75d102c403 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_manifests-etcdmanager-cilium_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_manifests-etcdmanager-cilium_content @@ -21,7 +21,7 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/cilium --volume-provider=aws --volume-tag=k8s.io/etcd/cilium --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privateciliumadvanced.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 9efbd11d4b..4d391ac04f 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privateciliumadvanced.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index b33be8a4e8..cff89d0d07 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privateciliumadvanced.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 567e49e918..e9c079984d 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privatedns1.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 8e6e0d9caa..7e75301cb7 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privatedns1.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 0523721b40..6bfe158ac3 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privatedns2.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 41a02e115e..53eae95777 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privatedns2.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index f93ded46f1..e0a12fb755 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privateflannel.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index dfb17dfe5a..6d80e8c99b 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privateflannel.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 7a46b27e6a..45714f4e16 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privatekopeio.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index efd1a386d6..b7f7d460ed 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privatekopeio.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 9a6f9241ae..25a76ff77b 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privateweave.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index fe1196b034..33c9f8e552 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privateweave.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 1efdf6e9e5..601ff7d547 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index b0a1d53edf..b71cd64309 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index b6b0aafb31..760e99a1dd 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/sharedsubnet.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 0afe70e03f..245020e6eb 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -21,7 +21,7 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/sharedsubnet.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index db12a5a7d3..e177f1eba7 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/sharedvpc.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 13f7b5ead7..ea762ce40b 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/sharedvpc.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 4329177eb6..e48707425a 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/unmanaged.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index e0487b3cfd..6825d97e38 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/unmanaged.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 1efdf6e9e5..601ff7d547 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index b0a1d53edf..b71cd64309 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -20,7 +20,7 @@ spec: --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 - image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210430 + image: k8s.gcr.io/etcdadm/etcd-manager:3.0.20210707 name: etcd-manager resources: requests: