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 87728c484f0..c8e4bdd0e95 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:kustomizeresource -patches: +patchesStrategicMerge: # [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/docs/book/src/cronjob-tutorial/testdata/project/config/default/kustomization.yaml b/docs/book/src/cronjob-tutorial/testdata/project/config/default/kustomization.yaml index b95644dd71b..c5af96260a1 100644 --- a/docs/book/src/cronjob-tutorial/testdata/project/config/default/kustomization.yaml +++ b/docs/book/src/cronjob-tutorial/testdata/project/config/default/kustomization.yaml @@ -21,7 +21,7 @@ bases: # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required. - ../certmanager -patches: +patchesStrategicMerge: - manager_image_patch.yaml # Protect the /metrics endpoint by putting it behind auth. # Only one of manager_auth_proxy_patch.yaml and diff --git a/docs/book/src/multiversion-tutorial/testdata/project/config/crd/kustomization.yaml b/docs/book/src/multiversion-tutorial/testdata/project/config/crd/kustomization.yaml index d48fc964fc4..7e3a36d36f3 100644 --- a/docs/book/src/multiversion-tutorial/testdata/project/config/crd/kustomization.yaml +++ b/docs/book/src/multiversion-tutorial/testdata/project/config/crd/kustomization.yaml @@ -5,7 +5,7 @@ resources: - bases/infra.kubebuilder.io_disks.yaml # +kubebuilder:scaffold:crdkustomizeresource -patches: +patchesStrategicMerge: # [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_disks.yaml diff --git a/docs/book/src/multiversion-tutorial/testdata/project/config/default/kustomization.yaml b/docs/book/src/multiversion-tutorial/testdata/project/config/default/kustomization.yaml index 334a9952a98..8d9c029ba55 100644 --- a/docs/book/src/multiversion-tutorial/testdata/project/config/default/kustomization.yaml +++ b/docs/book/src/multiversion-tutorial/testdata/project/config/default/kustomization.yaml @@ -21,7 +21,7 @@ bases: # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required. - ../certmanager -patches: +patchesStrategicMerge: - manager_image_patch.yaml # Protect the /metrics endpoint by putting it behind auth. # Only one of manager_auth_proxy_patch.yaml and diff --git a/pkg/scaffold/project/kustomize.go b/pkg/scaffold/project/kustomize.go index 529e45c5a2b..7a4b285ea13 100644 --- a/pkg/scaffold/project/kustomize.go +++ b/pkg/scaffold/project/kustomize.go @@ -69,7 +69,7 @@ bases: - ../rbac - ../manager -patches: +patchesStrategicMerge: - manager_image_patch.yaml # Protect the /metrics endpoint by putting it behind auth. # Only one of manager_auth_proxy_patch.yaml and diff --git a/pkg/scaffold/v2/crd/kustomization.go b/pkg/scaffold/v2/crd/kustomization.go index f0fa52d866c..c6e3573d361 100644 --- a/pkg/scaffold/v2/crd/kustomization.go +++ b/pkg/scaffold/v2/crd/kustomization.go @@ -81,7 +81,7 @@ var kustomizationTemplate = fmt.Sprintf(`# This kustomization.yaml is not intend resources: %s -patches: +patchesStrategicMerge: # [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/pkg/scaffold/v2/kustomize.go b/pkg/scaffold/v2/kustomize.go index 94132699d7c..176545e9e17 100644 --- a/pkg/scaffold/v2/kustomize.go +++ b/pkg/scaffold/v2/kustomize.go @@ -74,7 +74,7 @@ bases: # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required. #- ../certmanager -patches: +patchesStrategicMerge: - manager_image_patch.yaml # Protect the /metrics endpoint by putting it behind auth. # Only one of manager_auth_proxy_patch.yaml and diff --git a/testdata/gopath/src/project/config/default/kustomization.yaml b/testdata/gopath/src/project/config/default/kustomization.yaml index efe0a4d5af0..4e7fa75e2f1 100644 --- a/testdata/gopath/src/project/config/default/kustomization.yaml +++ b/testdata/gopath/src/project/config/default/kustomization.yaml @@ -16,7 +16,7 @@ bases: - ../rbac - ../manager -patches: +patchesStrategicMerge: - manager_image_patch.yaml # Protect the /metrics endpoint by putting it behind auth. # Only one of manager_auth_proxy_patch.yaml and diff --git a/testdata/project-v2/config/crd/kustomization.yaml b/testdata/project-v2/config/crd/kustomization.yaml index 63799882c02..df6972356cf 100644 --- a/testdata/project-v2/config/crd/kustomization.yaml +++ b/testdata/project-v2/config/crd/kustomization.yaml @@ -7,7 +7,7 @@ resources: - bases/crew.testproject.org_admirals.yaml # +kubebuilder:scaffold:crdkustomizeresource -patches: +patchesStrategicMerge: # [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-v2/config/default/kustomization.yaml b/testdata/project-v2/config/default/kustomization.yaml index e9edc5e9e4a..82a154aecdf 100644 --- a/testdata/project-v2/config/default/kustomization.yaml +++ b/testdata/project-v2/config/default/kustomization.yaml @@ -21,7 +21,7 @@ bases: # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required. #- ../certmanager -patches: +patchesStrategicMerge: - manager_image_patch.yaml # Protect the /metrics endpoint by putting it behind auth. # Only one of manager_auth_proxy_patch.yaml and