Skip to content

Commit ac6673e

Browse files
authored
Revert CAPO to v0.10.5 (#725)
* 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
1 parent f3e4c76 commit ac6673e

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

roles/clusterapi/defaults/main.yml

Lines changed: 12 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.11.3
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
@@ -42,6 +42,17 @@ clusterapi_manifests:
4242

4343
# List of patches to apply to the resources in the manifests
4444
clusterapi_patches:
45+
# Remove the caBundle from the CAPO custom resource definitions
46+
# It is injected by cert-manager and causes validation issues if set outside of that
47+
# The CAPI CRDs do not have the field set in the manifests that are shipped
48+
# The caBundle exists on every CRD _except_ openstackfloatingippools
49+
- patch: |-
50+
- op: remove
51+
path: /spec/conversion/webhook/clientConfig/caBundle
52+
target:
53+
kind: CustomResourceDefinition
54+
labelSelector: cluster.x-k8s.io/provider=infrastructure-openstack
55+
name: openstack(cluster|machine).*
4556
# The manifests contain environment variable substitutions for feature gates that we do not need
4657
- patch: |-
4758
- op: replace

0 commit comments

Comments
 (0)