Skip to content

Commit f22a626

Browse files
lentzi90lentzi90
committed
Update e2e config and clusterctl-upgrade
This updates mostly the clusterctl-upgrade e2e test. We make use of new functionality in the CAPI framework to calculate the latest patch releases instead of hard-coding them. The upgrade start from CAPI v1.9 instead of v1.6, to keep the tested versions within supported releases. Similarly CAPO upgrades from v0.11. Also an upgrade from v0.12 to main is added. Signed-off-by: Lennart Jern <[email protected]>
1 parent 606fcbd commit f22a626

File tree

5 files changed

+64
-49
lines changed

5 files changed

+64
-49
lines changed

‎Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ E2E_NO_ARTIFACT_TEMPLATES_DIR=test/e2e/data/infrastructure-openstack-no-artifact
175175
.PHONY: e2e-templates
176176
e2e-templates: ## Generate cluster templates for e2e tests
177177
e2e-templates: $(addprefix $(E2E_NO_ARTIFACT_TEMPLATES_DIR)/, \
178-
cluster-template-without-orc.yaml \
179178
cluster-template-md-remediation.yaml \
180179
cluster-template-kcp-remediation.yaml \
181180
cluster-template-multi-az.yaml \

‎test/e2e/data/e2e_conf.yaml

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@
77
managementClusterName: capo-e2e
88

99
images:
10-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.1
11-
loadBehavior: tryLoad
12-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.1
13-
loadBehavior: tryLoad
14-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.1
15-
loadBehavior: tryLoad
1610
# Use local dev images built source tree;
1711
- name: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:e2e
1812
loadBehavior: mustLoad
@@ -23,8 +17,8 @@ providers:
2317
- name: cluster-api
2418
type: CoreProvider
2519
versions:
26-
- name: v1.10.1
27-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.1/core-components.yaml"
20+
- name: "{go://sigs.k8s.io/cluster-api@v1.10}"
21+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.10}/core-components.yaml"
2822
type: url
2923
contract: v1beta1
3024
files:
@@ -35,8 +29,8 @@ providers:
3529
- old: "--leader-elect"
3630
new: "--leader-elect=false\n - --sync-period=1m"
3731
# For clusterctl upgrade test
38-
- name: v1.6.0
39-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/core-components.yaml"
32+
- name: "{go://sigs.k8s.io/[email protected]}"
33+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/core-components.yaml"
4034
type: url
4135
contract: v1beta1
4236
files:
@@ -49,8 +43,8 @@ providers:
4943
- name: kubeadm
5044
type: BootstrapProvider
5145
versions:
52-
- name: v1.10.1
53-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.1/bootstrap-components.yaml"
46+
- name: "{go://sigs.k8s.io/cluster-api@v1.10}"
47+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.10}/bootstrap-components.yaml"
5448
type: url
5549
contract: v1beta1
5650
files:
@@ -61,8 +55,8 @@ providers:
6155
- old: "--leader-elect"
6256
new: "--leader-elect=false\n - --sync-period=1m"
6357
# For clusterctl upgrade test
64-
- name: v1.6.0
65-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/bootstrap-components.yaml"
58+
- name: "{go://sigs.k8s.io/[email protected]}"
59+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/bootstrap-components.yaml"
6660
type: url
6761
contract: v1beta1
6862
files:
@@ -75,8 +69,8 @@ providers:
7569
- name: kubeadm
7670
type: ControlPlaneProvider
7771
versions:
78-
- name: v1.10.1
79-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.1/control-plane-components.yaml"
72+
- name: "{go://sigs.k8s.io/cluster-api@v1.10}"
73+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.10}/control-plane-components.yaml"
8074
type: url
8175
contract: v1beta1
8276
files:
@@ -87,8 +81,8 @@ providers:
8781
- old: "--leader-elect"
8882
new: "--leader-elect=false\n - --sync-period=1m"
8983
# For clusterctl upgrade test
90-
- name: v1.6.0
91-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/control-plane-components.yaml"
84+
- name: "{go://sigs.k8s.io/[email protected]}"
85+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/[email protected]}/control-plane-components.yaml"
9286
type: url
9387
contract: v1beta1
9488
files:
@@ -102,8 +96,8 @@ providers:
10296
type: InfrastructureProvider
10397
versions:
10498
# This is only for clusterctl upgrade tests
105-
- name: v0.10.0
106-
value: "https://github.com/kubernetes-sigs/cluster-api-provider-openstack/releases/download/v0.10.0/infrastructure-components.yaml"
99+
- name: "{go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.11}"
100+
value: "https://github.com/kubernetes-sigs/cluster-api-provider-openstack/releases/download/{go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.11}/infrastructure-components.yaml"
107101
type: url
108102
contract: v1beta1
109103
files:

‎test/e2e/data/kustomize/without-orc/kustomization.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎test/e2e/shared/defaults.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ const (
5555
FlavorWithoutLB = "without-lb"
5656
FlavorMultiNetwork = "multi-network"
5757
FlavorMultiAZ = "multi-az"
58-
FlavorWithoutORC = "without-orc"
5958
FlavorMDRemediation = "md-remediation"
6059
FlavorKCPRemediation = "kcp-remediation"
6160
FlavorFlatcar = "flatcar"

‎test/e2e/suites/e2e/clusterctl_upgrade_test.go

Lines changed: 50 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,61 @@ import (
2323
"context"
2424

2525
. "github.com/onsi/ginkgo/v2"
26+
. "github.com/onsi/gomega"
2627
capi_e2e "sigs.k8s.io/cluster-api/test/e2e"
28+
"sigs.k8s.io/cluster-api/test/framework/clusterctl"
2729

2830
"sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"
2931
)
3032

31-
const OldCAPIVersion = "v1.6.0"
33+
var (
34+
capoRelease011 string
35+
capoRelease012 string
36+
capiRelease19 string
37+
)
3238

33-
var _ = Describe("When testing clusterctl upgrades (v0.10=>current) [clusterctl-upgrade]", func() {
39+
var _ = Describe("When testing clusterctl upgrades (v0.11=>current) [clusterctl-upgrade]", func() {
3440
BeforeEach(func(ctx context.Context) {
3541
shared.ApplyCoreImagesPlus(ctx, e2eCtx, upgradeImage)
42+
setDownloadE2EImageEnvVar()
43+
capoRelease011, err = clusterctl.ResolveRelease(ctx, "go://github.com/kubernetes-sigs/[email protected]")
44+
Expect(err).ToNot(HaveOccurred(), "failed to get stable release of CAPO")
45+
// Note: This gives the version without the 'v' prefix, so we need to add it below.
46+
capiRelease19, err = capi_e2e.GetStableReleaseOfMinor(ctx, "1.9")
47+
Expect(err).ToNot(HaveOccurred(), "failed to get stable release of CAPI")
48+
capiRelease19 = "v" + capiRelease19
49+
})
3650

37-
// The upgrade job can't use image references in its machine templates,
38-
// so we must wait for the images to be available before running the
39-
// test.
40-
coreImages := shared.CoreImages(e2eCtx)
41-
allImages := append(coreImages, upgradeImage)
42-
shared.WaitForGlanceImagesAvailable(ctx, e2eCtx, allImages)
51+
capi_e2e.ClusterctlUpgradeSpec(context.TODO(), func() capi_e2e.ClusterctlUpgradeSpecInput {
52+
return capi_e2e.ClusterctlUpgradeSpecInput{
53+
E2EConfig: e2eCtx.E2EConfig,
54+
ClusterctlConfigPath: e2eCtx.Environment.ClusterctlConfigPath,
55+
BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
56+
ArtifactFolder: e2eCtx.Settings.ArtifactFolder,
57+
SkipCleanup: false,
58+
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/" + capiRelease19 + "/clusterctl-{OS}-{ARCH}",
59+
InitWithProvidersContract: "v1beta1",
60+
InitWithInfrastructureProviders: []string{"openstack:" + capoRelease011},
61+
InitWithCoreProvider: "cluster-api:" + capiRelease19,
62+
InitWithBootstrapProviders: []string{"kubeadm:" + capiRelease19},
63+
InitWithControlPlaneProviders: []string{"kubeadm:" + capiRelease19},
64+
MgmtFlavor: shared.FlavorDefault,
65+
WorkloadFlavor: shared.FlavorDefault,
66+
InitWithKubernetesVersion: e2eCtx.E2EConfig.MustGetVariable(shared.KubernetesVersion),
67+
}
68+
})
69+
})
4370

71+
var _ = Describe("When testing clusterctl upgrades (v0.12=>current) [clusterctl-upgrade]", func() {
72+
BeforeEach(func(ctx context.Context) {
73+
shared.ApplyCoreImagesPlus(ctx, e2eCtx, upgradeImage)
4474
setDownloadE2EImageEnvVar()
75+
capoRelease012, err = clusterctl.ResolveRelease(ctx, "go://github.com/kubernetes-sigs/[email protected]")
76+
Expect(err).ToNot(HaveOccurred(), "failed to get stable release of CAPO")
77+
// Note: This gives the version without the 'v' prefix, so we need to add it below.
78+
capiRelease19, err = capi_e2e.GetStableReleaseOfMinor(ctx, "1.9")
79+
Expect(err).ToNot(HaveOccurred(), "failed to get stable release of CAPI")
80+
capiRelease19 = "v" + capiRelease19
4581
})
4682

4783
capi_e2e.ClusterctlUpgradeSpec(context.TODO(), func() capi_e2e.ClusterctlUpgradeSpecInput {
@@ -51,14 +87,14 @@ var _ = Describe("When testing clusterctl upgrades (v0.10=>current) [clusterctl-
5187
BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
5288
ArtifactFolder: e2eCtx.Settings.ArtifactFolder,
5389
SkipCleanup: false,
54-
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/" + OldCAPIVersion + "/clusterctl-{OS}-{ARCH}",
90+
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/" + capiRelease19 + "/clusterctl-{OS}-{ARCH}",
5591
InitWithProvidersContract: "v1beta1",
56-
InitWithInfrastructureProviders: []string{"openstack:v0.10.0"},
57-
InitWithCoreProvider: "cluster-api:" + OldCAPIVersion,
58-
InitWithBootstrapProviders: []string{"kubeadm:" + OldCAPIVersion},
59-
InitWithControlPlaneProviders: []string{"kubeadm:" + OldCAPIVersion},
92+
InitWithInfrastructureProviders: []string{"openstack:" + capoRelease012},
93+
InitWithCoreProvider: "cluster-api:" + capiRelease19,
94+
InitWithBootstrapProviders: []string{"kubeadm:" + capiRelease19},
95+
InitWithControlPlaneProviders: []string{"kubeadm:" + capiRelease19},
6096
MgmtFlavor: shared.FlavorDefault,
61-
WorkloadFlavor: shared.FlavorWithoutORC,
97+
WorkloadFlavor: shared.FlavorDefault,
6298
InitWithKubernetesVersion: e2eCtx.E2EConfig.MustGetVariable(shared.KubernetesVersion),
6399
}
64100
})

0 commit comments

Comments
 (0)