diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index fef63c16f6..516e5886b5 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -23,6 +23,7 @@ patchesStrategicMerge: - manager_webhook_patch.yaml - webhookcainjection_patch.yaml - manager_image_patch.yaml +- manager_probes.yaml configurations: - kustomizeconfig.yaml diff --git a/config/default/manager_probes.yaml b/config/default/manager_probes.yaml new file mode 100644 index 0000000000..68b84009e0 --- /dev/null +++ b/config/default/manager_probes.yaml @@ -0,0 +1,13 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: controller-manager + namespace: system +spec: + template: + spec: + containers: + - name: manager + livenessProbe: + failureThreshold: 3 + periodSeconds: 10 diff --git a/hack/gen-test-flavors.sh b/hack/gen-test-flavors.sh index bc7e8e84e9..715be77fec 100755 --- a/hack/gen-test-flavors.sh +++ b/hack/gen-test-flavors.sh @@ -23,7 +23,7 @@ root=$(dirname "${BASH_SOURCE[0]}")/.. kustomize="${root}/hack/tools/bin/kustomize" test_dir_path="test/e2e/data/infrastructure-aws" test_dir="${root}/${test_dir_path}/" -src_dir="${test_dir_path}/kustomize_sources/" +src_dir="${test_dir}/kustomize_sources/" generated_dir="${test_dir}/generated" echo Checking for template sources in "$test_dir" diff --git a/test/e2e/data/e2e_conf.yaml b/test/e2e/data/e2e_conf.yaml index 956c67f6dd..26e5686071 100644 --- a/test/e2e/data/e2e_conf.yaml +++ b/test/e2e/data/e2e_conf.yaml @@ -47,21 +47,17 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - old: "--leader-elect" - new: "--leader-elect=false" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - - name: v0.4.3 # latest published release in the v1alpha4 series; this is used for v1alpha4 --> v1beta1 clusterctl upgrades test only. + - name: v0.4.4 # latest published release in the v1alpha4 series; this is used for v1alpha4 --> v1beta1 clusterctl upgrades test only. contract: v1alpha4 - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.3/core-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.4/core-components.yaml" type: "url" files: - sourcePath: "./shared/v1alpha4/metadata.yaml" replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - old: "--leader-elect" - new: "--leader-elect=false" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - name: v1.0.0 @@ -73,8 +69,6 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - old: "--leader-elect" - new: "--leader-elect=false" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - name: kubeadm @@ -91,8 +85,8 @@ providers: replacements: - old: --metrics-addr=127.0.0.1:8080 new: --metrics-addr=:8080 - - name: v0.4.3 # latest published release in the v1alpha4 series; this is used for v1alpha4 --> v1beta1 clusterctl upgrades test only. - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.3/bootstrap-components.yaml" + - name: v0.4.4 # latest published release in the v1alpha4 series; this is used for v1alpha4 --> v1beta1 clusterctl upgrades test only. + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.4/bootstrap-components.yaml" type: "url" contract: v1alpha4 files: @@ -100,8 +94,6 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - old: "--leader-elect" - new: "--leader-elect=false" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - name: v1.0.0 @@ -113,8 +105,6 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - old: "--leader-elect" - new: "--leader-elect=false" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 @@ -132,9 +122,9 @@ providers: replacements: - old: --metrics-addr=127.0.0.1:8080 new: --metrics-addr=:8080 - - name: v0.4.3 # latest published release in the v1alpha4 series; this is used for v1alpha4 --> v1beta1 clusterctl upgrades test only. + - name: v0.4.4 # latest published release in the v1alpha4 series; this is used for v1alpha4 --> v1beta1 clusterctl upgrades test only. # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.3/control-plane-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.4/control-plane-components.yaml" type: "url" contract: v1alpha4 files: @@ -142,8 +132,6 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - old: "--leader-elect" - new: "--leader-elect=false" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - name: v1.0.0 @@ -155,8 +143,6 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - old: "--leader-elect" - new: "--leader-elect=false" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - name: aws @@ -181,26 +167,27 @@ providers: value: ../../../config/default contract: v1beta1 files: - - sourcePath: "./shared/v1beta1_provider/metadata.yaml" - - sourcePath: "./infrastructure-aws/generated/cluster-template.yaml" - - sourcePath: "./infrastructure-aws/generated/cluster-template-capi-upgrade.yaml" - - sourcePath: "./infrastructure-aws/generated/cluster-template-ssm.yaml" - - sourcePath: "./infrastructure-aws/generated/cluster-template-multi-az.yaml" - - sourcePath: "./infrastructure-aws/generated/cluster-template-limit-az.yaml" - - sourcePath: "./infrastructure-aws/generated/cluster-template-spot-instances.yaml" - - sourcePath: "./infrastructure-aws/generated/cluster-template-md-remediation.yaml" + - sourcePath: "./infrastructure-aws/generated/cluster-template-external-cloud-provider.yaml" - sourcePath: "./infrastructure-aws/generated/cluster-template-kcp-remediation.yaml" - sourcePath: "./infrastructure-aws/generated/cluster-template-kcp-scale-in.yaml" + - sourcePath: "./infrastructure-aws/generated/cluster-template-limit-az.yaml" - sourcePath: "./infrastructure-aws/generated/cluster-template-machine-pool.yaml" - - sourcePath: "./infrastructure-aws/generated/cluster-template-upgrade-to-main.yaml" - - sourcePath: "./infrastructure-aws/generated/cluster-template-simple-multitenancy.yaml" + - sourcePath: "./infrastructure-aws/generated/cluster-template-md-remediation.yaml" + - sourcePath: "./infrastructure-aws/generated/cluster-template-multi-az.yaml" - sourcePath: "./infrastructure-aws/generated/cluster-template-nested-multitenancy.yaml" - - sourcePath: "./infrastructure-aws/generated/cluster-template-external-cloud-provider.yaml" + - sourcePath: "./infrastructure-aws/generated/cluster-template-remote-management-cluster.yaml" + - sourcePath: "./infrastructure-aws/generated/cluster-template-simple-multitenancy.yaml" + - sourcePath: "./infrastructure-aws/generated/cluster-template-spot-instances.yaml" + - sourcePath: "./infrastructure-aws/generated/cluster-template-ssm.yaml" + - sourcePath: "./infrastructure-aws/generated/cluster-template-upgrade-to-main.yaml" + - sourcePath: "./infrastructure-aws/generated/cluster-template.yaml" + - sourcePath: "./shared/v1beta1_provider/metadata.yaml" replacements: + # To allow bugs to be catched. + - old: "failureThreshold: 3" + new: "failureThreshold: 12" - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - old: "--leader-elect" - new: "--leader-elect=false" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - old: gcr.io/k8s-staging-cluster-api/cluster-api-aws-controller-amd64:dev @@ -227,10 +214,10 @@ variables: MULTI_TENANCY_ROLE_NAME: "multi-tenancy-role" MULTI_TENANCY_NESTED_ROLE_NAME: "multi-tenancy-nested-role" IP_FAMILY: "IPv4" - # NOTE: INIT_WITH_BINARY and INIT_WITH_KUBERNETES_VERSION are only used by the clusterctl upgrade test to initialize + INIT_WITH_BINARY_V1ALPHA3: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.23/clusterctl-{OS}-{ARCH}" + INIT_WITH_BINARY_V1ALPHA4: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.4/clusterctl-{OS}-{ARCH}" + # INIT_WITH_KUBERNETES_VERSION are only used by the clusterctl upgrade test to initialize # the management cluster to be upgraded. - INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.23/clusterctl-{OS}-{ARCH}" - INIT_WITH_PROVIDERS_CONTRACT: "v1alpha3" INIT_WITH_KUBERNETES_VERSION: "v1.21.2" intervals: @@ -239,7 +226,7 @@ intervals: default/wait-worker-nodes: ["10m", "10s"] conformance/wait-control-plane: ["30m", "10s"] conformance/wait-worker-nodes: ["30m", "10s"] - default/wait-controllers: ["3m", "10s"] + default/wait-controllers: ["5m", "10s"] default/wait-delete-cluster: ["20m", "10s"] default/wait-machine-upgrade: ["30m", "10s"] default/wait-machine-status: ["20m", "10s"] diff --git a/test/e2e/data/e2e_eks_conf.yaml b/test/e2e/data/e2e_eks_conf.yaml index 53c664ec56..82ed2796d3 100644 --- a/test/e2e/data/e2e_eks_conf.yaml +++ b/test/e2e/data/e2e_eks_conf.yaml @@ -45,21 +45,17 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - old: "--leader-elect" - new: "--leader-elect=false" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - - name: v0.4.3 # latest published release in the v1alpha4 series; this is used for v1alpha4 --> v1beta1 clusterctl upgrades test only. + - name: v0.4.4 # latest published release in the v1alpha4 series; this is used for v1alpha4 --> v1beta1 clusterctl upgrades test only. contract: v1alpha4 - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.3/core-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.4/core-components.yaml" type: "url" files: - sourcePath: "./shared/v1alpha4/metadata.yaml" replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - old: "--leader-elect" - new: "--leader-elect=false" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - name: v1.0.0 @@ -71,8 +67,6 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - old: "--leader-elect" - new: "--leader-elect=false" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - name: kubeadm @@ -89,8 +83,8 @@ providers: replacements: - old: --metrics-addr=127.0.0.1:8080 new: --metrics-addr=:8080 - - name: v0.4.3 # latest published release in the v1alpha4 series; this is used for v1alpha4 --> v1beta1 clusterctl upgrades test only. - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.3/bootstrap-components.yaml" + - name: v0.4.4 # latest published release in the v1alpha4 series; this is used for v1alpha4 --> v1beta1 clusterctl upgrades test only. + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.4/bootstrap-components.yaml" type: "url" contract: v1alpha4 files: @@ -98,8 +92,6 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - old: "--leader-elect" - new: "--leader-elect=false" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - name: v1.0.0 @@ -111,8 +103,6 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - old: "--leader-elect" - new: "--leader-elect=false" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - name: kubeadm @@ -129,9 +119,9 @@ providers: replacements: - old: --metrics-addr=127.0.0.1:8080 new: --metrics-addr=:8080 - - name: v0.4.3 # latest published release in the v1alpha4 series; this is used for v1alpha4 --> v1beta1 clusterctl upgrades test only. + - name: v0.4.4 # latest published release in the v1alpha4 series; this is used for v1alpha4 --> v1beta1 clusterctl upgrades test only. # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.3/control-plane-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.4/control-plane-components.yaml" type: "url" contract: v1alpha4 files: @@ -139,8 +129,6 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - old: "--leader-elect" - new: "--leader-elect=false" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - name: v1.0.0 @@ -152,8 +140,6 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - old: "--leader-elect" - new: "--leader-elect=false" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - name: aws @@ -167,8 +153,6 @@ providers: replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" - - old: "--leader-elect" - new: "--leader-elect=false" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - old: gcr.io/k8s-staging-cluster-api/cluster-api-aws-controller-amd64:dev @@ -204,7 +188,7 @@ intervals: default/wait-cluster: ["30m", "10s"] default/wait-control-plane: ["30m", "10s"] default/wait-worker-nodes: ["30m", "10s"] - default/wait-controllers: ["3m", "10s"] + default/wait-controllers: ["5m", "10s"] default/wait-delete-cluster: ["35m", "30s"] default/wait-delete-machine: ["10m", "10s"] default/wait-delete-machine-deployment: ["10m", "10s"] diff --git a/test/e2e/data/infrastructure-aws/capi-upgrades/v1alpha3/cluster-template.yaml b/test/e2e/data/infrastructure-aws/capi-upgrades/v1alpha3/cluster-template.yaml index 0bafd4746e..9321bebd1f 100644 --- a/test/e2e/data/infrastructure-aws/capi-upgrades/v1alpha3/cluster-template.yaml +++ b/test/e2e/data/infrastructure-aws/capi-upgrades/v1alpha3/cluster-template.yaml @@ -21,6 +21,9 @@ kind: AWSCluster metadata: name: "${CLUSTER_NAME}" spec: + networkSpec: + vpc: + availabilityZoneUsageLimit: 1 region: "${AWS_REGION}" sshKeyName: "${AWS_SSH_KEY_NAME}" --- diff --git a/test/e2e/data/infrastructure-aws/capi-upgrades/v1alpha4/cluster-template.yaml b/test/e2e/data/infrastructure-aws/capi-upgrades/v1alpha4/cluster-template.yaml index a94f147841..37de215eb3 100644 --- a/test/e2e/data/infrastructure-aws/capi-upgrades/v1alpha4/cluster-template.yaml +++ b/test/e2e/data/infrastructure-aws/capi-upgrades/v1alpha4/cluster-template.yaml @@ -23,6 +23,9 @@ kind: AWSCluster metadata: name: ${CLUSTER_NAME} spec: + network: + vpc: + availabilityZoneUsageLimit: 1 region: ${AWS_REGION} sshKeyName: ${AWS_SSH_KEY_NAME} --- diff --git a/test/e2e/data/infrastructure-aws/kustomize_sources/capi-upgrade/kustomization.yaml b/test/e2e/data/infrastructure-aws/kustomize_sources/remote-management-cluster/kustomization.yaml similarity index 80% rename from test/e2e/data/infrastructure-aws/kustomize_sources/capi-upgrade/kustomization.yaml rename to test/e2e/data/infrastructure-aws/kustomize_sources/remote-management-cluster/kustomization.yaml index d6b457e15d..ff418c4d75 100644 --- a/test/e2e/data/infrastructure-aws/kustomize_sources/capi-upgrade/kustomization.yaml +++ b/test/e2e/data/infrastructure-aws/kustomize_sources/remote-management-cluster/kustomization.yaml @@ -1,4 +1,4 @@ resources: - - ../default + - ../limit-az patchesStrategicMerge: - patches/image-injection.yaml diff --git a/test/e2e/data/infrastructure-aws/kustomize_sources/capi-upgrade/patches/image-injection.yaml b/test/e2e/data/infrastructure-aws/kustomize_sources/remote-management-cluster/patches/image-injection.yaml similarity index 100% rename from test/e2e/data/infrastructure-aws/kustomize_sources/capi-upgrade/patches/image-injection.yaml rename to test/e2e/data/infrastructure-aws/kustomize_sources/remote-management-cluster/patches/image-injection.yaml diff --git a/test/e2e/shared/aws.go b/test/e2e/shared/aws.go index 4ff14625f0..580508775f 100644 --- a/test/e2e/shared/aws.go +++ b/test/e2e/shared/aws.go @@ -337,7 +337,7 @@ func ensureTestImageUploaded(e2eCtx *E2EContext) (string, string, error) { return "", "", err } - Byf("Image uploaded to s3:///%s/%s", bucketName, imageSha) + Byf("Image uploaded to s3://%s/%s", bucketName, imageSha) return bucketName, imageSha, nil } diff --git a/test/e2e/suites/unmanaged/unmanaged_CAPI_test.go b/test/e2e/suites/unmanaged/unmanaged_CAPI_test.go index c99617d6d8..7f689eb04a 100644 --- a/test/e2e/suites/unmanaged/unmanaged_CAPI_test.go +++ b/test/e2e/suites/unmanaged/unmanaged_CAPI_test.go @@ -127,22 +127,72 @@ var _ = ginkgo.Context("[unmanaged] [Cluster API Framework]", func() { }) }) - ginkgo.PDescribe("Running the v1alpha3->v1beta1 Clusterctl Upgrade Spec", func() { + ginkgo.PDescribe("Self Hosted Spec", func() { // As the resources cannot be defined by the It() clause in CAPI tests, using the largest values required for all It() tests in this CAPI test. - requiredResources := &shared.TestResource{EC2: 13, IGW: 3, NGW: 3, VPC: 3, ClassicLB: 3, EIP: 3} + requiredResources := &shared.TestResource{EC2: 2, IGW: 1, NGW: 1, VPC: 1, ClassicLB: 1, EIP: 1} ginkgo.BeforeEach(func() { - requiredResources.WriteRequestedResources(e2eCtx, "capi-clusterctl-upgrade-test") + requiredResources.WriteRequestedResources(e2eCtx, "capi-clusterctl-self-hosted-test") Expect(shared.AcquireResources(requiredResources, config.GinkgoConfig.ParallelNode, flock.New(shared.ResourceQuotaFilePath))).To(Succeed()) }) - capi_e2e.ClusterctlUpgradeSpec(context.TODO(), func() capi_e2e.ClusterctlUpgradeSpecInput { - return capi_e2e.ClusterctlUpgradeSpecInput{ + capi_e2e.SelfHostedSpec(context.TODO(), func() capi_e2e.SelfHostedSpecInput { + return capi_e2e.SelfHostedSpecInput{ E2EConfig: e2eCtx.E2EConfig, ClusterctlConfigPath: e2eCtx.Environment.ClusterctlConfigPath, BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy, ArtifactFolder: e2eCtx.Settings.ArtifactFolder, SkipCleanup: e2eCtx.Settings.SkipCleanup, - MgmtFlavor: "capi-upgrade", + Flavor: "remote-management-cluster", + } + }) + ginkgo.AfterEach(func() { + shared.ReleaseResources(requiredResources, config.GinkgoConfig.ParallelNode, flock.New(shared.ResourceQuotaFilePath)) + }) + }) + + ginkgo.PDescribe("Clusterctl Upgrade Spec [from v1alpha3]", func() { + // As the resources cannot be defined by the It() clause in CAPI tests, using the largest values required for all It() tests in this CAPI test. + requiredResources := &shared.TestResource{EC2: 5, IGW: 2, NGW: 2, VPC: 2, ClassicLB: 2, EIP: 2} + ginkgo.BeforeEach(func() { + requiredResources.WriteRequestedResources(e2eCtx, "capi-clusterctl-upgrade-test-v1alpha3") + Expect(shared.AcquireResources(requiredResources, config.GinkgoConfig.ParallelNode, flock.New(shared.ResourceQuotaFilePath))).To(Succeed()) + }) + + capi_e2e.ClusterctlUpgradeSpec(context.TODO(), func() capi_e2e.ClusterctlUpgradeSpecInput { + return capi_e2e.ClusterctlUpgradeSpecInput{ + E2EConfig: e2eCtx.E2EConfig, + ClusterctlConfigPath: e2eCtx.Environment.ClusterctlConfigPath, + BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy, + ArtifactFolder: e2eCtx.Settings.ArtifactFolder, + SkipCleanup: e2eCtx.Settings.SkipCleanup, + MgmtFlavor: "remote-management-cluster", + InitWithBinary: e2eCtx.E2EConfig.GetVariable("INIT_WITH_BINARY_V1ALPHA3"), + InitWithProvidersContract: "v1alpha3", + } + }) + ginkgo.AfterEach(func() { + shared.ReleaseResources(requiredResources, config.GinkgoConfig.ParallelNode, flock.New(shared.ResourceQuotaFilePath)) + }) + }) + + ginkgo.PDescribe("Clusterctl Upgrade Spec [from v1alpha4]", func() { + // As the resources cannot be defined by the It() clause in CAPI tests, using the largest values required for all It() tests in this CAPI test. + requiredResources := &shared.TestResource{EC2: 5, IGW: 2, NGW: 2, VPC: 2, ClassicLB: 2, EIP: 2} + ginkgo.BeforeEach(func() { + requiredResources.WriteRequestedResources(e2eCtx, "capi-clusterctl-upgrade-test-v1alpha4") + Expect(shared.AcquireResources(requiredResources, config.GinkgoConfig.ParallelNode, flock.New(shared.ResourceQuotaFilePath))).To(Succeed()) + }) + + capi_e2e.ClusterctlUpgradeSpec(context.TODO(), func() capi_e2e.ClusterctlUpgradeSpecInput { + return capi_e2e.ClusterctlUpgradeSpecInput{ + E2EConfig: e2eCtx.E2EConfig, + ClusterctlConfigPath: e2eCtx.Environment.ClusterctlConfigPath, + BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy, + ArtifactFolder: e2eCtx.Settings.ArtifactFolder, + SkipCleanup: e2eCtx.Settings.SkipCleanup, + MgmtFlavor: "remote-management-cluster", + InitWithBinary: e2eCtx.E2EConfig.GetVariable("INIT_WITH_BINARY_V1ALPHA4"), + InitWithProvidersContract: "v1alpha4", } }) ginkgo.AfterEach(func() {