diff --git a/pkg/model/components/etcdmanager/options.go b/pkg/model/components/etcdmanager/options.go index 26f9196e3c..461f59fba5 100644 --- a/pkg/model/components/etcdmanager/options.go +++ b/pkg/model/components/etcdmanager/options.go @@ -49,7 +49,9 @@ func (b *EtcdManagerOptionsBuilder) BuildOptions(o interface{}) error { etcdCluster.Backups.BackupStore = urls.Join(base, "backups", "etcd", etcdCluster.Name) } - if !etcdVersionIsSupported(etcdCluster.Version) { + version := strings.TrimPrefix(etcdCluster.Version, "v") + + if !etcdVersionIsSupported(version) { if featureflag.SkipEtcdVersionCheck.Enabled() { klog.Warningf("etcd version %q is not known to be supported, but ignoring because of SkipEtcdVersionCheck feature flag", etcdCluster.Version) } else { @@ -57,15 +59,19 @@ func (b *EtcdManagerOptionsBuilder) BuildOptions(o interface{}) error { return fmt.Errorf("etcd version %q is not supported with etcd-manager, please specify a supported version or remove the value to use the default version. Supported versions: %s", etcdCluster.Version, strings.Join(supportedEtcdVersions, ", ")) } } - } + for _, s := range []string{"3.5.0", "3.5.1"} { + if s == version { + appendCorruptionCheckFlag(etcdCluster) + } + } + } return nil } var supportedEtcdVersions = []string{"3.1.12", "3.2.18", "3.2.24", "3.3.10", "3.3.13", "3.3.17", "3.4.3", "3.4.13", "3.5.0", "3.5.1"} func etcdVersionIsSupported(version string) bool { - version = strings.TrimPrefix(version, "v") for _, v := range supportedEtcdVersions { if v == version { return true @@ -73,3 +79,20 @@ func etcdVersionIsSupported(version string) bool { } return false } + +func appendCorruptionCheckFlag(etcdCluster *kops.EtcdClusterSpec) { + varName := "ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK" + if etcdCluster.Manager == nil { + etcdCluster.Manager = &kops.EtcdManagerSpec{} + } + for _, env := range etcdCluster.Manager.Env { + if env.Name == varName { + return + } + } + etcdCluster.Manager.Env = append(etcdCluster.Manager.Env, + kops.EnvVar{ + Name: varName, + Value: "true", + }) +} diff --git a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml index b6871018fa..6fa3d55d65 100644 --- a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml @@ -314,8 +314,16 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. encryptionConfig: null etcdClusters: events: + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" version: 3.5.1 main: + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" version: 3.5.1 kubeAPIServer: allowPrivileged: true 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 01610b9f15..b4b0317350 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 @@ -137,8 +137,16 @@ docker: encryptionConfig: null etcdClusters: events: + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" version: 3.5.1 main: + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" version: 3.5.1 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_bucket_object_cluster-completed.spec_content index 44b314e810..bc8ff62bb6 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -31,6 +31,10 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" name: main version: 3.5.1 - backups: @@ -38,6 +42,10 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" name: events version: 3.5.1 externalDns: diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 4366e4ecf3..326850dceb 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_bucket_object_manifests-etcdmanager-events_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/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220203 name: etcd-manager resources: diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 05fa28a84c..d4ca92c2f4 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_bucket_object_manifests-etcdmanager-main_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/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220203 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 5844797811..e70feed0b1 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 @@ -137,8 +137,16 @@ docker: encryptionConfig: null etcdClusters: events: + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" version: 3.5.1 main: + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" version: 3.5.1 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_cluster-completed.spec_content index 2e9bcc7fbb..3cc6e7722b 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -56,6 +56,10 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" name: main version: 3.5.1 - backups: @@ -63,6 +67,10 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" name: events version: 3.5.1 externalDns: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index a43ef4612a..dbf3483468 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_manifests-etcdmanager-events_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/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220203 name: etcd-manager resources: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 66f0aae498..d53f053c05 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_manifests-etcdmanager-main_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/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220203 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 ed5b1526b0..a7d747bef9 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 @@ -138,10 +138,18 @@ encryptionConfig: null etcdClusters: events: cpuRequest: 100m + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" memoryRequest: 100Mi version: 3.5.1 main: cpuRequest: 200m + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" memoryRequest: 100Mi version: 3.5.1 kubeAPIServer: diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_cluster-completed.spec_content index 2a8cd8f9d9..95ba097305 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -33,6 +33,10 @@ spec: - encryptedVolume: true instanceGroup: master-us-test-1a name: a + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" memoryRequest: 100Mi name: main version: 3.5.1 @@ -43,6 +47,10 @@ spec: - encryptedVolume: true instanceGroup: master-us-test-1a name: a + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" memoryRequest: 100Mi name: events version: 3.5.1 diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index c73bbd9588..b2528b1694 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_manifests-etcdmanager-events_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/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220203 name: etcd-manager resources: diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index cb394f1f30..21fe7beff9 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_manifests-etcdmanager-main_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/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220203 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 d4018e01f2..2d268f8083 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 @@ -138,10 +138,18 @@ encryptionConfig: null etcdClusters: events: cpuRequest: 100m + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" memoryRequest: 100Mi version: 3.5.1 main: cpuRequest: 200m + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" memoryRequest: 100Mi version: 3.5.1 kubeAPIServer: diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_bucket_object_cluster-completed.spec_content index 2e622d6d6d..08efead718 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -42,6 +42,10 @@ spec: - encryptedVolume: true instanceGroup: master-us-test-1a name: a + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" memoryRequest: 100Mi name: main version: 3.5.1 @@ -52,6 +56,10 @@ spec: - encryptedVolume: true instanceGroup: master-us-test-1a name: a + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" memoryRequest: 100Mi name: events version: 3.5.1 diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index c73bbd9588..b2528b1694 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_bucket_object_manifests-etcdmanager-events_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/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220203 name: etcd-manager resources: diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index cb394f1f30..21fe7beff9 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_bucket_object_manifests-etcdmanager-main_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/master=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220203 name: etcd-manager resources: diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 998a45c217..952dc18e91 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -140,8 +140,16 @@ docker: encryptionConfig: null etcdClusters: events: + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" version: 3.5.1 main: + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" version: 3.5.1 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_cluster-completed.spec_content index 2868307b8b..dc503f2393 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -44,6 +44,10 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" name: main version: 3.5.1 - backups: @@ -51,6 +55,10 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" name: events version: 3.5.1 externalDns: diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 86efd00f62..8a0cb390bf 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220203 name: etcd-manager resources: diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index d357931500..4046d0219c 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/minimal-ipv6.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220203 name: etcd-manager resources: diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content index 32de0ddb3e..367d6f4eae 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -32,6 +32,10 @@ spec: etcdMembers: - instanceGroup: master-us-test1-a name: "1" + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" name: main version: 3.5.1 - backups: @@ -39,6 +43,10 @@ spec: etcdMembers: - instanceGroup: master-us-test1-a name: "1" + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" name: events version: 3.5.1 externalDns: diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index 2377255212..3d5b99dd12 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -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_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220203 name: etcd-manager resources: diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index 26dd22e734..4b16efb9b9 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -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_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220203 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 64210901bf..849dc81d9c 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 @@ -137,8 +137,16 @@ docker: encryptionConfig: null etcdClusters: events: + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" version: 3.5.1 main: + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" version: 3.5.1 kubeAPIServer: allowPrivileged: true 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 ed07582b51..ec363c7e0d 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 @@ -137,8 +137,16 @@ docker: encryptionConfig: null etcdClusters: events: + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" version: 3.5.1 main: + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" version: 3.5.1 kubeAPIServer: allowPrivileged: true diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content index 12ccb25025..f8c74bd32a 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -33,6 +33,10 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" name: main version: 3.5.1 - backups: @@ -40,6 +44,10 @@ spec: etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a + manager: + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" name: events version: 3.5.1 externalDns: diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_manifests-etcdmanager-events_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_manifests-etcdmanager-events_content index f8334ddc9b..c08965451d 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_manifests-etcdmanager-events_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_manifests-etcdmanager-events_content @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privatecanal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220203 name: etcd-manager resources: diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_manifests-etcdmanager-main_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_manifests-etcdmanager-main_content index cd6d6ceeb2..f271224eed 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_manifests-etcdmanager-main_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_manifests-etcdmanager-main_content @@ -19,6 +19,9 @@ spec: --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/master=1 --volume-tag=kubernetes.io/cluster/privatecanal.example.com=owned > /tmp/pipe 2>&1 + env: + - name: ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK + value: "true" image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220203 name: etcd-manager resources: