Prepare main branch for CAPI v1.7 contract

Signed-off-by: Kashif Khan <[email protected]>
metal3-io · Mar 18, 2024 · b91bc7c · b91bc7c
1 parent 1c44f8b
commit b91bc7c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/clusterctl-settings.json b/clusterctl-settings.json
@@ -2,6 +2,6 @@
   "name": "infrastructure-metal3",
   "config": {
     "componentsFile": "infrastructure-components.yaml",
-    "nextVersion": "v1.6.99"
+    "nextVersion": "v1.7.99"
   }
 }
diff --git a/metadata.yaml b/metadata.yaml
@@ -1,6 +1,9 @@
 apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
 kind: Metadata
 releaseSeries:
+- major: 1
+  minor: 7
+  contract: v1beta1
 - major: 1
   minor: 6
   contract: v1beta1
@@ -19,6 +22,3 @@ releaseSeries:
 - major: 1
   minor: 1
   contract: v1beta1
-- major: 0
-  minor: 5
-  contract: v1alpha4
diff --git a/test/e2e/config/e2e_conf.yaml b/test/e2e/config/e2e_conf.yaml
@@ -103,6 +103,15 @@ providers:
       targetName: "cluster-template-ubuntu.yaml"
     - sourcePath: "../_out/cluster-template-centos.yaml"
       targetName: "cluster-template-centos.yaml"
+  - name: v1.7.99
+    value: "/Users/kashif/Documents/Work/cluster-api-provider-metal3/config/default"
+    files:
+    - sourcePath: "../data/infrastructure-metal3/main/metadata.yaml"
+      targetName: "metadata.yaml"
+    - sourcePath: "../_out/cluster-template-ubuntu.yaml"
+      targetName: "cluster-template-ubuntu.yaml"
+    - sourcePath: "../_out/cluster-template-centos.yaml"
+      targetName: "cluster-template-centos.yaml"
 
 variables:
   CNI: "/tmp/calico.yaml"

diff --git a/test/e2e/data/infrastructure-metal3/main/metadata.yaml b/test/e2e/data/infrastructure-metal3/main/metadata.yaml
@@ -1,6 +1,9 @@
 apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
 kind: Metadata
 releaseSeries:
+- major: 1
+  minor: 7
+  contract: v1beta1
 - major: 1
   minor: 6
   contract: v1beta1

diff --git a/test/e2e/data/shared/main/metadata.yaml b/test/e2e/data/shared/main/metadata.yaml
@@ -1,6 +1,9 @@
 apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
 kind: Metadata
 releaseSeries:
+- major: 1
+  minor: 7
+  contract: v1beta1
 - major: 1
   minor: 6
   contract: v1beta1