Skip to content

Commit a0eb7c3

Browse files
committed
Bump kustomize
Use the same version required in the architecture repo: https://github.com/openstack-k8s-operators/architecture?tab=readme-ov-file#requirements Signed-off-by: Fabricio Aguiar <[email protected]>
1 parent c73a218 commit a0eb7c3

File tree

5 files changed

+25
-15
lines changed

5 files changed

+25
-15
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
215215
GINKGO ?= $(LOCALBIN)/ginkgo
216216

217217
## Tool Versions
218-
KUSTOMIZE_VERSION ?= v3.8.7
218+
KUSTOMIZE_VERSION ?= v5.0.1
219219
CONTROLLER_TOOLS_VERSION ?= v0.11.1
220220

221221
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"

config/crd/kustomization.yaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,22 @@ resources:
66
- bases/client.openstack.org_openstackclients.yaml
77
#+kubebuilder:scaffold:crdkustomizeresource
88

9-
patchesStrategicMerge:
9+
patches:
1010
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
1111
# patches here are for enabling the conversion webhook for each CRD
12-
#- patches/webhook_in_core_openstackcontrolplanes.yaml
13-
#- patches/webhook_in_openstackclients.yaml
12+
#- path: patches/webhook_in_core_openstackcontrolplanes.yaml
13+
#- path: patches/webhook_in_openstackclients.yaml
1414
#+kubebuilder:scaffold:crdkustomizewebhookpatch
1515

1616
# [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
1717
# patches here are for enabling the CA injection for each CRD
18-
- patches/cainjection_in_core_openstackcontrolplanes.yaml
19-
#- patches/cainjection_in_openstackclients.yaml
18+
- path: patches/cainjection_in_core_openstackcontrolplanes.yaml
19+
#- path: patches/cainjection_in_openstackclients.yaml
2020
#+kubebuilder:scaffold:crdkustomizecainjectionpatch
2121

2222
# the following config is for teaching kustomize how to do kustomization for CRDs.
2323
configurations:
2424
- kustomizeconfig.yaml
25+
26+
apiVersion: kustomize.config.k8s.io/v1beta1
27+
kind: Kustomization

config/default/kustomization.yaml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namePrefix: openstack-operator-
1212
#commonLabels:
1313
# someName: someValue
1414

15-
bases:
15+
resources:
1616
- ../crd
1717
- ../rbac
1818
- ../manager
@@ -24,27 +24,27 @@ bases:
2424
# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
2525
#- ../prometheus
2626

27-
patchesStrategicMerge:
27+
patches:
2828
# Protect the /metrics endpoint by putting it behind auth.
2929
# If you want your controller-manager to expose the /metrics
3030
# endpoint w/o any authn/z, please comment the following line.
31-
- manager_auth_proxy_patch.yaml
31+
- path: manager_auth_proxy_patch.yaml
3232

3333
# Mount the controller config file for loading manager configurations
3434
# through a ComponentConfig type
35-
#- manager_config_patch.yaml
35+
#- path: manager_config_patch.yaml
3636

3737
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
3838
# crd/kustomization.yaml
39-
- manager_webhook_patch.yaml
39+
- path: manager_webhook_patch.yaml
4040

4141
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'.
4242
# Uncomment 'CERTMANAGER' sections in crd/kustomization.yaml to enable the CA injection in the admission webhooks.
4343
# 'CERTMANAGER' needs to be enabled to use ca injection
44-
- webhookcainjection_patch.yaml
44+
- path: webhookcainjection_patch.yaml
4545

4646
# Injects our custom images (ENV variable settings)
47-
- manager_default_images.yaml
47+
- path: manager_default_images.yaml
4848

4949
# the following config is for teaching kustomize how to do var substitution
5050
vars:
@@ -75,3 +75,6 @@ vars:
7575
# kind: Service
7676
# version: v1
7777
# name: webhook-service
78+
79+
apiVersion: kustomize.config.k8s.io/v1beta1
80+
kind: Kustomization

config/manifests/kustomization.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ resources:
99
# [WEBHOOK] To enable webhooks, uncomment all the sections with [WEBHOOK] prefix.
1010
# Do NOT uncomment sections with prefix [CERTMANAGER], as OLM does not support cert-manager.
1111
# These patches remove the unnecessary "cert" volume and its manager container volumeMount.
12-
#patchesJson6902:
12+
# apiVersion: kustomize.config.k8s.io/v1beta1
13+
# kind: Kustomization
14+
# patches:
1315
#- target:
1416
# group: apps
1517
# version: v1

config/scorecard/kustomization.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
resources:
22
- bases/config.yaml
3-
patchesJson6902:
3+
apiVersion: kustomize.config.k8s.io/v1beta1
4+
kind: Kustomization
5+
patches:
46
- path: patches/basic.config.yaml
57
target:
68
group: scorecard.operatorframework.io

0 commit comments

Comments
 (0)