Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 e2e: stop testing upgrades from v1alpha5 (v0.6) #1893

Merged
merged 1 commit into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
14 changes: 0 additions & 14 deletions test/e2e/data/e2e_conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 0 additions & 9 deletions test/e2e/data/kustomize/v1alpha5/bastion.yaml

This file was deleted.

14 changes: 0 additions & 14 deletions test/e2e/data/kustomize/v1alpha5/kustomization.yaml

This file was deleted.

1 change: 0 additions & 1 deletion test/e2e/shared/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ const (
FlavorWithoutLB = "without-lb"
FlavorMultiNetwork = "multi-network"
FlavorMultiAZ = "multi-az"
FlavorV1alpha5 = "v1alpha5"
FlavorV1alpha6 = "v1alpha6"
FlavorV1alpha7 = "v1alpha7"
FlavorMDRemediation = "md-remediation"
Expand Down
23 changes: 0 additions & 23 deletions test/e2e/suites/e2e/clusterctl_upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down