From c51197e82d76ea21a11db80d15aa658365c58ea8 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 19 Feb 2024 13:58:09 -0500 Subject: [PATCH] CI/e2e: stop testing upgrades from v1alpha5 (v0.6) --- Makefile | 1 - test/e2e/data/e2e_conf.yaml | 14 ----------- test/e2e/data/kustomize/v1alpha5/bastion.yaml | 9 -------- .../kustomize/v1alpha5/kustomization.yaml | 14 ----------- test/e2e/shared/defaults.go | 1 - .../e2e/suites/e2e/clusterctl_upgrade_test.go | 23 ------------------- 6 files changed, 62 deletions(-) delete mode 100644 test/e2e/data/kustomize/v1alpha5/bastion.yaml delete mode 100644 test/e2e/data/kustomize/v1alpha5/kustomization.yaml diff --git a/Makefile b/Makefile index e25fb5badb..b66e60a5c6 100644 --- a/Makefile +++ b/Makefile @@ -148,7 +148,6 @@ E2E_NO_ARTIFACT_TEMPLATES_DIR=test/e2e/data/infrastructure-openstack-no-artifact .PHONY: e2e-templates e2e-templates: ## Generate cluster templates for e2e tests e2e-templates: $(addprefix $(E2E_NO_ARTIFACT_TEMPLATES_DIR)/, \ - cluster-template-v1alpha5.yaml \ cluster-template-v1alpha6.yaml \ cluster-template-v1alpha7.yaml \ cluster-template-md-remediation.yaml \ diff --git a/test/e2e/data/e2e_conf.yaml b/test/e2e/data/e2e_conf.yaml index a499a983ec..47724aaa33 100644 --- a/test/e2e/data/e2e_conf.yaml +++ b/test/e2e/data/e2e_conf.yaml @@ -111,20 +111,6 @@ providers: type: InfrastructureProvider versions: # This is only for clusterctl upgrade tests - - name: v0.6.4 - value: "https://github.com/kubernetes-sigs/cluster-api-provider-openstack/releases/download/v0.6.4/infrastructure-components.yaml" - type: url - contract: v1beta1 - files: - - sourcePath: "../data/shared/v1beta1_provider/metadata.yaml" - - sourcePath: "./infrastructure-openstack-no-artifact/cluster-template.yaml" - replacements: - - old: "imagePullPolicy: Always" - new: "imagePullPolicy: IfNotPresent" - - old: "--v=2" - new: "--v=4" - - old: "--leader-elect" - new: "--leader-elect=false\n - --sync-period=1m" - name: v0.7.2 value: "https://github.com/kubernetes-sigs/cluster-api-provider-openstack/releases/download/v0.7.2/infrastructure-components.yaml" type: url diff --git a/test/e2e/data/kustomize/v1alpha5/bastion.yaml b/test/e2e/data/kustomize/v1alpha5/bastion.yaml deleted file mode 100644 index 45c9e0f508..0000000000 --- a/test/e2e/data/kustomize/v1alpha5/bastion.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- op: add - path: /spec/bastion - value: - enabled: true - instance: - flavor: ${OPENSTACK_BASTION_MACHINE_FLAVOR} - image: ${OPENSTACK_BASTION_IMAGE_NAME} - sshKeyName: ${OPENSTACK_SSH_KEY_NAME} diff --git a/test/e2e/data/kustomize/v1alpha5/kustomization.yaml b/test/e2e/data/kustomize/v1alpha5/kustomization.yaml deleted file mode 100644 index ae29db64d9..0000000000 --- a/test/e2e/data/kustomize/v1alpha5/kustomization.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- ../../../../../kustomize/v1alpha5/external-cloud-provider - -components: -- ../common-patches/cni -- ../common-patches/ccm - -patches: -- path: bastion.yaml - target: - kind: OpenStackCluster - name: \${CLUSTER_NAME} diff --git a/test/e2e/shared/defaults.go b/test/e2e/shared/defaults.go index 4ab3e9a7db..df6315f773 100644 --- a/test/e2e/shared/defaults.go +++ b/test/e2e/shared/defaults.go @@ -48,7 +48,6 @@ const ( FlavorWithoutLB = "without-lb" FlavorMultiNetwork = "multi-network" FlavorMultiAZ = "multi-az" - FlavorV1alpha5 = "v1alpha5" FlavorV1alpha6 = "v1alpha6" FlavorV1alpha7 = "v1alpha7" FlavorMDRemediation = "md-remediation" diff --git a/test/e2e/suites/e2e/clusterctl_upgrade_test.go b/test/e2e/suites/e2e/clusterctl_upgrade_test.go index e31c1c6256..ab77af2872 100644 --- a/test/e2e/suites/e2e/clusterctl_upgrade_test.go +++ b/test/e2e/suites/e2e/clusterctl_upgrade_test.go @@ -30,29 +30,6 @@ import ( const OldCAPIVersion = "v1.4.6" -var _ = Describe("When testing clusterctl upgrades (v0.6=>current) [clusterctl-upgrade]", func() { - ctx := context.TODO() - shared.SetEnvVar("DOWNLOAD_E2E_IMAGE", "true", false) - - capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput { - return capi_e2e.ClusterctlUpgradeSpecInput{ - E2EConfig: e2eCtx.E2EConfig, - ClusterctlConfigPath: e2eCtx.Environment.ClusterctlConfigPath, - BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy, - ArtifactFolder: e2eCtx.Settings.ArtifactFolder, - SkipCleanup: false, - InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/" + OldCAPIVersion + "/clusterctl-{OS}-{ARCH}", - InitWithProvidersContract: "v1beta1", - InitWithInfrastructureProviders: []string{"openstack:v0.6.4"}, - InitWithCoreProvider: "cluster-api:" + OldCAPIVersion, - InitWithBootstrapProviders: []string{"kubeadm:" + OldCAPIVersion}, - InitWithControlPlaneProviders: []string{"kubeadm:" + OldCAPIVersion}, - MgmtFlavor: shared.FlavorDefault, - WorkloadFlavor: shared.FlavorV1alpha5, - } - }) -}) - var _ = Describe("When testing clusterctl upgrades (v0.7=>current) [clusterctl-upgrade]", func() { ctx := context.TODO() shared.SetEnvVar("DOWNLOAD_E2E_IMAGE", "true", false)