Merge pull request #2883 from Nordix/lentzi90/contract-revert

🐛 Revert v1beta2 contract

Author: k8s-ci-robot

metadata.yaml

@@ -27,4 +27,4 @@ releaseSeries:
   contract: v1beta1
 - major: 0
   minor: 13
-  contract: v1beta2
+  contract: v1beta1

test/e2e/data/e2e_conf.yaml

@@ -150,9 +150,10 @@ providers:
   - name: "{go://github.com/kubernetes-sigs/cluster-api-provider-openstack@v0.13}"
     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"
     type: url
+    # NOTE: v0.13.0 and v0.13.1 were mistakenly released with contract v1beta2.
     contract: v1beta2
     files:
-    - sourcePath: "../data/shared/provider/metadata.yaml"
+    - sourcePath: "../data/shared/provider/errata/metadata.yaml"
     - sourcePath: "./infrastructure-openstack-no-artifact/cluster-template.yaml"
     replacements:
     - old: "imagePullPolicy: Always"
@@ -164,8 +165,7 @@ providers:
   - name: v0.13.99
     value: ../../../config/default
     # This is the upcoming version.
-    # Specify no contract so that upgrade tests that start from a specific contract won't pick it up.
-    # contract: v1beta2
+    contract: v1beta1
     files:
     - sourcePath: "../data/shared/provider/metadata.yaml"
     - sourcePath: "./infrastructure-openstack-no-artifact/cluster-template.yaml"

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

@@ -0,0 +1,30 @@
+apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
+kind: Metadata
+releaseSeries:
+- major: 0
+  minor: 5
+  contract: v1beta1
+- major: 0
+  minor: 6
+  contract: v1beta1
+- major: 0
+  minor: 7
+  contract: v1beta1
+- major: 0
+  minor: 8
+  contract: v1beta1
+- major: 0
+  minor: 9
+  contract: v1beta1
+- major: 0
+  minor: 10
+  contract: v1beta1
+- major: 0
+  minor: 11
+  contract: v1beta1
+- major: 0
+  minor: 12
+  contract: v1beta1
+- major: 0
+  minor: 13
+  contract: v1beta2

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

@@ -27,4 +27,4 @@ releaseSeries:
   contract: v1beta1
 - major: 0
   minor: 13
-  contract: v1beta2
+  contract: v1beta1