Merge pull request #536 from abays/OSPRH-19158

[OSPRH-19158] Remove deprecated Kustomize fields config dir

Author: openshift-merge-bot[bot]

config/crd/kustomization.yaml

@@ -9,23 +9,23 @@ resources:
 - bases/cinder.openstack.org_cindervolumes.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
-patchesStrategicMerge:
+patches:
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
 # patches here are for enabling the conversion webhook for each CRD
-#- patches/webhook_in_cinders.yaml
-#- patches/webhook_in_cinderapis.yaml
-#- patches/webhook_in_cinderbackups.yaml
-#- patches/webhook_in_cinderschedulers.yaml
-#- patches/webhook_in_cindervolumes.yaml
+#- path: patches/webhook_in_cinders.yaml
+#- path: patches/webhook_in_cinderapis.yaml
+#- path: patches/webhook_in_cinderbackups.yaml
+#- path: patches/webhook_in_cinderschedulers.yaml
+#- path: patches/webhook_in_cindervolumes.yaml
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
 
 # [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
 # patches here are for enabling the CA injection for each CRD
-#- patches/cainjection_in_cinders.yaml
-#- patches/cainjection_in_cinderapis.yaml
-#- patches/cainjection_in_cinderbackups.yaml
-#- patches/cainjection_in_cinderschedulers.yaml
-#- patches/cainjection_in_cindervolumes.yaml
+#- path: patches/cainjection_in_cinders.yaml
+#- path: patches/cainjection_in_cinderapis.yaml
+#- path: patches/cainjection_in_cinderbackups.yaml
+#- path: patches/cainjection_in_cinderschedulers.yaml
+#- path: patches/cainjection_in_cindervolumes.yaml
 #+kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.

config/default/kustomization.yaml

@@ -9,10 +9,13 @@ namespace: openstack
 namePrefix: cinder-operator-
 
 # Labels to add to all resources and selectors.
-#commonLabels:
-#  someName: someValue
+#labels:
+#- includeSelectors: true
+#  includeTemplates: true
+#  pairs:
+#    someName: someValue
 
-bases:
+resources:
 - ../crd
 - ../rbac
 - ../manager
@@ -24,27 +27,27 @@ bases:
 # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
 #- ../prometheus
 
-patchesStrategicMerge:
+patches:
 # Protect the /metrics endpoint by putting it behind auth.
 # If you want your controller-manager to expose the /metrics
 # endpoint w/o any authn/z, please comment the following line.
-- manager_auth_proxy_patch.yaml
+- path: manager_auth_proxy_patch.yaml
 
 # Mount the controller config file for loading manager configurations
 # through a ComponentConfig type
-#- manager_config_patch.yaml
+#- path: manager_config_patch.yaml
 
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
 # crd/kustomization.yaml
-- manager_webhook_patch.yaml
+- path: manager_webhook_patch.yaml
 
 # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'.
 # Uncomment 'CERTMANAGER' sections in crd/kustomization.yaml to enable the CA injection in the admission webhooks.
 # 'CERTMANAGER' needs to be enabled to use ca injection
-#- webhookcainjection_patch.yaml
+#- path: webhookcainjection_patch.yaml
 
 # Injects our custom images (ENV variable settings)
-- manager_default_images.yaml
+- path: manager_default_images.yaml
 
 # the following config is for teaching kustomize how to do var substitution
 vars:

config/manifests/kustomization.yaml

@@ -9,7 +9,7 @@ resources:
 # [WEBHOOK] To enable webhooks, uncomment all the sections with [WEBHOOK] prefix.
 # Do NOT uncomment sections with prefix [CERTMANAGER], as OLM does not support cert-manager.
 # These patches remove the unnecessary "cert" volume and its manager container volumeMount.
-#patchesJson6902:
+#patches:
 #- target:
 #    group: apps
 #    version: v1

config/scorecard/kustomization.yaml

@@ -1,6 +1,6 @@
 resources:
 - bases/config.yaml
-patchesJson6902:
+patches:
 - path: patches/basic.config.yaml
   target:
     group: scorecard.operatorframework.io
@@ -13,4 +13,4 @@ patchesJson6902:
     version: v1alpha3
     kind: Configuration
     name: config
-#+kubebuilder:scaffold:patchesJson6902
+#+kubebuilder:scaffold:patches