Update cluster-api-provider-openstack to v0.10.5 (#511)

* Update cluster-api-provider-openstack to v0.10.5 * Fix broken deployment --------- Co-authored-by: mkjpryor <[email protected]> Co-authored-by: Matt Pryor <[email protected]>
azimuth-cloud · Oct 21, 2024 · d7a0315 · d7a0315
1 parent 8b752ae
commit d7a0315
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/roles/clusterapi/defaults/main.yml b/roles/clusterapi/defaults/main.yml
@@ -7,7 +7,7 @@ clusterapi_core_components: "{{ clusterapi_core_repo }}/releases/download/{{ clu
 
 # The repo, version and manifest URL for the Cluster API OpenStack provider components
 clusterapi_openstack_repo: https://github.com/kubernetes-sigs/cluster-api-provider-openstack
-clusterapi_openstack_version: v0.9.0
+clusterapi_openstack_version: v0.10.5
 clusterapi_openstack_components: "{{ clusterapi_openstack_repo }}/releases/download/{{ clusterapi_openstack_version }}/infrastructure-components.yaml"
 
 # The diagnostics address for Cluster API components
@@ -45,12 +45,14 @@ clusterapi_patches:
   # Remove the caBundle from the CAPO custom resource definitions
   # It is injected by cert-manager and causes validation issues if set outside of that
   # The CAPI CRDs do not have the field set in the manifests that are shipped
+  # The caBundle exists on every CRD _except_ openstackfloatingippools
   - patch: |-
       - op: remove
         path: /spec/conversion/webhook/clientConfig/caBundle
     target:
       kind: CustomResourceDefinition
       labelSelector: cluster.x-k8s.io/provider=infrastructure-openstack
+      name: openstack(cluster|machine).*
   # The manifests contain environment variable substitutions for feature gates that we do not need
   - patch: |-
       - op: replace

diff --git a/roles/clusterapi/tasks/main.yml b/roles/clusterapi/tasks/main.yml
@@ -13,6 +13,14 @@
 - name: Install Cluster API resources
   command: kubectl apply -k {{ clusterapi_kustomization_directory }}
 
+- name: Remove legacy CAPO mutating webhook
+  command: kubectl delete mutatingwebhookconfiguration capo-mutating-webhook-configuration
+  register: clusterapi_capo_mutating_webhook_delete
+  changed_when: clusterapi_capo_mutating_webhook_delete.rc == 0
+  failed_when: >-
+    clusterapi_capo_mutating_webhook_delete.rc != 0 and
+    "NotFound" not in clusterapi_capo_mutating_webhook_delete.stderr
+
 - name: Wait for Cluster API controllers to become ready
   command: >-
     kubectl rollout status