Skip to content

Commit

Permalink
Revert CAPO to v0.10.5 (#725)
Browse files Browse the repository at this point in the history
* Revert CAPO to v0.10.5

* Revert "Remove unnecessary patch of CAPO resources"

This reverts commit 56465ee and is required for the rollback to CAPO v0.10.5
  • Loading branch information
sd109 authored Jan 6, 2025
1 parent f3e4c76 commit ac6673e
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion roles/clusterapi/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.3
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
Expand Down Expand Up @@ -42,6 +42,17 @@ clusterapi_manifests:

# List of patches to apply to the resources in the manifests
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
Expand Down

0 comments on commit ac6673e

Please sign in to comment.