Skip to content

Commit d7a0315

Browse files
azimuth-ci-bot[bot]mkjpryorMatt Pryor
authored
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]>
1 parent 8b752ae commit d7a0315

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

roles/clusterapi/defaults/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ clusterapi_core_components: "{{ clusterapi_core_repo }}/releases/download/{{ clu
77

88
# The repo, version and manifest URL for the Cluster API OpenStack provider components
99
clusterapi_openstack_repo: https://github.com/kubernetes-sigs/cluster-api-provider-openstack
10-
clusterapi_openstack_version: v0.9.0
10+
clusterapi_openstack_version: v0.10.5
1111
clusterapi_openstack_components: "{{ clusterapi_openstack_repo }}/releases/download/{{ clusterapi_openstack_version }}/infrastructure-components.yaml"
1212

1313
# The diagnostics address for Cluster API components
@@ -45,12 +45,14 @@ clusterapi_patches:
4545
# Remove the caBundle from the CAPO custom resource definitions
4646
# It is injected by cert-manager and causes validation issues if set outside of that
4747
# The CAPI CRDs do not have the field set in the manifests that are shipped
48+
# The caBundle exists on every CRD _except_ openstackfloatingippools
4849
- patch: |-
4950
- op: remove
5051
path: /spec/conversion/webhook/clientConfig/caBundle
5152
target:
5253
kind: CustomResourceDefinition
5354
labelSelector: cluster.x-k8s.io/provider=infrastructure-openstack
55+
name: openstack(cluster|machine).*
5456
# The manifests contain environment variable substitutions for feature gates that we do not need
5557
- patch: |-
5658
- op: replace

roles/clusterapi/tasks/main.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@
1313
- name: Install Cluster API resources
1414
command: kubectl apply -k {{ clusterapi_kustomization_directory }}
1515

16+
- name: Remove legacy CAPO mutating webhook
17+
command: kubectl delete mutatingwebhookconfiguration capo-mutating-webhook-configuration
18+
register: clusterapi_capo_mutating_webhook_delete
19+
changed_when: clusterapi_capo_mutating_webhook_delete.rc == 0
20+
failed_when: >-
21+
clusterapi_capo_mutating_webhook_delete.rc != 0 and
22+
"NotFound" not in clusterapi_capo_mutating_webhook_delete.stderr
23+
1624
- name: Wait for Cluster API controllers to become ready
1725
command: >-
1826
kubectl rollout status

0 commit comments

Comments
 (0)