From 818e8800a46bbc2a346027e9d3f679e1d7c716a2 Mon Sep 17 00:00:00 2001 From: Sajiyah Salat <109643863+Sajiyah-Salat@users.noreply.github.com> Date: Wed, 10 May 2023 13:48:34 +0000 Subject: [PATCH] patchesStrategicMerge to Patches --- .../testdata/project/config/crd/kustomization.yaml | 2 +- .../testdata/project/config/crd/kustomization.yaml | 2 +- .../v2/scaffolds/internal/templates/config/crd/kustomization.go | 2 +- testdata/project-v4-config/config/crd/kustomization.yaml | 2 +- .../project-v4-declarative-v1/config/crd/kustomization.yaml | 2 +- testdata/project-v4-multigroup/config/crd/kustomization.yaml | 2 +- .../project-v4-with-deploy-image/config/crd/kustomization.yaml | 2 +- testdata/project-v4/config/crd/kustomization.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/book/src/component-config-tutorial/testdata/project/config/crd/kustomization.yaml b/docs/book/src/component-config-tutorial/testdata/project/config/crd/kustomization.yaml index 3689b6319c3..22fff65b92c 100644 --- a/docs/book/src/component-config-tutorial/testdata/project/config/crd/kustomization.yaml +++ b/docs/book/src/component-config-tutorial/testdata/project/config/crd/kustomization.yaml @@ -5,7 +5,7 @@ resources: - bases/config.tutorial.kubebuilder.io_projectconfigs.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_projectconfigs.yaml diff --git a/docs/book/src/cronjob-tutorial/testdata/project/config/crd/kustomization.yaml b/docs/book/src/cronjob-tutorial/testdata/project/config/crd/kustomization.yaml index a57208175d0..ed16f6b985b 100644 --- a/docs/book/src/cronjob-tutorial/testdata/project/config/crd/kustomization.yaml +++ b/docs/book/src/cronjob-tutorial/testdata/project/config/crd/kustomization.yaml @@ -5,7 +5,7 @@ resources: - bases/batch.tutorial.kubebuilder.io_cronjobs.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_cronjobs.yaml diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomization.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomization.go index 25fbc18af85..0cdca88ad14 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomization.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomization.go @@ -110,7 +110,7 @@ var kustomizationTemplate = `# This kustomization.yaml is not intended to be run resources: %s -patchesStrategicMerge: +patches: # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix. # patches here are for enabling the conversion webhook for each CRD %s diff --git a/testdata/project-v4-config/config/crd/kustomization.yaml b/testdata/project-v4-config/config/crd/kustomization.yaml index 37c36ffdebd..bf4c93a811c 100644 --- a/testdata/project-v4-config/config/crd/kustomization.yaml +++ b/testdata/project-v4-config/config/crd/kustomization.yaml @@ -7,7 +7,7 @@ resources: - bases/crew.testproject.org_admirals.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_captains.yaml diff --git a/testdata/project-v4-declarative-v1/config/crd/kustomization.yaml b/testdata/project-v4-declarative-v1/config/crd/kustomization.yaml index 37c36ffdebd..bf4c93a811c 100644 --- a/testdata/project-v4-declarative-v1/config/crd/kustomization.yaml +++ b/testdata/project-v4-declarative-v1/config/crd/kustomization.yaml @@ -7,7 +7,7 @@ resources: - bases/crew.testproject.org_admirals.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_captains.yaml diff --git a/testdata/project-v4-multigroup/config/crd/kustomization.yaml b/testdata/project-v4-multigroup/config/crd/kustomization.yaml index be93af7e522..8c2e5c49499 100644 --- a/testdata/project-v4-multigroup/config/crd/kustomization.yaml +++ b/testdata/project-v4-multigroup/config/crd/kustomization.yaml @@ -14,7 +14,7 @@ resources: - bases/testproject.org_lakers.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_captains.yaml diff --git a/testdata/project-v4-with-deploy-image/config/crd/kustomization.yaml b/testdata/project-v4-with-deploy-image/config/crd/kustomization.yaml index af8efaa4ba4..4d4c5a9212d 100644 --- a/testdata/project-v4-with-deploy-image/config/crd/kustomization.yaml +++ b/testdata/project-v4-with-deploy-image/config/crd/kustomization.yaml @@ -6,7 +6,7 @@ resources: - bases/example.com.testproject.org_busyboxes.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_memcacheds.yaml diff --git a/testdata/project-v4/config/crd/kustomization.yaml b/testdata/project-v4/config/crd/kustomization.yaml index 0d38144170a..75e0b8e4258 100644 --- a/testdata/project-v4/config/crd/kustomization.yaml +++ b/testdata/project-v4/config/crd/kustomization.yaml @@ -7,7 +7,7 @@ resources: - bases/crew.testproject.org_admirales.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_captains.yaml