Skip to content

Commit d9294bc

Browse files
lentzi90lentzi90
committed
E2E: Update versions for v0.14
Remove CAPO v0.11 as no longer tested. Add CAPO v0.14 and update CAPI versions to stay up to date. Since we now have v0.13.2 out with corrected metadata, we can also remove the errata we previously added to test upgrades to/from v0.13.1 and v0.13.0. Signed-off-by: Lennart Jern <lennart.jern@est.tech>
1 parent 186ecf1 commit d9294bc

4 files changed

Lines changed: 48 additions & 109 deletions

File tree

‎test/e2e/data/e2e_conf.yaml‎

Lines changed: 9 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,6 @@ providers:
3636
new: --metrics-addr=:8080
3737
files:
3838
- sourcePath: "../data/shared/capi/metadata.yaml"
39-
- name: "{go://sigs.k8s.io/cluster-api@v1.10}"
40-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.10}/core-components.yaml"
41-
type: url
42-
contract: v1beta1
43-
files:
44-
- sourcePath: "../data/shared/capi/metadata.yaml"
45-
replacements:
46-
- old: "imagePullPolicy: Always"
47-
new: "imagePullPolicy: IfNotPresent"
48-
- old: "--leader-elect"
49-
new: "--leader-elect=false\n - --sync-period=1m"
5039
- name: kubeadm
5140
type: BootstrapProvider
5241
versions:
@@ -69,17 +58,6 @@ providers:
6958
new: --metrics-addr=:8080
7059
files:
7160
- sourcePath: "../data/shared/capi/metadata.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}/bootstrap-components.yaml"
74-
type: url
75-
contract: v1beta1
76-
files:
77-
- sourcePath: "../data/shared/capi/metadata.yaml"
78-
replacements:
79-
- old: "imagePullPolicy: Always"
80-
new: "imagePullPolicy: IfNotPresent"
81-
- old: "--leader-elect"
82-
new: "--leader-elect=false\n - --sync-period=1m"
8361
- name: kubeadm
8462
type: ControlPlaneProvider
8563
versions:
@@ -102,23 +80,12 @@ providers:
10280
new: --metrics-addr=:8080
10381
files:
10482
- sourcePath: "../data/shared/capi/metadata.yaml"
105-
- name: "{go://sigs.k8s.io/cluster-api@v1.10}"
106-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.10}/control-plane-components.yaml"
107-
type: url
108-
contract: v1beta1
109-
files:
110-
- sourcePath: "../data/shared/capi/metadata.yaml"
111-
replacements:
112-
- old: "imagePullPolicy: Always"
113-
new: "imagePullPolicy: IfNotPresent"
114-
- old: "--leader-elect"
115-
new: "--leader-elect=false\n - --sync-period=1m"
11683
- name: openstack
11784
type: InfrastructureProvider
11885
versions:
11986
# This is only for clusterctl upgrade tests
120-
- name: "{go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.11}"
121-
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"
87+
- name: "{go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.12}"
88+
value: "https://github.com/kubernetes-sigs/cluster-api-provider-openstack/releases/download/{go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.12}/infrastructure-components.yaml"
12289
type: url
12390
contract: v1beta1
12491
files:
@@ -132,8 +99,8 @@ providers:
13299
- old: "--leader-elect"
133100
new: "--leader-elect=false\n - --sync-period=1m"
134101
# This is only for clusterctl upgrade tests
135-
- name: "{go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.12}"
136-
value: "https://github.com/kubernetes-sigs/cluster-api-provider-openstack/releases/download/{go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.12}/infrastructure-components.yaml"
102+
- name: "{go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.13}"
103+
value: "https://github.com/kubernetes-sigs/cluster-api-provider-openstack/releases/download/{go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.13}/infrastructure-components.yaml"
137104
type: url
138105
contract: v1beta1
139106
files:
@@ -147,13 +114,12 @@ providers:
147114
- old: "--leader-elect"
148115
new: "--leader-elect=false\n - --sync-period=1m"
149116
# This is only for clusterctl upgrade tests
150-
- name: "{go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.13}"
151-
value: "https://github.com/kubernetes-sigs/cluster-api-provider-openstack/releases/download/{go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.13}/infrastructure-components.yaml"
117+
- name: "{go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.14}"
118+
value: "https://github.com/kubernetes-sigs/cluster-api-provider-openstack/releases/download/{go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.14}/infrastructure-components.yaml"
152119
type: url
153-
# NOTE: v0.13.0 and v0.13.1 were mistakenly released with contract v1beta2.
154-
contract: v1beta2
120+
contract: v1beta1
155121
files:
156-
- sourcePath: "../data/shared/provider/errata/metadata.yaml"
122+
- sourcePath: "../data/shared/provider/metadata.yaml"
157123
- sourcePath: "./infrastructure-openstack-no-artifact/cluster-template.yaml"
158124
replacements:
159125
- old: "imagePullPolicy: Always"
@@ -162,7 +128,7 @@ providers:
162128
new: "--v=4"
163129
- old: "--leader-elect"
164130
new: "--leader-elect=false\n - --sync-period=1m"
165-
- name: v0.14.99
131+
- name: v0.15.99
166132
value: ../../../config/default
167133
# This is the upcoming version.
168134
contract: v1beta1

‎test/e2e/data/shared/provider/errata/metadata.yaml‎

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

‎test/e2e/data/shared/provider/metadata.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,6 @@ releaseSeries:
3131
- major: 0
3232
minor: 14
3333
contract: v1beta1
34+
- major: 0
35+
minor: 15
36+
contract: v1beta1

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

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@ import (
3030
)
3131

3232
var (
33-
capoRelease011 string
3433
capoRelease012 string
3534
capoRelease013 string
36-
capiRelease110 string
35+
capoRelease014 string
3736
capiRelease111 string
37+
capiRelease112 string
3838
)
3939

40-
var _ = Describe("When testing clusterctl upgrades for CAPO (v0.11=>current) and ORC (v1.0.2=>current) [clusterctl-upgrade]", func() {
40+
var _ = Describe("When testing clusterctl upgrades for CAPO (v0.12=>current) and ORC (v1.0.2=>current)[clusterctl-upgrade]", func() {
4141
BeforeEach(func(ctx context.Context) {
4242
// Note: This gives the version without the 'v' prefix, so we need to add it below.
43-
capoRelease011, err = clusterctl.ResolveRelease(ctx, "go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.11")
43+
capoRelease012, err = clusterctl.ResolveRelease(ctx, "go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.12")
4444
Expect(err).ToNot(HaveOccurred(), "failed to get stable release of CAPO")
45-
capoRelease011 = "v" + capoRelease011
45+
capoRelease012 = "v" + capoRelease012
4646
// Note: This gives the version without the 'v' prefix, so we need to add it below.
47-
capiRelease110, err = capi_e2e.GetStableReleaseOfMinor(ctx, "1.10")
47+
capiRelease111, err = capi_e2e.GetStableReleaseOfMinor(ctx, "1.11")
4848
Expect(err).ToNot(HaveOccurred(), "failed to get stable release of CAPI")
49-
capiRelease110 = "v" + capiRelease110
49+
capiRelease111 = "v" + capiRelease111
5050
})
5151

5252
capi_e2e.ClusterctlUpgradeSpec(context.TODO(), func() capi_e2e.ClusterctlUpgradeSpecInput {
@@ -56,12 +56,12 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.11=>current) and
5656
BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
5757
ArtifactFolder: e2eCtx.Settings.ArtifactFolder,
5858
SkipCleanup: false,
59-
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/" + capiRelease110 + "/clusterctl-{OS}-{ARCH}",
60-
InitWithProvidersContract: "v1beta1",
61-
InitWithInfrastructureProviders: []string{"openstack:" + capoRelease011},
62-
InitWithCoreProvider: "cluster-api:" + capiRelease110,
63-
InitWithBootstrapProviders: []string{"kubeadm:" + capiRelease110},
64-
InitWithControlPlaneProviders: []string{"kubeadm:" + capiRelease110},
59+
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/" + capiRelease111 + "/clusterctl-{OS}-{ARCH}",
60+
InitWithProvidersContract: "v1beta2",
61+
InitWithInfrastructureProviders: []string{"openstack:" + capoRelease012},
62+
InitWithCoreProvider: "cluster-api:" + capiRelease111,
63+
InitWithBootstrapProviders: []string{"kubeadm:" + capiRelease111},
64+
InitWithControlPlaneProviders: []string{"kubeadm:" + capiRelease111},
6565
MgmtFlavor: shared.FlavorDefault,
6666
WorkloadFlavor: shared.FlavorCapiV1Beta1,
6767
InitWithKubernetesVersion: e2eCtx.E2EConfig.MustGetVariable(shared.KubernetesKindVersion),
@@ -71,16 +71,16 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.11=>current) and
7171
})
7272
})
7373

74-
var _ = Describe("When testing clusterctl upgrades for CAPO (v0.12=>current) and ORC (v1.0.2=>current)[clusterctl-upgrade]", func() {
74+
var _ = Describe("When testing clusterctl upgrades for CAPO (v0.13=>current) and ORC (v1.0.2=>current)[clusterctl-upgrade]", func() {
7575
BeforeEach(func(ctx context.Context) {
7676
// Note: This gives the version without the 'v' prefix, so we need to add it below.
77-
capoRelease012, err = clusterctl.ResolveRelease(ctx, "go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.12")
77+
capoRelease013, err = clusterctl.ResolveRelease(ctx, "go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.13")
7878
Expect(err).ToNot(HaveOccurred(), "failed to get stable release of CAPO")
79-
capoRelease012 = "v" + capoRelease012
79+
capoRelease013 = "v" + capoRelease013
8080
// Note: This gives the version without the 'v' prefix, so we need to add it below.
81-
capiRelease110, err = capi_e2e.GetStableReleaseOfMinor(ctx, "1.10")
81+
capiRelease111, err = capi_e2e.GetStableReleaseOfMinor(ctx, "1.11")
8282
Expect(err).ToNot(HaveOccurred(), "failed to get stable release of CAPI")
83-
capiRelease110 = "v" + capiRelease110
83+
capiRelease111 = "v" + capiRelease111
8484
})
8585

8686
capi_e2e.ClusterctlUpgradeSpec(context.TODO(), func() capi_e2e.ClusterctlUpgradeSpecInput {
@@ -90,31 +90,31 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.12=>current) and
9090
BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
9191
ArtifactFolder: e2eCtx.Settings.ArtifactFolder,
9292
SkipCleanup: false,
93-
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/" + capiRelease110 + "/clusterctl-{OS}-{ARCH}",
94-
InitWithProvidersContract: "v1beta1",
95-
InitWithInfrastructureProviders: []string{"openstack:" + capoRelease012},
96-
InitWithCoreProvider: "cluster-api:" + capiRelease110,
97-
InitWithBootstrapProviders: []string{"kubeadm:" + capiRelease110},
98-
InitWithControlPlaneProviders: []string{"kubeadm:" + capiRelease110},
93+
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/" + capiRelease111 + "/clusterctl-{OS}-{ARCH}",
94+
InitWithProvidersContract: "v1beta2",
95+
InitWithInfrastructureProviders: []string{"openstack:" + capoRelease013},
96+
InitWithCoreProvider: "cluster-api:" + capiRelease111,
97+
InitWithBootstrapProviders: []string{"kubeadm:" + capiRelease111},
98+
InitWithControlPlaneProviders: []string{"kubeadm:" + capiRelease111},
9999
MgmtFlavor: shared.FlavorDefault,
100-
WorkloadFlavor: shared.FlavorCapiV1Beta1,
100+
WorkloadFlavor: shared.FlavorDefault,
101101
InitWithKubernetesVersion: e2eCtx.E2EConfig.MustGetVariable(shared.KubernetesKindVersion),
102102
InitWithRuntimeExtensionProviders: []string{"openstack-resource-controller:v1.0.2"},
103103
UseKindForManagementCluster: true,
104104
}
105105
})
106106
})
107107

108-
var _ = Describe("When testing clusterctl upgrades for CAPO (v0.13=>current) and ORC (v1.0.2=>current)[clusterctl-upgrade]", func() {
108+
var _ = Describe("When testing clusterctl upgrades for CAPO (v0.14=>current) and ORC (v1.0.2=>current)[clusterctl-upgrade]", func() {
109109
BeforeEach(func(ctx context.Context) {
110110
// Note: This gives the version without the 'v' prefix, so we need to add it below.
111-
capoRelease013, err = clusterctl.ResolveRelease(ctx, "go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.13")
111+
capoRelease014, err = clusterctl.ResolveRelease(ctx, "go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.14")
112112
Expect(err).ToNot(HaveOccurred(), "failed to get stable release of CAPO")
113-
capoRelease013 = "v" + capoRelease013
113+
capoRelease014 = "v" + capoRelease014
114114
// Note: This gives the version without the 'v' prefix, so we need to add it below.
115-
capiRelease111, err = capi_e2e.GetStableReleaseOfMinor(ctx, "1.11")
115+
capiRelease112, err = capi_e2e.GetStableReleaseOfMinor(ctx, "1.12")
116116
Expect(err).ToNot(HaveOccurred(), "failed to get stable release of CAPI")
117-
capiRelease111 = "v" + capiRelease111
117+
capiRelease112 = "v" + capiRelease112
118118
})
119119

120120
capi_e2e.ClusterctlUpgradeSpec(context.TODO(), func() capi_e2e.ClusterctlUpgradeSpecInput {
@@ -124,12 +124,12 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.13=>current) and
124124
BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
125125
ArtifactFolder: e2eCtx.Settings.ArtifactFolder,
126126
SkipCleanup: false,
127-
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/" + capiRelease111 + "/clusterctl-{OS}-{ARCH}",
128-
InitWithProvidersContract: "v1beta1",
129-
InitWithInfrastructureProviders: []string{"openstack:" + capoRelease013},
130-
InitWithCoreProvider: "cluster-api:" + capiRelease111,
131-
InitWithBootstrapProviders: []string{"kubeadm:" + capiRelease111},
132-
InitWithControlPlaneProviders: []string{"kubeadm:" + capiRelease111},
127+
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/" + capiRelease112 + "/clusterctl-{OS}-{ARCH}",
128+
InitWithProvidersContract: "v1beta2",
129+
InitWithInfrastructureProviders: []string{"openstack:" + capoRelease014},
130+
InitWithCoreProvider: "cluster-api:" + capiRelease112,
131+
InitWithBootstrapProviders: []string{"kubeadm:" + capiRelease112},
132+
InitWithControlPlaneProviders: []string{"kubeadm:" + capiRelease112},
133133
MgmtFlavor: shared.FlavorDefault,
134134
WorkloadFlavor: shared.FlavorDefault,
135135
InitWithKubernetesVersion: e2eCtx.E2EConfig.MustGetVariable(shared.KubernetesKindVersion),

0 commit comments

Comments
 (0)