From 5d712cbaace09ef975c58cc2d985de6e7b2776f0 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Mon, 9 Jan 2023 20:04:23 +0200 Subject: [PATCH] Run hack/update-expected.sh --- .../cilium-eni/expected-v1alpha2.yaml | 4 ++++ .../complex/expected-v1alpha2.yaml | 4 ++++ .../different-amis/expected-v1alpha2.yaml | 4 ++++ .../gce_byo_sa/expected-v1alpha2.yaml | 4 ++++ .../create_cluster/ha/expected-v1alpha2.yaml | 4 ++++ .../ha_encrypt/expected-v1alpha2.yaml | 4 ++++ .../ha_gce/expected-v1alpha2.yaml | 4 ++++ .../ha_hetzner/expected-v1alpha2.yaml | 4 ++++ .../ha_openstack/expected-v1alpha2.yaml | 4 ++++ .../ha_openstack_nodns/expected-v1alpha2.yaml | 4 ++++ .../expected-v1alpha2.yaml | 4 ++++ .../ha_shared_zone/expected-v1alpha2.yaml | 4 ++++ .../ha_shared_zones/expected-v1alpha2.yaml | 4 ++++ .../ingwspecified/expected-v1alpha2.yaml | 4 ++++ .../create_cluster/ipv6/expected-v1alpha2.yaml | 4 ++++ .../karpenter/expected-v1alpha2.yaml | 4 ++++ .../minimal-1.22/expected-v1alpha2.yaml | 4 ++++ .../minimal-1.23/expected-v1alpha2.yaml | 4 ++++ .../minimal-1.24/expected-v1alpha2.yaml | 4 ++++ .../minimal-1.25/expected-v1alpha2.yaml | 4 ++++ .../minimal-1.26-arm64/expected-v1alpha2.yaml | 4 ++++ .../expected-v1alpha2.yaml | 4 ++++ .../minimal-1.26-gce/expected-v1alpha2.yaml | 4 ++++ .../minimal-1.26-irsa/expected-v1alpha2.yaml | 4 ++++ .../minimal-1.26/expected-v1alpha2.yaml | 4 ++++ .../expected-v1alpha2.yaml | 4 ++++ .../minimal_hetzner/expected-v1alpha2.yaml | 4 ++++ .../ngwspecified/expected-v1alpha2.yaml | 4 ++++ .../overrides/expected-v1alpha2.yaml | 4 ++++ .../private/expected-v1alpha2.yaml | 4 ++++ .../private_gce/expected-v1alpha2.yaml | 4 ++++ .../expected-v1alpha2.yaml | 4 ++++ .../shared_subnets/expected-v1alpha2.yaml | 4 ++++ .../expected-v1alpha2.yaml | 4 ++++ .../shared_vpc/expected-v1alpha2.yaml | 4 ++++ ...ers.additionalobjects.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...sters.bastionuserdata.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...ority-expander-custom.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...cas-priority-expander.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...st-1a.masters.complex.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...t-1a.masters.compress.example.com_user_data | 2 +- ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...1a.masters.containerd.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...1a.masters.containerd.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...s-test-1a.masters.123.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...est-1a.masters.docker.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ....masters.existing-iam.example.com_user_data | 18 ++++++++++++++++++ ....masters.existing-iam.example.com_user_data | 18 ++++++++++++++++++ ....masters.existing-iam.example.com_user_data | 18 ++++++++++++++++++ ...ws_s3_object_cluster-completed.spec_content | 18 ++++++++++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...tcdmanager-events-master-us-test-1b_content | 5 +++++ ...tcdmanager-events-master-us-test-1c_content | 7 +++++++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1b_content | 5 +++++ ...-etcdmanager-main-master-us-test-1c_content | 7 +++++++ ...1a.masters.existingsg.example.com_user_data | 18 ++++++++++++++++++ ...1b.masters.existingsg.example.com_user_data | 18 ++++++++++++++++++ ...1c.masters.existingsg.example.com_user_data | 18 ++++++++++++++++++ ...ws_s3_object_cluster-completed.spec_content | 18 ++++++++++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...tcdmanager-events-master-us-test-1b_content | 5 +++++ ...tcdmanager-events-master-us-test-1c_content | 7 +++++++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1b_content | 5 +++++ ...-etcdmanager-main-master-us-test-1c_content | 7 +++++++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...1a.masters.externallb.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...ters.externalpolicies.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...us-test-1a.masters.ha.example.com_user_data | 18 ++++++++++++++++++ ...us-test-1b.masters.ha.example.com_user_data | 18 ++++++++++++++++++ ...us-test-1c.masters.ha.example.com_user_data | 18 ++++++++++++++++++ ...ws_s3_object_cluster-completed.spec_content | 18 ++++++++++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...tcdmanager-events-master-us-test-1b_content | 5 +++++ ...tcdmanager-events-master-us-test-1c_content | 7 +++++++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1b_content | 5 +++++ ...-etcdmanager-main-master-us-test-1c_content | 7 +++++++ ...ws_s3_object_cluster-completed.spec_content | 18 ++++++++++++++++++ ...tcdmanager-events-master-us-test1-a_content | 3 +++ ...tcdmanager-events-master-us-test1-b_content | 5 +++++ ...tcdmanager-events-master-us-test1-c_content | 7 +++++++ ...-etcdmanager-main-master-us-test1-a_content | 3 +++ ...-etcdmanager-main-master-us-test1-b_content | 5 +++++ ...-etcdmanager-main-master-us-test1-c_content | 7 +++++++ ...-ha-gce-example-com_metadata_startup-script | 18 ++++++++++++++++++ ...-ha-gce-example-com_metadata_startup-script | 18 ++++++++++++++++++ ...-ha-gce-example-com_metadata_startup-script | 18 ++++++++++++++++++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test1-a_content | 3 +++ ...-etcdmanager-main-master-us-test1-a_content | 3 +++ ...minimal-example-com_metadata_startup-script | 10 ++++++++++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ....masters.minimal-etcd.example.com_user_data | 7 ++++++- ...ws_s3_object_cluster-completed.spec_content | 7 ++++++- ...tcdmanager-events-master-us-test-1a_content | 2 +- ...-etcdmanager-main-master-us-test-1a_content | 3 +++ .../minimal-etcd/in-v1alpha2.yaml | 4 ++-- ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ....masters.minimal-ipv6.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ....masters.minimal-ipv6.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ....masters.minimal-ipv6.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ....masters.minimal-ipv6.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ....cluster-name.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...ters.minimal-warmpool.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test1-a_content | 3 +++ ...-etcdmanager-main-master-us-test1-a_content | 3 +++ ...mal-gce-example-com_metadata_startup-script | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test1-a_content | 3 +++ ...-etcdmanager-main-master-us-test1-a_content | 3 +++ ...mal-gce-example-com_metadata_startup-script | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test1-a_content | 3 +++ ...-etcdmanager-main-master-us-test1-a_content | 3 +++ ...gce-ilb-example-com_metadata_startup-script | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test1-a_content | 3 +++ ...-etcdmanager-main-master-us-test1-a_content | 3 +++ ...ng-name-example-com_metadata_startup-script | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test1-a_content | 3 +++ ...-etcdmanager-main-master-us-test1-a_content | 3 +++ ...ng-name-example-com_metadata_startup-script | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test1-a_content | 3 +++ ...-etcdmanager-main-master-us-test1-a_content | 3 +++ ...private-example-com_metadata_startup-script | 10 ++++++++++ ...test-1a.masters.minimal.k8s.local_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...test-1a.masters.minimal.k8s.local_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...ests-etcdmanager-events-master-fsn1_content | 2 ++ ...ifests-etcdmanager-main-master-fsn1_content | 2 ++ .../data/hcloud_server_master-fsn1_user_data | 10 ++++++++++ ...asters.mixedinstances.example.com_user_data | 18 ++++++++++++++++++ ...asters.mixedinstances.example.com_user_data | 18 ++++++++++++++++++ ...asters.mixedinstances.example.com_user_data | 18 ++++++++++++++++++ ...ws_s3_object_cluster-completed.spec_content | 18 ++++++++++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...tcdmanager-events-master-us-test-1b_content | 5 +++++ ...tcdmanager-events-master-us-test-1c_content | 7 +++++++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1b_content | 5 +++++ ...-etcdmanager-main-master-us-test-1c_content | 7 +++++++ ...asters.mixedinstances.example.com_user_data | 18 ++++++++++++++++++ ...asters.mixedinstances.example.com_user_data | 18 ++++++++++++++++++ ...asters.mixedinstances.example.com_user_data | 18 ++++++++++++++++++ ...ws_s3_object_cluster-completed.spec_content | 18 ++++++++++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...tcdmanager-events-master-us-test-1b_content | 5 +++++ ...tcdmanager-events-master-us-test-1c_content | 7 +++++++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1b_content | 5 +++++ ...-etcdmanager-main-master-us-test-1c_content | 7 +++++++ ...essor.longclustername.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...essor.longclustername.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...ers.private-shared-ip.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...private-shared-subnet.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...masters.privatecalico.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ....masters.privatecanal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...masters.privatecilium.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...masters.privatecilium.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...masters.privatecilium.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...privateciliumadvanced.example.com_user_data | 15 +++++++++++++++ ...ws_s3_object_cluster-completed.spec_content | 15 +++++++++++++++ ...tcdmanager-cilium-master-us-test-1a_content | 3 +++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...a.masters.privatedns1.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...a.masters.privatedns2.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...asters.privateflannel.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...masters.privatekopeio.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ....masters.privateweave.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ....masters.sharedsubnet.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...-1a.masters.sharedvpc.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ....masters.minimal-ipv6.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...-1a.masters.unmanaged.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ ...st-1a.masters.minimal.example.com_user_data | 10 ++++++++++ ...ws_s3_object_cluster-completed.spec_content | 10 ++++++++++ ...tcdmanager-events-master-us-test-1a_content | 3 +++ ...-etcdmanager-main-master-us-test-1a_content | 3 +++ 381 files changed, 2592 insertions(+), 6 deletions(-) diff --git a/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml b/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml index 93a74eff47..6d41111c44 100644 --- a/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml @@ -17,6 +17,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -24,6 +26,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml index fac02efcd9..f62cbe5ce2 100644 --- a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml @@ -17,6 +17,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -24,6 +26,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/different-amis/expected-v1alpha2.yaml b/tests/integration/create_cluster/different-amis/expected-v1alpha2.yaml index e71fbc1732..6dd621f3c0 100644 --- a/tests/integration/create_cluster/different-amis/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/different-amis/expected-v1alpha2.yaml @@ -19,6 +19,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -26,6 +28,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml b/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml index aa076a1dcd..55700e9b76 100644 --- a/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml @@ -18,12 +18,16 @@ spec: etcdMembers: - instanceGroup: control-plane-us-test1-a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m etcdMembers: - instanceGroup: control-plane-us-test1-a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml index 48060c1836..8ad8f5b875 100644 --- a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml @@ -23,6 +23,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1c name: c + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -36,6 +38,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1c name: c + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml index 76ef0cb0fc..1c6c7f243a 100644 --- a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml @@ -23,6 +23,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1c name: c + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -36,6 +38,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1c name: c + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml index d37382792e..31cbb546a7 100644 --- a/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml @@ -21,6 +21,8 @@ spec: name: b - instanceGroup: control-plane-us-test1-c name: c + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -31,6 +33,8 @@ spec: name: b - instanceGroup: control-plane-us-test1-c name: c + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/ha_hetzner/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_hetzner/expected-v1alpha2.yaml index 61f5ba57bb..601a4c8054 100644 --- a/tests/integration/create_cluster/ha_hetzner/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_hetzner/expected-v1alpha2.yaml @@ -21,6 +21,8 @@ spec: name: etcd-2 - instanceGroup: control-plane-fsn1-3 name: etcd-3 + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -31,6 +33,8 @@ spec: name: etcd-2 - instanceGroup: control-plane-fsn1-3 name: etcd-3 + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/ha_openstack/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_openstack/expected-v1alpha2.yaml index fdef2d2274..c64a7d3ab7 100644 --- a/tests/integration/create_cluster/ha_openstack/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_openstack/expected-v1alpha2.yaml @@ -32,6 +32,8 @@ spec: name: etcd-2 - instanceGroup: control-plane-us-test1-3 name: etcd-3 + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -42,6 +44,8 @@ spec: name: etcd-2 - instanceGroup: control-plane-us-test1-3 name: etcd-3 + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/ha_openstack_nodns/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_openstack_nodns/expected-v1alpha2.yaml index ec63513350..e27554adcc 100644 --- a/tests/integration/create_cluster/ha_openstack_nodns/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_openstack_nodns/expected-v1alpha2.yaml @@ -40,6 +40,8 @@ spec: name: etcd-2 - instanceGroup: control-plane-us-test1-3 name: etcd-3 + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -50,6 +52,8 @@ spec: name: etcd-2 - instanceGroup: control-plane-us-test1-3 name: etcd-3 + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/ha_openstack_octavia/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_openstack_octavia/expected-v1alpha2.yaml index 7f2efd1579..4b40f59c16 100644 --- a/tests/integration/create_cluster/ha_openstack_octavia/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_openstack_octavia/expected-v1alpha2.yaml @@ -38,6 +38,8 @@ spec: name: etcd-2 - instanceGroup: control-plane-us-test1-3 name: etcd-3 + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -48,6 +50,8 @@ spec: name: etcd-2 - instanceGroup: control-plane-us-test1-3 name: etcd-3 + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml index e5e2a4c3f5..444dc30ad4 100644 --- a/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml @@ -23,6 +23,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a-3 name: etcd-3 + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -36,6 +38,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a-3 name: etcd-3 + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml index d4bd4da819..169b298715 100644 --- a/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml @@ -29,6 +29,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a-3 name: a-3 + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -48,6 +50,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a-3 name: a-3 + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml b/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml index db8dfba77e..6ba2e49d93 100644 --- a/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml @@ -19,6 +19,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -26,6 +28,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml b/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml index 3549332be4..35d70d0326 100644 --- a/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ipv6/expected-v1alpha2.yaml @@ -20,6 +20,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -27,6 +29,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml b/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml index 085fb259f3..146b37a5dc 100644 --- a/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/karpenter/expected-v1alpha2.yaml @@ -17,6 +17,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -24,6 +26,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/minimal-1.22/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.22/expected-v1alpha2.yaml index 0fa425d319..82c61c8f0f 100644 --- a/tests/integration/create_cluster/minimal-1.22/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.22/expected-v1alpha2.yaml @@ -17,6 +17,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -24,6 +26,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/minimal-1.23/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.23/expected-v1alpha2.yaml index a307b5ace1..95c36f0637 100644 --- a/tests/integration/create_cluster/minimal-1.23/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.23/expected-v1alpha2.yaml @@ -17,6 +17,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -24,6 +26,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/minimal-1.24/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.24/expected-v1alpha2.yaml index 78c68b2435..ba75c2e72f 100644 --- a/tests/integration/create_cluster/minimal-1.24/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.24/expected-v1alpha2.yaml @@ -17,6 +17,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -24,6 +26,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/minimal-1.25/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.25/expected-v1alpha2.yaml index afc48b5978..1cb2ad6b27 100644 --- a/tests/integration/create_cluster/minimal-1.25/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.25/expected-v1alpha2.yaml @@ -17,6 +17,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -24,6 +26,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/minimal-1.26-arm64/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.26-arm64/expected-v1alpha2.yaml index d151f66499..0d728adf9b 100644 --- a/tests/integration/create_cluster/minimal-1.26-arm64/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.26-arm64/expected-v1alpha2.yaml @@ -17,6 +17,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -24,6 +26,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/minimal-1.26-gce-dns-none/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.26-gce-dns-none/expected-v1alpha2.yaml index 6d27e4ac56..eeda5b00db 100644 --- a/tests/integration/create_cluster/minimal-1.26-gce-dns-none/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.26-gce-dns-none/expected-v1alpha2.yaml @@ -18,12 +18,16 @@ spec: etcdMembers: - instanceGroup: control-plane-us-test1-a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m etcdMembers: - instanceGroup: control-plane-us-test1-a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/minimal-1.26-gce/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.26-gce/expected-v1alpha2.yaml index 71cf70a9e1..da3cde07eb 100644 --- a/tests/integration/create_cluster/minimal-1.26-gce/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.26-gce/expected-v1alpha2.yaml @@ -17,12 +17,16 @@ spec: etcdMembers: - instanceGroup: control-plane-us-test1-a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m etcdMembers: - instanceGroup: control-plane-us-test1-a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/minimal-1.26-irsa/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.26-irsa/expected-v1alpha2.yaml index efa4556e9d..d8cc30ac2e 100644 --- a/tests/integration/create_cluster/minimal-1.26-irsa/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.26-irsa/expected-v1alpha2.yaml @@ -17,6 +17,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -24,6 +26,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/minimal-1.26/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.26/expected-v1alpha2.yaml index 07d03d212d..e2474b4f3e 100644 --- a/tests/integration/create_cluster/minimal-1.26/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal-1.26/expected-v1alpha2.yaml @@ -17,6 +17,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -24,6 +26,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/minimal_feature-gates/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal_feature-gates/expected-v1alpha2.yaml index e493d92594..850fb31233 100644 --- a/tests/integration/create_cluster/minimal_feature-gates/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal_feature-gates/expected-v1alpha2.yaml @@ -17,6 +17,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -24,6 +26,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/minimal_hetzner/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal_hetzner/expected-v1alpha2.yaml index 9ab38760cd..273da7414e 100644 --- a/tests/integration/create_cluster/minimal_hetzner/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal_hetzner/expected-v1alpha2.yaml @@ -17,12 +17,16 @@ spec: etcdMembers: - instanceGroup: control-plane-fsn1 name: etcd-1 + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m etcdMembers: - instanceGroup: control-plane-fsn1 name: etcd-1 + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml b/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml index 37a97511db..430ea38718 100644 --- a/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml @@ -19,6 +19,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -26,6 +28,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml index de61491f57..5a747ff974 100644 --- a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml @@ -17,6 +17,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -24,6 +26,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/private/expected-v1alpha2.yaml b/tests/integration/create_cluster/private/expected-v1alpha2.yaml index 8fe2301bc1..03ade31fcd 100644 --- a/tests/integration/create_cluster/private/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private/expected-v1alpha2.yaml @@ -23,6 +23,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -30,6 +32,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml b/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml index d6f76a16ff..9156b9418b 100644 --- a/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml @@ -23,12 +23,16 @@ spec: etcdMembers: - instanceGroup: control-plane-us-test1-a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m etcdMembers: - instanceGroup: control-plane-us-test1-a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml b/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml index f044ea20e2..1c44d763c0 100644 --- a/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml @@ -19,6 +19,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -26,6 +28,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml b/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml index 2cb4da49d8..98dc5ba8b8 100644 --- a/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml @@ -17,6 +17,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -24,6 +26,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml b/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml index 2cb4da49d8..98dc5ba8b8 100644 --- a/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml @@ -17,6 +17,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -24,6 +26,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: diff --git a/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml b/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml index 5c6145cc80..25c3c79f89 100644 --- a/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml @@ -17,6 +17,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: main - cpuRequest: 100m @@ -24,6 +26,8 @@ spec: - encryptedVolume: true instanceGroup: control-plane-us-test-1a name: a + manager: + backupRetentionDays: 90 memoryRequest: 100Mi name: events iam: 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 da734774c8..adfb179c27 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 @@ -129,10 +129,20 @@ encryptionConfig: null etcdClusters: events: cpuRequest: 100m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 main: cpuRequest: 200m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 kubeAPIServer: 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 0b88438f40..c428a717c9 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 @@ -35,6 +35,11 @@ spec: - encryptedVolume: true instanceGroup: master-us-test-1a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: main version: 3.5.6 @@ -45,6 +50,11 @@ spec: - encryptedVolume: true instanceGroup: master-us-test-1a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: events version: 3.5.6 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 4563cacfb9..d1a0b945e4 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/additionalobjects.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 79788101e2..056731618c 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/additionalobjects.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 048ab90944..f831373e9f 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 dafd48e044..ad5d0e80ef 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 @@ -31,6 +31,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -38,6 +43,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 d76f5d011e..e95ef35ae2 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 @@ -21,6 +21,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 2b1f2c8d7a..d9cfe58288 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 @@ -21,6 +21,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 3debad3bfe..1aec12e5d0 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 981334a787..9315007c82 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 @@ -45,6 +45,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -52,6 +57,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 43e6b1c894..73528712f7 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 205fc7a2e3..e94db0ba71 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 8b2d4feb09..4cec8899df 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 52a648586d..5a06619a4d 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 @@ -43,6 +43,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -50,6 +55,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 3c493c52ba..f327913b9e 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/bastionuserdata.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 99219249d7..2dd5067122 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/bastionuserdata.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 90147bb7db..6e8ecd3dce 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 430512765d..8f8f61fb4d 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content @@ -64,6 +64,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -71,6 +76,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 0f8b9d8511..cd12311ad5 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 @@ -19,6 +19,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/cas-priority-expander-custom.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 ba8c2076ac..2cc8f3b216 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 @@ -19,6 +19,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/cas-priority-expander-custom.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 9083f3fdea..e3d3f1581c 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 25a3d87fd0..60a6686b16 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content @@ -57,6 +57,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -64,6 +69,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 b8692fd565..71796ca36b 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/cas-priority-expander.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 b9934542ba..02895232ed 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/cas-priority-expander.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 28cc4c1e4d..a20ac8d435 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 @@ -137,8 +137,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 0c5a58a7a2..cf8074885e 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 @@ -63,6 +63,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -70,6 +75,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 5e786ecb7d..b0aa044900 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/complex.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 857ac9d3ef..954913bd24 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/complex.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 1610513411..fd42fbb8bb 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/+xWTXPbNhO+61dg8k5uESnGjt+Wk4sqpbFqy1Ulu+4VAlYUahBgFwBt9dd3FiAl+avTTqeZHjKZicV9Fov9ePYhhbZBTqzZqKocMFZzwytYeYu8gonmzoErmccAAzACd41X1nTuzAStB+CFnOjgPKCjCNCC8fEXYy2gU9aU7CT7kJ3F8Mq8CN2FNYwXsxVgC0geXGt7v0DVKg0VyC4HxrixZlfb4MbBb0u24dpFc6PGQSowAuLdQ0YR0YAHl7lWZBI2PGifXNM1ExuML1lBtuC3FtXvnMqbWwklG+t7vnNjSmPA2FoZOZYSwbmSjbL4b8BY7N4CbaskYMngwQMarqkNhq81jGWtHNW50KFSpkvtitfgGi7gUm1A7ISGaL5UtfJLbirA+ExZKgFjISjRaJqmKo7nc2y/thow1rACYY1M4Dx47pWp9sncwnpr7V0Ef+ZaydfhKythCc6jEhQ22pbgbEABPwXrOZXqhUwd7erbet+4Ms+L9/+PnSrK09GoeOz5YwuISvbTyhNt/vfi0fcDxjbAfUD4zD105JqsZnNVpXLHt6uSvSGKvInYzFwjQGr6+HZ1YxAqRRQ98lI1r6BkCcFddveNy5TNiTdD3iiXqNgW2fuzOGsCNPgFwgYQoafD9a7pi5iZNP7ZIj6eW+cNr9NwPz0cYdpWl9CCLhmVhvBbAOe3wCVgJBzISJEUlVcVQsW9xae+nx488vP4k7JSD/2RX4ZLqK2HYfQYPj33GW1o0rmnByL01P/GUeo1vHyE0AFjDkRAWFj0JTs9PYmWY/7OnAvU/37CvFGZ6hqWCVs31MwMHnjdaCDDswg/3F6sbpazvxEitw0YJfO2yH+9v3OHiJ1gzRZx3UpWjEbZ2SkxLi9i6mnBvuPiDowsI3FPokhNrPFotQacR6nci5XgHmhbJrPp0h3kynsutlOg/5e0k0JpWO2MWAAqK0tW1CP3p0IiUqoUNuX57VnKsziAxJaSvdJEEdU6IEzojqUNtEF74fyyeyX23RvWXfsOC6YTqTVEqUnJHNn2PX28PcHBY6GcIEgwXnHdj4GuXoktyKDTvL5s0W5/9T+rtROg8vW3oKhofaeoSLmY2zkPtdzbl9b6kuV/hW3Tq9XRUhSjI8TGd3j/mBHxD++7KaxDVSlTnXMjNWlFXwi06Q1yzlGWrIba4i7jLVeazn0sRqO5emeshI17ZH7bGxX9dd8jwMcPb9/Ffj9z7a2PfP+VedMs0mItOE0gbznmWq3zbkj5weEZYxsrZ2aDnKSEKwM4e5k8DQ8OypP44dRYOedGbcD57kLwIj984+R1h5KYNGg9CH9BmO4+DQ6T6KvpNoKat8fcNnhp781n5AJ6iTqJCvUCNEHlleB6YaUjurhBzSnyxVeifiXqf5uofwAAAP//AQAA//+LPOjh9wwAAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml +echo "H4sIAAAAAAAA/+xWX2/bNhB/96cgOvStluwmzVahL6qdJV5i17OTZXsKaPIsc6FI7Ugq8T79cJRkO2kybBhW9KEIEIt3x+P9+d2PFNoGObJmrYqsx1jJDS9g6S3yAkaaOwcuYx4D9MAI3FZeWdOaMxO07oEXcqSD84COPEANxsevzhs2C8ZWXNyFagEeDLkZ863L2PtBqwVTd4Z9ZngJGTu9Go1vp/ksPztd3I7zyeVvtx/z0cX1fHm7OL06nV1NPs3aLYzVXAcgfzKKakCnrMnYUfIuOYmpKfPVhXUXVpDPJ0vAugmIa23v56hqpaEA2daeMW6s2ZY2uDz4TcbWXLsorlQepAIjINa8z8gjGvDgEleLRMKaB+0b0+aYkQ3GZ2xIsuA3FtWfnBKfWgkZy/U937qcwugxtlJG5lIiOJexQRL/eoxF1MzR1koCZgwePKDhmtpv+EpDLkvlKM+5DoUybWgzXoKruIBLtQaxFRqi+FKVyi+4KQDjmqJUAnIhKNAoGjdZHOLyUH5lNWDMYQnCGtkop8Fzr0yxC+YGVhtr76LyF66VfFk9sxIW4DwqQW6jbAHOBhTwc7CeU6peyKaibX4b7yuXpenw7fexUsPseDAYPrb8VAOikl230mZcvnt269seY2vgPiCccQ/tUI2Wk6kqmnTzm2XGXhFEXkXdxFwhQFP0/GZ5bRAKRaN5YKVKXkDGGg1uk7sfXKJsSrjp80q5Bor1MHl7EntNCg1+jrAGROjgcLWtuiQmpmn/ZB6X59Z5GpS4OH040GlbXEINOmOUGsIfAZzfAJeAEXAgI0Qar7woEAruLT61PX3wyM/jJ0WlHrotv/YXUFoP/WjRf7rvDG2omn1PN0TVU/trR6GX8PwW0vYYcyACwtyiz9jx8VGUHOJ34lyg+ncd5pVKVFuwRNiyomIm8MDLSgMJPvPw083F8nox+RcuUluBUTKth+nv93du77El6sk8jlvGhoNBcnJMiEuHMfRmwD5ycQdGZhG4R5GkRtZ4tFoDTvfsSWQluAealtFkvHB7uvKei80Y6P+CZlIoDcutEXNAZWXGhuXA/S2RiCZUctvE+f6kiXO4V84iHb9QRBFvqYAwojMWNtAE7Yjzy86V2FWv310++wHTDag1RKppgjmQ7Wr6eHqCg8dEOUKQdINx3bWBjl6KDcigm3592aTd7uj/lmtLQNnLt6AoaHzHqIi5mNs6D6XcyRfW+oyl/wRt49nyYCiGgwONje+HbpkQ8Pf33RhWoSiUKc65kZq4oksE6uYGOecoM1ZCaXGb8JorTfs+DAeDqXpjrIS1eyR+3QkV/bofEeDDu9dvYr0/M+2kj2z/l35TL5rBmnPqQFpzTLVapW2T0r3BZ4itrJyYNXKiEq4M4OR58FQ8OMiO4qOtsnLKjVqD8+2B4EW6f+OkZaslMqnQehD+gnS6fRrsO9Fl004EFW+nc5vgpb03Z8gFdBR1FBnqGdUIlVeC67mVjuDieiUnzxffgPoNqF83UP8CAAD//wEAAP//NjB4E+8NAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml echo "H4sIAAAAAAAA/1SOzUrEMBRG93mKvECno8IwBFxoFjMDUmOhCu4uye2PJLkhN6k+vpRZdfvxncPRnqozmdbFYVYSflloiuMyvQKjkgHDyKptra9cMPMB/yAkjwdLobUUUkbejeIWuUC0eMlUUwdhk8DGNpWbglyaB9ifevKopKZYMnnjIaLoyGFN95Ar8Kzkt/s6r8EM/c/HVXNX7NPjy+kYzfvgfH86Yq03vrxN8Dmfn8U/AAAA//8BAAD//y6lEefVAAAA" | 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 384456933f..2f883d1daf 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 @@ -41,6 +41,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -48,6 +53,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 c41555c3f7..a3def2b887 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/compress.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 1e23c1950d..1dde004667 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/compress.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 82128287db..6ac97f2a21 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 a26f0267e0..f4a7bd2148 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 @@ -49,6 +49,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -56,6 +61,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 58ead6a783..f70c666446 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/containerd.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 84dc58da40..08ba5009c1 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/containerd.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 0f3ee489d8..b45ba474d7 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 9d4ebba5eb..3a4cac034a 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 @@ -41,6 +41,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -48,6 +53,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 58ead6a783..f70c666446 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/containerd.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 84dc58da40..08ba5009c1 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/containerd.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 b8102aa924..3545477fe5 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 1aa84743be..cc7d501e6e 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 @@ -41,6 +41,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -48,6 +53,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 9f571ae37f..fcf4c21e41 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/123.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 36275d3947..eeec3c9a95 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/123.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 22752742d3..7e2d539d3a 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 7f5f239639..7afd1e8a6e 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 @@ -47,6 +47,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -54,6 +59,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 7ecadb05a4..58761bfbac 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/docker.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 fa3ea3edce..fb51d764f5 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/docker.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 e91b4d5e44..b75a70767b 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 @@ -128,8 +128,26 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 7a9fb955b8..8231d79581 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 @@ -128,8 +128,26 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 24ef258a3a..f741ba3caf 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 @@ -128,8 +128,26 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 05273912ef..8223492d42 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 @@ -45,6 +45,15 @@ spec: name: b - instanceGroup: master-us-test-1c name: c + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -56,6 +65,15 @@ spec: name: b - instanceGroup: master-us-test-1c name: c + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 26e5394217..e365cdb4c0 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 @@ -18,6 +18,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 26e5394217..2be5f0669d 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 @@ -18,6 +18,11 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 26e5394217..c3b0635c03 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 @@ -18,6 +18,13 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 169e002a3e..3a0f9487cf 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 @@ -18,6 +18,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 169e002a3e..1b0e4d9496 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 @@ -18,6 +18,11 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 169e002a3e..ac7af3abaf 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 @@ -18,6 +18,13 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 039f676094..43226b87da 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 @@ -128,8 +128,26 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 3ef1e1ffc8..0ac47b5b65 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 @@ -128,8 +128,26 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 5f44044dfe..b8b1c5768d 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 @@ -128,8 +128,26 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 08662f9084..079a264c4c 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 @@ -48,6 +48,15 @@ spec: name: b - instanceGroup: master-us-test-1c name: c + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -59,6 +68,15 @@ spec: name: b - instanceGroup: master-us-test-1c name: c + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 d9dc9ed737..e204802fce 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 d9dc9ed737..a9336ec779 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 @@ -19,6 +19,11 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 d9dc9ed737..8b1f204e47 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 @@ -19,6 +19,13 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 e81a302307..1e4809e592 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 e81a302307..1cc9a69a2c 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 @@ -19,6 +19,11 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 e81a302307..e34ae009e9 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 @@ -19,6 +19,13 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 3ea389721b..fb320ca676 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 d8e084681b..fd40293cbc 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 @@ -41,6 +41,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -48,6 +53,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 43e6b1c894..73528712f7 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 205fc7a2e3..e94db0ba71 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 3debad3bfe..1aec12e5d0 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 d94379c468..2ad6ced707 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 @@ -41,6 +41,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -48,6 +53,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 43e6b1c894..73528712f7 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 205fc7a2e3..e94db0ba71 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 d68fe32f2a..104abd29c7 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 b76d5d463b..6596acdc43 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 @@ -41,6 +41,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -48,6 +53,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 4880ab0e83..d66f373345 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/externallb.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 b2f5067d85..b5cd8c0987 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/externallb.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 61694710ea..558c47e9f5 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 b3120270cf..0e13513d0a 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 @@ -49,6 +49,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -56,6 +61,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 3bb49a42b4..ee7ffc6c3c 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/externalpolicies.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 ffb5b10d08..5acb5fd85a 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/externalpolicies.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 7f97916258..20600743ce 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 @@ -128,8 +128,26 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 6279c94351..36e02d1ba8 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 @@ -128,8 +128,26 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 8967bceaac..48e713a09f 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 @@ -128,8 +128,26 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 f2cfbcd918..629c504d72 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 @@ -45,6 +45,15 @@ spec: name: b - instanceGroup: master-us-test-1c name: c + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -56,6 +65,15 @@ spec: name: b - instanceGroup: master-us-test-1c name: c + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 915dde204e..c980b5c40f 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 @@ -18,6 +18,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/ha.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 915dde204e..a9ef4674bd 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 @@ -18,6 +18,11 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/ha.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 915dde204e..854e05fd52 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 @@ -18,6 +18,13 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/ha.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 4ab6332129..40879f3d24 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 @@ -18,6 +18,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/ha.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 4ab6332129..1465d031c0 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 @@ -18,6 +18,11 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/ha.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 4ab6332129..b4ea6ee039 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 @@ -18,6 +18,13 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/ha.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 baea52177d..ac340c83d3 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 @@ -47,6 +47,15 @@ spec: name: b - instanceGroup: master-us-test1-c name: c + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: main version: 3.5.6 @@ -60,6 +69,15 @@ spec: name: b - instanceGroup: master-us-test1-c name: c + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: events version: 3.5.6 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 99a25066ae..67ad3d21bf 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 @@ -18,6 +18,9 @@ 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 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 99a25066ae..b055f0684d 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 @@ -18,6 +18,11 @@ 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 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 99a25066ae..578bbe0e13 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 @@ -18,6 +18,13 @@ 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 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 bce34a777b..9455130c02 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 @@ -18,6 +18,9 @@ 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 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 bce34a777b..0341a52e2f 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 @@ -18,6 +18,11 @@ 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 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 bce34a777b..5e464eb281 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 @@ -18,6 +18,13 @@ 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 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 097e0ed85a..68d11ff92a 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 @@ -128,10 +128,28 @@ encryptionConfig: null etcdClusters: events: cpuRequest: 100m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 main: cpuRequest: 200m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 kubeAPIServer: 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 8a8bde381a..886e7a15b6 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 @@ -128,10 +128,28 @@ encryptionConfig: null etcdClusters: events: cpuRequest: 100m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 main: cpuRequest: 200m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 kubeAPIServer: 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 81ab226ea0..a2fa359946 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 @@ -128,10 +128,28 @@ encryptionConfig: null etcdClusters: events: cpuRequest: 100m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 main: cpuRequest: 200m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 kubeAPIServer: 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 3debad3bfe..1aec12e5d0 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 9e182cede5..934fb293f1 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 @@ -43,6 +43,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -50,6 +55,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 43e6b1c894..73528712f7 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 205fc7a2e3..e94db0ba71 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 fdb91d1683..10b5c73f85 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 217af09f84..b8f240c5ce 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 @@ -41,6 +41,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -48,6 +53,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 43e6b1c894..73528712f7 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 205fc7a2e3..e94db0ba71 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 809010f354..05d8eeb8b7 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 54a077b0af..aff6065eba 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content @@ -60,6 +60,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -67,6 +72,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 43e6b1c894..73528712f7 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 205fc7a2e3..e94db0ba71 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 ac3da03db8..f8faa6619b 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 d5dd9cb5aa..8fffeecf03 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 @@ -60,6 +60,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -67,6 +72,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 43e6b1c894..73528712f7 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 205fc7a2e3..e94db0ba71 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 fe3f302d9a..9baedd9af7 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 b67ba22d30..20c1ddc7ee 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content @@ -61,6 +61,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -68,6 +73,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 43e6b1c894..73528712f7 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 205fc7a2e3..e94db0ba71 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 359103fb4c..8345a05b4a 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 65ed46510f..9474ed40fb 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content @@ -60,6 +60,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -67,6 +72,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 43e6b1c894..73528712f7 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 205fc7a2e3..e94db0ba71 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 dc69c289e3..0c76d9f17e 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 93da977486..4b18ea912e 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content @@ -60,6 +60,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -67,6 +72,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 43e6b1c894..73528712f7 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 205fc7a2e3..e94db0ba71 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 64cfc23997..95e1e9a715 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 840955e62b..e351896309 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 @@ -60,6 +60,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -67,6 +72,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 43e6b1c894..73528712f7 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 205fc7a2e3..e94db0ba71 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 a7b061e6b3..cb0fc8a22f 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 @@ -59,6 +59,11 @@ spec: etcdMembers: - instanceGroup: master-us-test1-a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: main version: 3.5.6 @@ -68,6 +73,11 @@ spec: etcdMembers: - instanceGroup: master-us-test1-a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: events version: 3.5.6 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 4da416d405..ad1177f34b 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 @@ -18,6 +18,9 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-events --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-example-com --volume-tag=k8s-io-etcd-events --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 552e604c1f..5b465edd4e 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 @@ -18,6 +18,9 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-main --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-example-com --volume-tag=k8s-io-etcd-main --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 e261e136a0..81855bc417 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 @@ -128,10 +128,20 @@ encryptionConfig: null etcdClusters: events: cpuRequest: 100m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 main: cpuRequest: 200m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 kubeAPIServer: 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 64cfc23997..95e1e9a715 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 08a6b19ee1..e7c53b90c1 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 @@ -61,6 +61,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -68,6 +73,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 43e6b1c894..73528712f7 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 205fc7a2e3..e94db0ba71 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 538f9a5797..5224b275b2 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 @@ -129,10 +129,20 @@ encryptionConfig: null etcdClusters: events: cpuRequest: 100m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 main: cpuRequest: 200m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 kubeAPIServer: 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 6283150da0..95f5504f37 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 @@ -35,6 +35,11 @@ spec: - encryptedVolume: true instanceGroup: master-us-test-1a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: main version: 3.5.6 @@ -45,6 +50,11 @@ spec: - encryptedVolume: true instanceGroup: master-us-test-1a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: events version: 3.5.6 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 07a43652ce..5100b4e05a 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 @@ -18,6 +18,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 2f4d9d3191..36f0b211dc 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 @@ -18,6 +18,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 cc0720c7c9..73bc6dfd07 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 @@ -129,10 +129,20 @@ encryptionConfig: null etcdClusters: events: cpuRequest: 100m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 main: cpuRequest: 200m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 kubeAPIServer: 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 dbe71c00ee..dcd93d9db9 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 @@ -44,6 +44,11 @@ spec: - encryptedVolume: true instanceGroup: master-us-test-1a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: main version: 3.5.6 @@ -54,6 +59,11 @@ spec: - encryptedVolume: true instanceGroup: master-us-test-1a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: events version: 3.5.6 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 07a43652ce..5100b4e05a 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 @@ -18,6 +18,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 2f4d9d3191..36f0b211dc 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 @@ -18,6 +18,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 19e53ed66e..fbff558b6e 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 @@ -129,10 +129,20 @@ encryptionConfig: null etcdClusters: events: cpuRequest: 100m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 main: cpuRequest: 200m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 kubeAPIServer: 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 c033cc1f11..07d62cd74f 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 @@ -43,6 +43,11 @@ spec: - encryptedVolume: true instanceGroup: master-us-test-1a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: main version: 3.5.6 @@ -53,6 +58,11 @@ spec: - encryptedVolume: true instanceGroup: master-us-test-1a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: events version: 3.5.6 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 07a43652ce..5100b4e05a 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 @@ -18,6 +18,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 2f4d9d3191..36f0b211dc 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 @@ -18,6 +18,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 283d72b87f..588361732e 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 @@ -129,10 +129,20 @@ encryptionConfig: null etcdClusters: events: cpuRequest: 100m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 main: cpuRequest: 200m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 kubeAPIServer: 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 f8e20bd659..2666daf0e6 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 @@ -43,6 +43,11 @@ spec: - encryptedVolume: true instanceGroup: master-us-test-1a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: main version: 3.5.6 @@ -53,6 +58,11 @@ spec: - encryptedVolume: true instanceGroup: master-us-test-1a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: events version: 3.5.6 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 07a43652ce..5100b4e05a 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 @@ -18,6 +18,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 2f4d9d3191..36f0b211dc 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 @@ -18,6 +18,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 283d72b87f..588361732e 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 @@ -129,10 +129,20 @@ encryptionConfig: null etcdClusters: events: cpuRequest: 100m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 main: cpuRequest: 200m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 kubeAPIServer: 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 aa79356f3e..7f197c670f 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 @@ -44,6 +44,11 @@ spec: - encryptedVolume: true instanceGroup: master-us-test-1a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: main version: 3.5.6 @@ -54,6 +59,11 @@ spec: - encryptedVolume: true instanceGroup: master-us-test-1a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: events version: 3.5.6 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 07a43652ce..5100b4e05a 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 @@ -18,6 +18,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 2f4d9d3191..36f0b211dc 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 @@ -18,6 +18,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 5c3e2564fc..14275e268b 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 @@ -132,11 +132,12 @@ etcdClusters: - name: us-test-1a volumeSize: 20 manager: + backupRetentionDays: 90 env: - name: ETCD_MANAGER_HOURLY_BACKUPS_RETENTION value: 1d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 30d + value: 90d image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc version: 3.5.6 main: @@ -144,6 +145,10 @@ etcdClusters: - name: us-test-1a volumeSize: 20 manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc logLevel: 10 version: 3.5.6 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 595f5d070f..db3006fcbb 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 @@ -43,6 +43,10 @@ spec: name: us-test-1a volumeSize: 20 manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc logLevel: 10 name: main @@ -54,11 +58,12 @@ spec: name: us-test-1a volumeSize: 20 manager: + backupRetentionDays: 90 env: - name: ETCD_MANAGER_HOURLY_BACKUPS_RETENTION value: 1d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 30d + value: 90d image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc name: events version: 3.5.6 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 e4fb285e58..b11fe40d1f 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 @@ -23,7 +23,7 @@ spec: - name: ETCD_MANAGER_HOURLY_BACKUPS_RETENTION value: 1d - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 30d + value: 90d image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc name: etcd-manager 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 741acefafb..f68fe53b26 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-etcd.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc name: etcd-manager resources: diff --git a/tests/integration/update_cluster/minimal-etcd/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-etcd/in-v1alpha2.yaml index d30b682617..e160012a08 100644 --- a/tests/integration/update_cluster/minimal-etcd/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-etcd/in-v1alpha2.yaml @@ -15,6 +15,7 @@ spec: name: us-test-1a volumeSize: 20 manager: + backupRetentionDays: 90 image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc logLevel: 10 name: main @@ -23,11 +24,10 @@ spec: name: us-test-1a volumeSize: 20 manager: + backupRetentionDays: 30 env: - name: ETCD_MANAGER_HOURLY_BACKUPS_RETENTION value: 1d - - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION - value: 30d image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc name: events iam: {} 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 60f8bb7063..395a1a2ded 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 @@ -131,11 +131,21 @@ etcdClusters: etcdMembers: - name: us-test-1a volumeSize: 20 + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: etcdMembers: - name: us-test-1a volumeSize: 50 + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 085d98d1ad..d3e2aa5fc5 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 @@ -45,6 +45,11 @@ spec: volumeSize: 50 volumeThroughput: 125 volumeType: gp3 + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -54,6 +59,11 @@ spec: name: us-test-1a volumeSize: 20 volumeType: gp3 + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 43e6b1c894..73528712f7 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 205fc7a2e3..e94db0ba71 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 c8eafee9e5..a78a20e9f5 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 b7ac0db621..5850ab0df6 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 @@ -46,6 +46,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -53,6 +58,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 12cc089aeb..f643ff0044 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 7207269e0e..8a131fc052 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 d0979cd8d4..86787bc9f6 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 8f24fba0e1..760d7019e0 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 @@ -46,6 +46,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -53,6 +58,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 12cc089aeb..f643ff0044 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 7207269e0e..8a131fc052 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 d955951e5f..2749afd61e 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 78a2c71f84..6211d63ba6 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 @@ -46,6 +46,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -53,6 +58,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 12cc089aeb..f643ff0044 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 7207269e0e..8a131fc052 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 d955951e5f..2749afd61e 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 00a5910467..682bb67f51 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 @@ -46,6 +46,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -53,6 +58,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 12cc089aeb..f643ff0044 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 7207269e0e..8a131fc052 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 5e8910c3fa..ed83101227 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 1c9086daf2..d9b528933e 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 @@ -41,6 +41,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -48,6 +53,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 ebe03d7d6a..27c4a770eb 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 @@ -19,6 +19,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/this.is.truly.a.really.really.long.cluster-name.minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 6c5e52df2c..cf69c5e7e2 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 @@ -19,6 +19,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/this.is.truly.a.really.really.long.cluster-name.minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 8d4c18f0ea..53d3f55a9e 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 b90811868a..d818c1201a 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 @@ -41,6 +41,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -48,6 +53,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 35ef62bea3..65b9fd8d1a 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-warmpool.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 b736719c67..13f80fb731 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-warmpool.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 058037c612..cf8b5b3cbb 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 e017583d0d..4402a8f4be 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 @@ -41,6 +41,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -48,6 +53,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 43e6b1c894..73528712f7 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 205fc7a2e3..e94db0ba71 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 6f300edddf..d4e5432e87 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 @@ -43,6 +43,11 @@ spec: etcdMembers: - instanceGroup: master-us-test1-a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: main version: 3.5.6 @@ -52,6 +57,11 @@ spec: etcdMembers: - instanceGroup: master-us-test1-a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: events version: 3.5.6 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 6d848574f4..6b9ed48050 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 @@ -18,6 +18,9 @@ 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 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 de25662210..ab0f46590e 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 @@ -18,6 +18,9 @@ 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 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 a55ae7b72c..d74a428d1c 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 @@ -128,10 +128,20 @@ encryptionConfig: null etcdClusters: events: cpuRequest: 100m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 main: cpuRequest: 200m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 kubeAPIServer: 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 68ddcf6fd3..0b13a86e76 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 @@ -46,6 +46,11 @@ spec: etcdMembers: - instanceGroup: master-us-test1-a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: main version: 3.5.6 @@ -55,6 +60,11 @@ spec: etcdMembers: - instanceGroup: master-us-test1-a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: events version: 3.5.6 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 6d848574f4..6b9ed48050 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 @@ -18,6 +18,9 @@ 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 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 de25662210..ab0f46590e 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 @@ -18,6 +18,9 @@ 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 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 a55ae7b72c..d74a428d1c 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 @@ -128,10 +128,20 @@ encryptionConfig: null etcdClusters: events: cpuRequest: 100m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 main: cpuRequest: 200m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 kubeAPIServer: 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 54c353c236..05ec498515 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 @@ -47,6 +47,11 @@ spec: etcdMembers: - instanceGroup: master-us-test1-a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: main version: 3.5.6 @@ -56,6 +61,11 @@ spec: etcdMembers: - instanceGroup: master-us-test1-a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: events version: 3.5.6 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 0c257cc3cc..35b0034e01 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 @@ -19,6 +19,9 @@ spec: --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-ilb-example-com --volume-tag=k8s-io-etcd-events --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 a731c28e15..5040c52ec4 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 @@ -18,6 +18,9 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-main --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-ilb-example-com --volume-tag=k8s-io-etcd-main --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 3a7e2860f3..57b992d2b3 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 @@ -128,10 +128,20 @@ encryptionConfig: null etcdClusters: events: cpuRequest: 100m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 main: cpuRequest: 200m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 kubeAPIServer: 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 42ec55f2e9..cd75d0c3b9 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 @@ -47,6 +47,11 @@ spec: etcdMembers: - instanceGroup: master-us-test1-a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: main version: 3.5.6 @@ -56,6 +61,11 @@ spec: etcdMembers: - instanceGroup: master-us-test1-a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: events version: 3.5.6 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 247e62d935..cdd930ba27 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 @@ -19,6 +19,9 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-events --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-with-a-very-very-very-very-very-long-name-example-com --volume-tag=k8s-io-etcd-events --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 48a03074c6..100300a71d 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 @@ -19,6 +19,9 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-main --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-with-a-very-very-very-very-very-long-name-example-com --volume-tag=k8s-io-etcd-main --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 39fa6c197c..5439a801d4 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 @@ -128,10 +128,20 @@ encryptionConfig: null etcdClusters: events: cpuRequest: 100m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 main: cpuRequest: 200m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 kubeAPIServer: 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 b3f770c1e6..eb6ea67a26 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 @@ -43,6 +43,11 @@ spec: etcdMembers: - instanceGroup: master-us-test1-a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: main version: 3.5.6 @@ -52,6 +57,11 @@ spec: etcdMembers: - instanceGroup: master-us-test1-a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: events version: 3.5.6 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 247e62d935..cdd930ba27 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 @@ -19,6 +19,9 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-events --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-with-a-very-very-very-very-very-long-name-example-com --volume-tag=k8s-io-etcd-events --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 48a03074c6..100300a71d 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 @@ -19,6 +19,9 @@ spec: --v=6 --volume-name-tag=k8s-io-etcd-main --volume-provider=gce --volume-tag=k8s-io-cluster-name=minimal-gce-with-a-very-very-very-very-very-long-name-example-com --volume-tag=k8s-io-etcd-main --volume-tag=k8s-io-role-master=master > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 39fa6c197c..5439a801d4 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 @@ -128,10 +128,20 @@ encryptionConfig: null etcdClusters: events: cpuRequest: 100m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 main: cpuRequest: 200m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 kubeAPIServer: 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 3c41520dcc..3e99d23eb8 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 @@ -43,6 +43,11 @@ spec: etcdMembers: - instanceGroup: master-us-test1-a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: main version: 3.5.6 @@ -52,6 +57,11 @@ spec: etcdMembers: - instanceGroup: master-us-test1-a name: a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: events version: 3.5.6 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 2fd655750d..e468b7db39 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 @@ -19,6 +19,9 @@ 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 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 1f361d48eb..29ee6e23d5 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 @@ -19,6 +19,9 @@ 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 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 80cd030626..ad424f9482 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 @@ -128,10 +128,20 @@ encryptionConfig: null etcdClusters: events: cpuRequest: 100m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 main: cpuRequest: 200m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 kubeAPIServer: 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 baaf36768a..461e5b85be 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 b8de4a9139..b00c0c38c6 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 @@ -40,6 +40,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -47,6 +52,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 e72ba85a57..acfcaa81c1 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.k8s.local=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 3381ee9160..6836771c57 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.k8s.local=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 341ab6ac72..1d863f193a 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 5768d921ee..91376f0342 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 @@ -40,6 +40,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -47,6 +52,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 e72ba85a57..acfcaa81c1 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.k8s.local=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 3381ee9160..6836771c57 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.k8s.local=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 96048543d7..5d701d0c8c 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content @@ -40,6 +40,11 @@ spec: etcdMembers: - instanceGroup: master-fsn1 name: etcd-1 + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: main version: 3.5.6 @@ -49,6 +54,11 @@ spec: etcdMembers: - instanceGroup: master-fsn1 name: etcd-1 + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi name: events version: 3.5.6 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 60f204c2a8..d28db4474f 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 @@ -21,6 +21,8 @@ spec: env: - name: HCLOUD_TOKEN value: REDACTED + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 953b1ee8e2..7a44be3e59 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 @@ -21,6 +21,8 @@ spec: env: - name: HCLOUD_TOKEN value: REDACTED + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 71263bfb0c..3a0e076727 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 @@ -129,10 +129,20 @@ encryptionConfig: null etcdClusters: events: cpuRequest: 100m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 main: cpuRequest: 200m + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d memoryRequest: 100Mi version: 3.5.6 kubeAPIServer: 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 0ae9c7cbd6..3425e0e7ac 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 @@ -128,8 +128,26 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 3ffe456468..8b86a18427 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 @@ -128,8 +128,26 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 98207974e3..bdc07202b2 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 @@ -128,8 +128,26 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 1374ebf7ef..bab6cf6f4b 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 @@ -45,6 +45,15 @@ spec: name: us-test-1b - instanceGroup: master-us-test-1c name: us-test-1c + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -56,6 +65,15 @@ spec: name: us-test-1b - instanceGroup: master-us-test-1c name: us-test-1c + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 694d97dbd0..292a60e85b 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 694d97dbd0..8ef4f88859 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 @@ -19,6 +19,11 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 694d97dbd0..ec59fec991 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 @@ -19,6 +19,13 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 9a8c0b8adf..6cf6015464 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 9a8c0b8adf..c740011cad 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 @@ -19,6 +19,11 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 9a8c0b8adf..9bfeb8b232 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 @@ -19,6 +19,13 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 0ae9c7cbd6..3425e0e7ac 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 @@ -128,8 +128,26 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 3ffe456468..8b86a18427 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 @@ -128,8 +128,26 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 98207974e3..bdc07202b2 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 @@ -128,8 +128,26 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 1374ebf7ef..bab6cf6f4b 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 @@ -45,6 +45,15 @@ spec: name: us-test-1b - instanceGroup: master-us-test-1c name: us-test-1c + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -56,6 +65,15 @@ spec: name: us-test-1b - instanceGroup: master-us-test-1c name: us-test-1c + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 694d97dbd0..292a60e85b 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 694d97dbd0..8ef4f88859 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 @@ -19,6 +19,11 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 694d97dbd0..ec59fec991 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 @@ -19,6 +19,13 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 9a8c0b8adf..6cf6015464 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 9a8c0b8adf..c740011cad 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 @@ -19,6 +19,11 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 9a8c0b8adf..9bfeb8b232 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 @@ -19,6 +19,13 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/mixedinstances.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 01f1647531..56da11c1be 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 cecc1dd293..c7d49ccb9b 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 @@ -41,6 +41,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -48,6 +53,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 269d5b853d..4fb4537633 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 @@ -19,6 +19,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/nthimdsprocessor.longclustername.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 e33e1f0543..cf1fe1ebfa 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 @@ -19,6 +19,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/nthimdsprocessor.longclustername.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 c476ffe08d..0f24cbf9b8 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 239d8f730a..619e6c630e 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 @@ -41,6 +41,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -48,6 +53,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 269d5b853d..4fb4537633 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 @@ -19,6 +19,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/nthimdsprocessor.longclustername.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 e33e1f0543..cf1fe1ebfa 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 @@ -19,6 +19,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/nthimdsprocessor.longclustername.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 68fb625a62..b6ebfdf1d0 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 ec56fe4cd7..fe94ad3147 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 @@ -44,6 +44,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -51,6 +56,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 43e6b1c894..73528712f7 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 205fc7a2e3..e94db0ba71 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 22810bfbe0..e6bddf1a44 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 2605a3ff28..78a9faba64 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 @@ -43,6 +43,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -50,6 +55,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 9617997000..6aa560b373 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/private-shared-ip.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 fe028c8ee8..73909906dc 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/private-shared-ip.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 2b22a7ada3..e2d4b157f6 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 709b41eff3..e03804d68d 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 @@ -43,6 +43,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -50,6 +55,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 a5c4c97490..88c7f4e451 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/private-shared-subnet.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 71ab202bd7..b5cb344c5f 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/private-shared-subnet.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 f9e8086998..4bc0780035 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 5e6c275d81..9f1dcd03c2 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 @@ -43,6 +43,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -50,6 +55,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 9f96e69046..5fea86d77a 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatecalico.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 a1531d470e..0270de02c9 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatecalico.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 f213d0fb63..0f31ad03f7 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 926357df70..769f6351a3 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 @@ -43,6 +43,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -50,6 +55,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 613a8aef0a..c7af02b354 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatecanal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 4f70813f80..03eb525f81 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatecanal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 14cfb2164d..3cadbdd4c6 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 6d9fb651e8..7217520c34 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 @@ -43,6 +43,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -50,6 +55,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 16071f98e9..1e4d93c413 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatecilium.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 71f59d6337..23b7056b8c 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatecilium.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 8faf90438d..2f4e505f85 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 afb291cfde..b5c02c1651 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 @@ -43,6 +43,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -50,6 +55,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 16071f98e9..1e4d93c413 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatecilium.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 71f59d6337..23b7056b8c 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatecilium.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 3f4b4e2e15..49551dfce9 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 ca2cf3fd13..a58b5bab91 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 @@ -46,6 +46,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -53,6 +58,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 16071f98e9..1e4d93c413 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatecilium.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 71f59d6337..23b7056b8c 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatecilium.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 b21092ea68..e97517e302 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 @@ -128,10 +128,25 @@ cloudConfig: encryptionConfig: null etcdClusters: cilium: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 f8d0984fe9..e93cbc3904 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 @@ -43,6 +43,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -50,6 +55,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 - backups: @@ -57,6 +67,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: cilium version: 3.5.6 externalDns: 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 ef2cb5cef4..8322b47e69 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 @@ -19,6 +19,9 @@ spec: --v=6 --volume-name-tag=k8s.io/etcd/cilium --volume-provider=aws --volume-tag=k8s.io/etcd/cilium --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privateciliumadvanced.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 7cdeaf25ec..072d9cf04a 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privateciliumadvanced.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 652fef44b7..bcf02af902 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privateciliumadvanced.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 5751bbdcae..725514fcee 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 98816744b6..bdb309c3e6 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 @@ -36,6 +36,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -43,6 +48,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 d84267282d..cc774d141d 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatedns1.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 9b26c2dde0..094c069c1c 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatedns1.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 101e451451..0ea0c229c5 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 46b1330e2b..4433bf04a1 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 @@ -43,6 +43,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -50,6 +55,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 54a7b2c3de..134eb77d22 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatedns2.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 ccc50c8942..557545d7d4 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatedns2.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 a101008725..169688b975 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 e941ab5505..46ca9f86c2 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 @@ -43,6 +43,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -50,6 +55,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 e766779868..9bd2fda9e5 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privateflannel.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 7f0e1dfb31..43f701b082 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privateflannel.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 af74145163..9d056db1d4 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 4c01870d62..54f2a8e931 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 @@ -43,6 +43,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -50,6 +55,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 d0b2b64209..be1cf35f3d 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatekopeio.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 0c4e309e33..c9286d563d 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privatekopeio.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 2da1fcb712..a24bfe2e9d 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 c5f81ad537..786505d783 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 @@ -33,6 +33,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -40,6 +45,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 bca2517d06..1f7e484c97 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privateweave.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 1a7ed6aac9..f25f8d1d45 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/privateweave.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 85960624ef..bb4aa2b721 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 47e6af99dd..43894c805d 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 @@ -42,6 +42,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -49,6 +54,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 43e6b1c894..73528712f7 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 205fc7a2e3..e94db0ba71 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 d08c77fcfa..ab0e40712c 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 cbeb5f3da8..eb951a2089 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 @@ -41,6 +41,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -48,6 +53,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 3d5c91b18f..1811713839 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/sharedsubnet.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 b9632b3c67..d9947a2b41 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/sharedsubnet.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 caa3025382..cfad558c9a 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 66b2d35882..d77e236e0d 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 @@ -41,6 +41,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -48,6 +53,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 c55cd8f4b1..6f41642f6d 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/sharedvpc.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 821641489b..bb21aa9ecc 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/sharedvpc.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 d955951e5f..2749afd61e 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 2facc5e97b..f76c648e3b 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 @@ -46,6 +46,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -53,6 +58,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 12cc089aeb..f643ff0044 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 7207269e0e..8a131fc052 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 @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 3f468ef0c3..08f60d1ff7 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 5069fecbec..320e9f49dd 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 @@ -43,6 +43,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -50,6 +55,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 d77cff85bd..f524119359 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/unmanaged.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 f3ec4b269e..6c05a72936 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/unmanaged.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: 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 3debad3bfe..1aec12e5d0 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 @@ -128,8 +128,18 @@ cloudConfig: encryptionConfig: null etcdClusters: events: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 main: + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d version: 3.5.6 kubeAPIServer: allowPrivileged: true 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 ad74697126..2e0ce7d1a1 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 @@ -41,6 +41,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: main version: 3.5.6 - backups: @@ -48,6 +53,11 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + backupRetentionDays: 90 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d name: events version: 3.5.6 externalDns: 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 43e6b1c894..73528712f7 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager 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 205fc7a2e3..e94db0ba71 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 @@ -18,6 +18,9 @@ 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/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION + value: 90d image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230119-slim name: etcd-manager resources: