Add metadata for v0.15 and update e2e

Bump ORC used in e2e tests to 2.5.0.
Set correct metadata and contract versions.

Signed-off-by: Lennart Jern <lennart.jern@est.tech>

Author: lentzi90

metadata.yaml

@@ -31,3 +31,6 @@ releaseSeries:
 - major: 0
   minor: 14
   contract: v1beta1
+- major: 0
+  minor: 15
+  contract: v1beta2

test/e2e/data/e2e_conf.yaml

@@ -10,7 +10,7 @@ images:
 # Use local dev images built source tree;
 - name: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:e2e
   loadBehavior: mustLoad
-- name: quay.io/orc/openstack-resource-controller:v2.4.0
+- name: quay.io/orc/openstack-resource-controller:v2.5.0
   loadBehavior: tryLoad
 
 providers:
@@ -131,7 +131,7 @@ providers:
   - name: v0.15.99
     value: ../../../config/default
     # This is the upcoming version.
-    contract: v1beta1
+    contract: v1beta2
     files:
     - sourcePath: "../data/shared/provider/metadata.yaml"
     - sourcePath: "./infrastructure-openstack-no-artifact/cluster-template.yaml"
@@ -151,9 +151,9 @@ providers:
 - name: openstack-resource-controller
   type: RuntimeExtensionProvider # ORC isn't a provider but we fake it so it can be handled by the clusterctl machinery.
   versions:
-  - name: v2.4.0
+  - name: v2.5.0
     value: ../../../../cluster-api-provider-openstack/test/infrastructure/openstack-resource-controller/config/default
-    contract: v1beta1
+    contract: v1beta2
     files:
     - sourcePath: "../data/shared/openstack-resource-controller/metadata.yaml"
     replacements:

test/e2e/data/shared/openstack-resource-controller/metadata.yaml

@@ -17,3 +17,6 @@ releaseSeries:
 - major: 2
   minor: 4
   contract: v1beta1
+- major: 2
+  minor: 5
+  contract: v1beta2

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

@@ -33,4 +33,4 @@ releaseSeries:
   contract: v1beta1
 - major: 0
   minor: 15
-  contract: v1beta1
+  contract: v1beta2

test/e2e/suites/e2e/clusterctl_upgrade_test.go

@@ -56,7 +56,7 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.12=>current) and
 			ArtifactFolder:                    e2eCtx.Settings.ArtifactFolder,
 			SkipCleanup:                       false,
 			InitWithBinary:                    "https://github.com/kubernetes-sigs/cluster-api/releases/download/" + capiRelease112 + "/clusterctl-{OS}-{ARCH}",
-			InitWithProvidersContract:         "v1beta2",
+			InitWithProvidersContract:         "v1beta1",
 			InitWithInfrastructureProviders:   []string{"openstack:" + capoRelease012},
 			InitWithCoreProvider:              "cluster-api:" + capiRelease112,
 			InitWithBootstrapProviders:        []string{"kubeadm:" + capiRelease112},
@@ -90,7 +90,7 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.13=>current) and
 			ArtifactFolder:                    e2eCtx.Settings.ArtifactFolder,
 			SkipCleanup:                       false,
 			InitWithBinary:                    "https://github.com/kubernetes-sigs/cluster-api/releases/download/" + capiRelease112 + "/clusterctl-{OS}-{ARCH}",
-			InitWithProvidersContract:         "v1beta2",
+			InitWithProvidersContract:         "v1beta1",
 			InitWithInfrastructureProviders:   []string{"openstack:" + capoRelease013},
 			InitWithCoreProvider:              "cluster-api:" + capiRelease112,
 			InitWithBootstrapProviders:        []string{"kubeadm:" + capiRelease112},
@@ -124,7 +124,7 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.14=>current) and
 			ArtifactFolder:                    e2eCtx.Settings.ArtifactFolder,
 			SkipCleanup:                       false,
 			InitWithBinary:                    "https://github.com/kubernetes-sigs/cluster-api/releases/download/" + capiRelease112 + "/clusterctl-{OS}-{ARCH}",
-			InitWithProvidersContract:         "v1beta2",
+			InitWithProvidersContract:         "v1beta1",
 			InitWithInfrastructureProviders:   []string{"openstack:" + capoRelease014},
 			InitWithCoreProvider:              "cluster-api:" + capiRelease112,
 			InitWithBootstrapProviders:        []string{"kubeadm:" + capiRelease112},

test/infrastructure/openstack-resource-controller/config/default/kustomization.yaml

@@ -8,4 +8,4 @@ labels:
     cluster.x-k8s.io/provider: "runtime-extension-openstack-resource-controller"
 
 resources:
-- https://github.com/k-orc/openstack-resource-controller/releases/download/v2.4.0/install.yaml
+- https://github.com/k-orc/openstack-resource-controller/releases/download/v2.5.0/install.yaml