From e0365fbe82c1c779107aa0ae1046264162366486 Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Wed, 27 Nov 2024 19:42:55 +0100 Subject: [PATCH 1/2] CI: bump IPAM provider for e2e tests to v1.0 --- test/e2e/config/vsphere.yaml | 8 ++++---- .../e2e/data/shared/caipamic/{v0.1 => v1.0}/metadata.yaml | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename test/e2e/data/shared/caipamic/{v0.1 => v1.0}/metadata.yaml (100%) diff --git a/test/e2e/config/vsphere.yaml b/test/e2e/config/vsphere.yaml index 780dae930a..b81dc38376 100644 --- a/test/e2e/config/vsphere.yaml +++ b/test/e2e/config/vsphere.yaml @@ -8,7 +8,7 @@ # For creating local images, run ./hack/e2e.sh images: - - name: registry.k8s.io/capi-ipam-ic/cluster-api-ipam-in-cluster-controller:v0.1.0 + - name: registry.k8s.io/capi-ipam-ic/cluster-api-ipam-in-cluster-controller:v1.0.0 loadBehavior: tryLoad - name: gcr.io/k8s-staging-capi-vsphere/cluster-api-vsphere-controller-{ARCH}:dev loadBehavior: mustLoad @@ -146,12 +146,12 @@ providers: - name: in-cluster type: IPAMProvider versions: - - name: "{go://sigs.k8s.io/cluster-api-ipam-provider-in-cluster@v0.1}" # supported release in the v1alpha2 series - value: "https://github.com/kubernetes-sigs/cluster-api-ipam-provider-in-cluster/releases/download/{go://sigs.k8s.io/cluster-api-ipam-provider-in-cluster@v0.1}/ipam-components.yaml" + - name: "{go://sigs.k8s.io/cluster-api-ipam-provider-in-cluster@v1.0}" # supported release in the v1alpha2 series + value: "https://github.com/kubernetes-sigs/cluster-api-ipam-provider-in-cluster/releases/download/{go://sigs.k8s.io/cluster-api-ipam-provider-in-cluster@v1.0}/ipam-components.yaml" type: "url" contract: v1beta1 files: - - sourcePath: "../data/shared/caipamic/v0.1/metadata.yaml" + - sourcePath: "../data/shared/caipamic/v1.0/metadata.yaml" replacements: - old: "imagePullPolicy: Always" new: "imagePullPolicy: IfNotPresent" diff --git a/test/e2e/data/shared/caipamic/v0.1/metadata.yaml b/test/e2e/data/shared/caipamic/v1.0/metadata.yaml similarity index 100% rename from test/e2e/data/shared/caipamic/v0.1/metadata.yaml rename to test/e2e/data/shared/caipamic/v1.0/metadata.yaml From ac79231df4406896f50a30ae505e9a62fcdf01b4 Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Mon, 23 Dec 2024 15:44:16 +0100 Subject: [PATCH 2/2] fix ipam metadata --- test/e2e/data/shared/caipamic/v1.0/metadata.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/data/shared/caipamic/v1.0/metadata.yaml b/test/e2e/data/shared/caipamic/v1.0/metadata.yaml index 56d61ac6ca..cbc7134aae 100644 --- a/test/e2e/data/shared/caipamic/v1.0/metadata.yaml +++ b/test/e2e/data/shared/caipamic/v1.0/metadata.yaml @@ -6,7 +6,7 @@ apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3 kind: Metadata releaseSeries: - - major: 0 - minor: 1 + - major: 1 + minor: 0 contract: v1beta1