Skip to content

Commit ca79911

Browse files
abaysclaude
authored andcommitted
[OSPRH-19463] Remove deprecated Kustomize fields in 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/crd/kustomization.yaml: - Standardize webhook patch entries to use 'path:' format for consistency - Ensure all commented patch entries use the modern 'path:' format 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-19463 Co-authored-by: Claude <claude@anthropic.com>
1 parent 7ec4438 commit ca79911

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

config/crd/kustomization.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ resources:
1111
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_watchers.yaml
15-
#- patches/webhook_in_watcherdecisionengines.yaml
16-
#- patches/webhook_in_watcherappliers.yaml
14+
#- path: patches/webhook_in_watchers.yaml
15+
#- path: patches/webhook_in_watcherdecisionengines.yaml
16+
#- path: patches/webhook_in_watcherappliers.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
2121
#- path: patches/cainjection_in_watcherapis.yaml
22-
#- patches/cainjection_in_watchers.yaml
23-
#- patches/cainjection_in_watcherdecisionengines.yaml
24-
#- patches/cainjection_in_watcherappliers.yaml
22+
#- path: patches/cainjection_in_watchers.yaml
23+
#- path: patches/cainjection_in_watcherdecisionengines.yaml
24+
#- path: patches/cainjection_in_watcherappliers.yaml
2525
#+kubebuilder:scaffold:crdkustomizecainjectionpatch
2626

2727
# [WEBHOOK] To enable webhook, uncomment the following section

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)