From 1e07665e55af37546a9fd8863b2ecd6aee32a97f Mon Sep 17 00:00:00 2001 From: Tim Myers Date: Fri, 28 May 2021 15:21:52 -0600 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20incorrect=20cert-manager?= =?UTF-8?q?=20kustomize=20comments?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Several comments for enabling cert-manager in the kustomization config incorrectly said `[CERTMANAGER] To enable webhook` This was probably a copy/paste error. --- .../testdata/project/config/crd/kustomization.yaml | 2 +- .../testdata/project/config/crd/kustomization.yaml | 2 +- .../testdata/project/config/crd/kustomization.yaml | 2 +- .../internal/templates/config/crd/kustomization.go | 8 +++++--- .../internal/templates/config/crd/kustomization.go | 8 +++++--- testdata/project-v2-addon/config/crd/kustomization.yaml | 2 +- .../project-v2-multigroup/config/crd/kustomization.yaml | 2 +- testdata/project-v2/config/crd/kustomization.yaml | 2 +- testdata/project-v3-addon/config/crd/kustomization.yaml | 2 +- testdata/project-v3-config/config/crd/kustomization.yaml | 2 +- .../project-v3-multigroup/config/crd/kustomization.yaml | 2 +- testdata/project-v3/config/crd/kustomization.yaml | 2 +- 12 files changed, 20 insertions(+), 16 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 fb5365a0de0..4a84b756660 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 @@ -13,7 +13,7 @@ patchesStrategicMerge: #- patches/webhook_in_projectconfigs.yaml # +kubebuilder:scaffold:crdkustomizewebhookpatch -# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix. +# [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_cronjobs.yaml #- patches/cainjection_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 bcc0a355f28..a249074c742 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 @@ -11,7 +11,7 @@ patchesStrategicMerge: #- patches/webhook_in_cronjobs.yaml #+kubebuilder:scaffold:crdkustomizewebhookpatch -# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix. +# [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_cronjobs.yaml #+kubebuilder:scaffold:crdkustomizecainjectionpatch 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 bcc0a355f28..a249074c742 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 @@ -11,7 +11,7 @@ patchesStrategicMerge: #- patches/webhook_in_cronjobs.yaml #+kubebuilder:scaffold:crdkustomizewebhookpatch -# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix. +# [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_cronjobs.yaml #+kubebuilder:scaffold:crdkustomizecainjectionpatch diff --git a/pkg/plugins/common/kustomize/v1/scaffolds/internal/templates/config/crd/kustomization.go b/pkg/plugins/common/kustomize/v1/scaffolds/internal/templates/config/crd/kustomization.go index 23690588e9f..25fbc18af85 100644 --- a/pkg/plugins/common/kustomize/v1/scaffolds/internal/templates/config/crd/kustomization.go +++ b/pkg/plugins/common/kustomize/v1/scaffolds/internal/templates/config/crd/kustomization.go @@ -23,8 +23,10 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" ) -var _ machinery.Template = &Kustomization{} -var _ machinery.Inserter = &Kustomization{} +var ( + _ machinery.Template = &Kustomization{} + _ machinery.Inserter = &Kustomization{} +) // Kustomization scaffolds a file that defines the kustomization scheme for the crd folder type Kustomization struct { @@ -113,7 +115,7 @@ patchesStrategicMerge: # patches here are for enabling the conversion webhook for each CRD %s -# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix. +# [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix. # patches here are for enabling the CA injection for each CRD %s diff --git a/pkg/plugins/golang/v2/scaffolds/internal/templates/config/crd/kustomization.go b/pkg/plugins/golang/v2/scaffolds/internal/templates/config/crd/kustomization.go index 37ec7556cb1..c0e20efdf8e 100644 --- a/pkg/plugins/golang/v2/scaffolds/internal/templates/config/crd/kustomization.go +++ b/pkg/plugins/golang/v2/scaffolds/internal/templates/config/crd/kustomization.go @@ -23,8 +23,10 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" ) -var _ machinery.Template = &Kustomization{} -var _ machinery.Inserter = &Kustomization{} +var ( + _ machinery.Template = &Kustomization{} + _ machinery.Inserter = &Kustomization{} +) // Kustomization scaffolds a file that defines the kustomization scheme for the crd folder type Kustomization struct { @@ -113,7 +115,7 @@ patchesStrategicMerge: # patches here are for enabling the conversion webhook for each CRD %s -# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix. +# [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix. # patches here are for enabling the CA injection for each CRD %s diff --git a/testdata/project-v2-addon/config/crd/kustomization.yaml b/testdata/project-v2-addon/config/crd/kustomization.yaml index 481fe329551..37c36ffdebd 100644 --- a/testdata/project-v2-addon/config/crd/kustomization.yaml +++ b/testdata/project-v2-addon/config/crd/kustomization.yaml @@ -15,7 +15,7 @@ patchesStrategicMerge: #- patches/webhook_in_admirals.yaml #+kubebuilder:scaffold:crdkustomizewebhookpatch -# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix. +# [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_captains.yaml #- patches/cainjection_in_firstmates.yaml diff --git a/testdata/project-v2-multigroup/config/crd/kustomization.yaml b/testdata/project-v2-multigroup/config/crd/kustomization.yaml index 7bd93cabd45..9857ccc8d2f 100644 --- a/testdata/project-v2-multigroup/config/crd/kustomization.yaml +++ b/testdata/project-v2-multigroup/config/crd/kustomization.yaml @@ -23,7 +23,7 @@ patchesStrategicMerge: #- patches/webhook_in_healthcheckpolicies.yaml #+kubebuilder:scaffold:crdkustomizewebhookpatch -# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix. +# [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_captains.yaml #- patches/cainjection_in_frigates.yaml diff --git a/testdata/project-v2/config/crd/kustomization.yaml b/testdata/project-v2/config/crd/kustomization.yaml index 481fe329551..37c36ffdebd 100644 --- a/testdata/project-v2/config/crd/kustomization.yaml +++ b/testdata/project-v2/config/crd/kustomization.yaml @@ -15,7 +15,7 @@ patchesStrategicMerge: #- patches/webhook_in_admirals.yaml #+kubebuilder:scaffold:crdkustomizewebhookpatch -# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix. +# [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_captains.yaml #- patches/cainjection_in_firstmates.yaml diff --git a/testdata/project-v3-addon/config/crd/kustomization.yaml b/testdata/project-v3-addon/config/crd/kustomization.yaml index 481fe329551..37c36ffdebd 100644 --- a/testdata/project-v3-addon/config/crd/kustomization.yaml +++ b/testdata/project-v3-addon/config/crd/kustomization.yaml @@ -15,7 +15,7 @@ patchesStrategicMerge: #- patches/webhook_in_admirals.yaml #+kubebuilder:scaffold:crdkustomizewebhookpatch -# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix. +# [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_captains.yaml #- patches/cainjection_in_firstmates.yaml diff --git a/testdata/project-v3-config/config/crd/kustomization.yaml b/testdata/project-v3-config/config/crd/kustomization.yaml index 481fe329551..37c36ffdebd 100644 --- a/testdata/project-v3-config/config/crd/kustomization.yaml +++ b/testdata/project-v3-config/config/crd/kustomization.yaml @@ -15,7 +15,7 @@ patchesStrategicMerge: #- patches/webhook_in_admirals.yaml #+kubebuilder:scaffold:crdkustomizewebhookpatch -# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix. +# [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_captains.yaml #- patches/cainjection_in_firstmates.yaml diff --git a/testdata/project-v3-multigroup/config/crd/kustomization.yaml b/testdata/project-v3-multigroup/config/crd/kustomization.yaml index 1d639a6bece..23b9a6c97df 100644 --- a/testdata/project-v3-multigroup/config/crd/kustomization.yaml +++ b/testdata/project-v3-multigroup/config/crd/kustomization.yaml @@ -25,7 +25,7 @@ patchesStrategicMerge: #- patches/webhook_in_lakers.yaml #+kubebuilder:scaffold:crdkustomizewebhookpatch -# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix. +# [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_captains.yaml #- patches/cainjection_in_frigates.yaml diff --git a/testdata/project-v3/config/crd/kustomization.yaml b/testdata/project-v3/config/crd/kustomization.yaml index 61dcc48c5e5..0d38144170a 100644 --- a/testdata/project-v3/config/crd/kustomization.yaml +++ b/testdata/project-v3/config/crd/kustomization.yaml @@ -15,7 +15,7 @@ patchesStrategicMerge: #- patches/webhook_in_admirales.yaml #+kubebuilder:scaffold:crdkustomizewebhookpatch -# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix. +# [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_captains.yaml #- patches/cainjection_in_firstmates.yaml