Skip to content

Commit fd4c06f

Browse files
authored
Merge pull request #2917 from Nordix/lentzi90/metadata-bump
🌱 Update metadata for v0.14
2 parents 43807d2 + 78658e9 commit fd4c06f

File tree

5 files changed

+26
-17
lines changed

5 files changed

+26
-17
lines changed

metadata.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,6 @@ releaseSeries:
2828
- major: 0
2929
minor: 13
3030
contract: v1beta1
31+
- major: 0
32+
minor: 14
33+
contract: v1beta1

test/e2e/data/e2e_conf.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ providers:
1717
- name: cluster-api
1818
type: CoreProvider
1919
versions:
20-
- name: "{go://sigs.k8s.io/cluster-api@v1.11}"
21-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.11}/core-components.yaml"
20+
- name: "{go://sigs.k8s.io/cluster-api@v1.12}"
21+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.12}/core-components.yaml"
2222
type: "url"
2323
contract: v1beta2
2424
replacements:
@@ -27,8 +27,8 @@ providers:
2727
files:
2828
- sourcePath: "../data/shared/capi/metadata.yaml"
2929
# For clusterctl upgrade test
30-
- name: v1.11.0
31-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0/core-components.yaml"
30+
- name: "{go://sigs.k8s.io/cluster-api@v1.11}"
31+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.11}/core-components.yaml"
3232
type: "url"
3333
contract: v1beta2
3434
replacements:
@@ -50,8 +50,8 @@ providers:
5050
- name: kubeadm
5151
type: BootstrapProvider
5252
versions:
53-
- name: "{go://sigs.k8s.io/cluster-api@v1.11}"
54-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.11}/bootstrap-components.yaml"
53+
- name: "{go://sigs.k8s.io/cluster-api@v1.12}"
54+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.12}/bootstrap-components.yaml"
5555
type: "url"
5656
contract: v1beta2
5757
replacements:
@@ -60,8 +60,8 @@ providers:
6060
files:
6161
- sourcePath: "../data/shared/capi/metadata.yaml"
6262
# For clusterctl upgrade test
63-
- name: v1.11.0
64-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0/bootstrap-components.yaml"
63+
- name: "{go://sigs.k8s.io/cluster-api@v1.11}"
64+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.11}/bootstrap-components.yaml"
6565
type: "url"
6666
contract: v1beta2
6767
replacements:
@@ -83,8 +83,8 @@ providers:
8383
- name: kubeadm
8484
type: ControlPlaneProvider
8585
versions:
86-
- name: "{go://sigs.k8s.io/cluster-api@v1.11}"
87-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.11}/control-plane-components.yaml"
86+
- name: "{go://sigs.k8s.io/cluster-api@v1.12}"
87+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.12}/control-plane-components.yaml"
8888
type: "url"
8989
contract: v1beta2
9090
replacements:
@@ -93,8 +93,8 @@ providers:
9393
files:
9494
- sourcePath: "../data/shared/capi/metadata.yaml"
9595
# For clusterctl upgrade test
96-
- name: v1.11.0
97-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.0/control-plane-components.yaml"
96+
- name: "{go://sigs.k8s.io/cluster-api@v1.11}"
97+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.11}/control-plane-components.yaml"
9898
type: "url"
9999
contract: v1beta2
100100
replacements:
@@ -162,7 +162,7 @@ providers:
162162
new: "--v=4"
163163
- old: "--leader-elect"
164164
new: "--leader-elect=false\n - --sync-period=1m"
165-
- name: v0.13.99
165+
- name: v0.14.99
166166
value: ../../../config/default
167167
# This is the upcoming version.
168168
contract: v1beta1

test/e2e/data/shared/capi/metadata.yaml

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

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,6 @@ releaseSeries:
2828
- major: 0
2929
minor: 13
3030
contract: v1beta1
31+
- major: 0
32+
minor: 14
33+
contract: v1beta1

test/e2e/suites/e2e/clusterctl_upgrade_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,10 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.13=>current) and
111111
capoRelease013, err = clusterctl.ResolveRelease(ctx, "go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.13")
112112
Expect(err).ToNot(HaveOccurred(), "failed to get stable release of CAPO")
113113
capoRelease013 = "v" + capoRelease013
114-
// We need CAPI v1.11 here for clusterctl init with the v1beta2 contract.
115-
// This is hard-coded to the .0 release because the test will fail if there are no
116-
// newer patch releases to upgrade to.
117-
capiRelease111 = "v1.11.0"
114+
// 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")
116+
Expect(err).ToNot(HaveOccurred(), "failed to get stable release of CAPI")
117+
capiRelease111 = "v" + capiRelease111
118118
})
119119

120120
capi_e2e.ClusterctlUpgradeSpec(context.TODO(), func() capi_e2e.ClusterctlUpgradeSpecInput {

0 commit comments

Comments
 (0)