From d6c4c1e779d36ed6149aba3e5cd425e010001083 Mon Sep 17 00:00:00 2001 From: Nick Jones Date: Wed, 22 May 2024 21:02:03 +0100 Subject: [PATCH] Update references to use CAPI / CAPO v1.7.2 / v0.10.3 --- charts/unikorn/templates/applications.yaml | 9 +++++++++ .../templates/clustermanagerapplicationbundles.yaml | 2 +- .../templates/kubernetesclusterapplicationbundles.yaml | 2 +- .../helmapplications/clusteropenstack/hack.go | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/charts/unikorn/templates/applications.yaml b/charts/unikorn/templates/applications.yaml index 0c1bacaa..0acaef06 100644 --- a/charts/unikorn/templates/applications.yaml +++ b/charts/unikorn/templates/applications.yaml @@ -94,6 +94,10 @@ spec: repo: https://unikorn-cloud.github.io/helm-cluster-api chart: cluster-api interface: 1.0.0 + - version: v0.2.0 + repo: https://unikorn-cloud.github.io/helm-cluster-api + chart: cluster-api + interface: 1.0.0 --- apiVersion: unikorn-cloud.org/v1alpha1 kind: HelmApplication @@ -144,6 +148,11 @@ spec: chart: cluster-api-cluster-openstack createNamespace: true interface: 1.0.0 + - version: v0.4.0 + repo: https://unikorn-cloud.github.io/helm-cluster-api + chart: cluster-api-cluster-openstack + createNamespace: true + interface: 1.0.0 --- apiVersion: unikorn-cloud.org/v1alpha1 kind: HelmApplication diff --git a/charts/unikorn/templates/clustermanagerapplicationbundles.yaml b/charts/unikorn/templates/clustermanagerapplicationbundles.yaml index f878a561..70752f82 100644 --- a/charts/unikorn/templates/clustermanagerapplicationbundles.yaml +++ b/charts/unikorn/templates/clustermanagerapplicationbundles.yaml @@ -19,4 +19,4 @@ spec: reference: kind: HelmApplication name: cluster-api - version: v0.1.11 + version: v0.2.0 diff --git a/charts/unikorn/templates/kubernetesclusterapplicationbundles.yaml b/charts/unikorn/templates/kubernetesclusterapplicationbundles.yaml index 193a33ba..d15bb171 100644 --- a/charts/unikorn/templates/kubernetesclusterapplicationbundles.yaml +++ b/charts/unikorn/templates/kubernetesclusterapplicationbundles.yaml @@ -9,7 +9,7 @@ spec: reference: kind: HelmApplication name: cluster-openstack - version: v0.3.27 + version: v0.4.0 - name: cilium reference: kind: HelmApplication diff --git a/pkg/provisioners/helmapplications/clusteropenstack/hack.go b/pkg/provisioners/helmapplications/clusteropenstack/hack.go index e3de7b0e..fc37288f 100644 --- a/pkg/provisioners/helmapplications/clusteropenstack/hack.go +++ b/pkg/provisioners/helmapplications/clusteropenstack/hack.go @@ -105,7 +105,7 @@ func (p *Provisioner) getKubeadmControlPlanes(ctx context.Context, c client.Clie // getOpenstackMachineTemplates gets all live machine templates for the cluster. func (p *Provisioner) getOpenstackMachineTemplates(ctx context.Context, c client.Client) ([]unstructured.Unstructured, error) { // TODO: this is flaky as hell, due to hard coded versions, needs a fix upstream. - return p.getOwnedResource(ctx, c, "infrastructure.cluster.x-k8s.io/v1alpha6", "OpenStackMachineTemplate") + return p.getOwnedResource(ctx, c, "infrastructure.cluster.x-k8s.io/v1beta1", "OpenStackMachineTemplate") } // resourceExistsUnstructured tells whether the resource exists in the