Skip to content

Commit 6261a6b

Browse files
committed
openshift: remove caBundle
This was removed from upstream CAPO in v0.11, so we need to remove that kustomize.
1 parent e20428f commit 6261a6b

File tree

2 files changed

+0
-23
lines changed

2 files changed

+0
-23
lines changed

openshift/kustomize/infrastructure-components/crd_remove_cabundle.yaml

Lines changed: 0 additions & 2 deletions
This file was deleted.

openshift/kustomize/infrastructure-components/kustomization.yaml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,6 @@ images:
2222
patches:
2323
- path: manager_webhook_patch.yaml
2424

25-
# service-ca will write the ca bundle, so we must not set it here to avoid
26-
# a conflict between cluster-capi-operator and service-ca
27-
# Note that openstackfloatingippools does not currently have a conversion
28-
# webhook, so attempting to patch it produces an error.
29-
- target:
30-
kind: CustomResourceDefinition
31-
name: openstackclusters.infrastructure.cluster.x-k8s.io
32-
path: crd_remove_cabundle.yaml
33-
- target:
34-
kind: CustomResourceDefinition
35-
name: openstackclustertemplates.infrastructure.cluster.x-k8s.io
36-
path: crd_remove_cabundle.yaml
37-
- target:
38-
kind: CustomResourceDefinition
39-
name: openstackmachines.infrastructure.cluster.x-k8s.io
40-
path: crd_remove_cabundle.yaml
41-
- target:
42-
kind: CustomResourceDefinition
43-
name: openstackmachinetemplates.infrastructure.cluster.x-k8s.io
44-
path: crd_remove_cabundle.yaml
45-
4625
replacements:
4726
# Set the webhook cert secret name in the service and the controller-manager
4827
# deployment where it's used

0 commit comments

Comments
 (0)