Skip to content

Commit 263f321

Browse files
abaysClaude
andcommitted
[OSPRH-19141] Remove deprecated Kustomize fields config dir
Update all deprecated Kustomize fields to their modern equivalents across the config directory to ensure compatibility with Kustomize v5.3+ and future versions. Changes made: config/default/kustomization.yaml: - Replace 'bases:' with 'resources:' - Replace 'patchesStrategicMerge:' with 'patches:' - Convert patch entries to use 'path:' format - Update commented 'commonLabels:' to modern 'labels:' syntax with includeSelectors/includeTemplates structure config/crd/kustomization.yaml: - Replace 'patchesStrategicMerge:' with 'patches:' - Update commented patch entries to use 'path:' format for both webhook and cainjection patches config/manifests/kustomization.yaml: - Replace commented '#patchesJson6902:' with '#patches:' config/scorecard/kustomization.yaml: - Replace 'patchesJson6902:' with 'patches:' - Update kubebuilder scaffold comment from 'patchesJson6902' to 'patches' These changes eliminate deprecation warnings and align with the modern Kustomize field syntax while maintaining full backward compatibility. The modernization follows patterns established by other OpenStack K8s operators and industry best practices. Jira: https://issues.redhat.com/browse/OSPRH-19141 Co-authored-by: Claude <[email protected]>
1 parent b924833 commit 263f321

File tree

4 files changed

+21
-18
lines changed

4 files changed

+21
-18
lines changed

config/crd/kustomization.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ resources:
88
- bases/barbican.openstack.org_barbicankeystonelisteners.yaml
99
#+kubebuilder:scaffold:crdkustomizeresource
1010

11-
patchesStrategicMerge:
11+
patches:
1212
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
1313
# patches here are for enabling the conversion webhook for each CRD
14-
#- patches/webhook_in_barbicanapis.yaml
15-
#- patches/webhook_in_barbicans.yaml
16-
#- patches/webhook_in_barbicanworkers.yaml
14+
#- path: patches/webhook_in_barbicanapis.yaml
15+
#- path: patches/webhook_in_barbicans.yaml
16+
#- path: patches/webhook_in_barbicanworkers.yaml
1717
#+kubebuilder:scaffold:crdkustomizewebhookpatch
1818

1919
# [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
2020
# patches here are for enabling the CA injection for each CRD
21-
#- patches/cainjection_in_barbicanapis.yaml
22-
#- patches/cainjection_in_barbicans.yaml
23-
#- patches/cainjection_in_barbicanworkers.yaml
21+
#- path: patches/cainjection_in_barbicanapis.yaml
22+
#- path: patches/cainjection_in_barbicans.yaml
23+
#- path: patches/cainjection_in_barbicanworkers.yaml
2424
#+kubebuilder:scaffold:crdkustomizecainjectionpatch
2525

2626
# the following config is for teaching kustomize how to do kustomization for CRDs.

config/default/kustomization.yaml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@ namespace: barbican-operator-system
99
namePrefix: barbican-operator-
1010

1111
# Labels to add to all resources and selectors.
12-
#commonLabels:
13-
# someName: someValue
12+
#labels:
13+
#- includeSelectors: true
14+
# includeTemplates: true
15+
# pairs:
16+
# someName: someValue
1417

15-
bases:
18+
resources:
1619
- ../crd
1720
- ../rbac
1821
- ../manager
@@ -24,25 +27,25 @@ bases:
2427
# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
2528
#- ../prometheus
2629

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

3336

3437

3538
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
3639
# crd/kustomization.yaml
37-
- manager_webhook_patch.yaml
40+
- path: manager_webhook_patch.yaml
3841

3942
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'.
4043
# Uncomment 'CERTMANAGER' sections in crd/kustomization.yaml to enable the CA injection in the admission webhooks.
4144
# 'CERTMANAGER' needs to be enabled to use ca injection
42-
#- webhookcainjection_patch.yaml
45+
#- path: webhookcainjection_patch.yaml
4346

4447
# Injects our custom images (ENV variable settings)
45-
- manager_default_images.yaml
48+
- path: manager_default_images.yaml
4649

4750
# the following config is for teaching kustomize how to do var substitution
4851
vars:

config/manifests/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ 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+
#patches:
1313
#- target:
1414
# group: apps
1515
# version: v1

config/scorecard/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
resources:
22
- bases/config.yaml
3-
patchesJson6902:
3+
patches:
44
- path: patches/basic.config.yaml
55
target:
66
group: scorecard.operatorframework.io
@@ -13,4 +13,4 @@ patchesJson6902:
1313
version: v1alpha3
1414
kind: Configuration
1515
name: config
16-
#+kubebuilder:scaffold:patchesJson6902
16+
#+kubebuilder:scaffold:patches

0 commit comments

Comments
 (0)