Skip to content

Commit 85ae706

Browse files
committed
Revert v1beta2 contract
We have not fully implemented the contract yet, so we were wrong to advertise it. Sticking to v1beta1 until we are ready for real. Signed-off-by: Lennart Jern <lennart.jern@est.tech>
1 parent 4dc7f0a commit 85ae706

File tree

4 files changed

+35
-5
lines changed

4 files changed

+35
-5
lines changed

metadata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ releaseSeries:
2727
contract: v1beta1
2828
- major: 0
2929
minor: 13
30-
contract: v1beta2
30+
contract: v1beta1

test/e2e/data/e2e_conf.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,10 @@ providers:
150150
- name: "{go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.13}"
151151
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"
152152
type: url
153+
# NOTE: v0.13.0 and v0.13.1 were mistakenly released with contract v1beta2.
153154
contract: v1beta2
154155
files:
155-
- sourcePath: "../data/shared/provider/metadata.yaml"
156+
- sourcePath: "../data/shared/provider/errata/metadata.yaml"
156157
- sourcePath: "./infrastructure-openstack-no-artifact/cluster-template.yaml"
157158
replacements:
158159
- old: "imagePullPolicy: Always"
@@ -164,8 +165,7 @@ providers:
164165
- name: v0.13.99
165166
value: ../../../config/default
166167
# This is the upcoming version.
167-
# Specify no contract so that upgrade tests that start from a specific contract won't pick it up.
168-
# contract: v1beta2
168+
contract: v1beta1
169169
files:
170170
- sourcePath: "../data/shared/provider/metadata.yaml"
171171
- sourcePath: "./infrastructure-openstack-no-artifact/cluster-template.yaml"
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
2+
kind: Metadata
3+
releaseSeries:
4+
- major: 0
5+
minor: 5
6+
contract: v1beta1
7+
- major: 0
8+
minor: 6
9+
contract: v1beta1
10+
- major: 0
11+
minor: 7
12+
contract: v1beta1
13+
- major: 0
14+
minor: 8
15+
contract: v1beta1
16+
- major: 0
17+
minor: 9
18+
contract: v1beta1
19+
- major: 0
20+
minor: 10
21+
contract: v1beta1
22+
- major: 0
23+
minor: 11
24+
contract: v1beta1
25+
- major: 0
26+
minor: 12
27+
contract: v1beta1
28+
- major: 0
29+
minor: 13
30+
contract: v1beta2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ releaseSeries:
2727
contract: v1beta1
2828
- major: 0
2929
minor: 13
30-
contract: v1beta2
30+
contract: v1beta1

0 commit comments

Comments
 (0)