🐛 (kustomize/v2, go/v4): Stop scafold CA injection

The CA injection annotation is now unnecessary since switching from vars
to replacements in the kustomization. The replacements have "create:
true" which means that they will add the annotation if it is not already
there, hence the patch is not needed.

docs/book/src/component-config-tutorial/testdata/project/config/crd/kustomization.yaml

@@ -11,11 +11,6 @@ patches:
 #- path: patches/webhook_in_projectconfigs.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
-#- path: patches/cainjection_in_projectconfigs.yaml
-#+kubebuilder:scaffold:crdkustomizecainjectionpatch
-
 # the following config is for teaching kustomize how to do kustomization for CRDs.
 configurations:
 - kustomizeconfig.yaml

docs/book/src/cronjob-tutorial/testdata/project/config/crd/kustomization.yaml

@@ -11,11 +11,6 @@ patches:
 - path: patches/webhook_in_cronjobs.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
-- path: patches/cainjection_in_cronjobs.yaml
-#+kubebuilder:scaffold:crdkustomizecainjectionpatch
-
 # the following config is for teaching kustomize how to do kustomization for CRDs.
 configurations:
 - kustomizeconfig.yaml

hack/docs/internal/cronjob-tutorial/generate_cronjob.go

@@ -586,11 +586,6 @@ func updateKustomization(sp *Sample) {
 		filepath.Join(sp.ctx.Dir, "config/crd/kustomization.yaml"),
 		`#- path: patches/webhook_in_cronjobs.yaml`, `#`)
 	CheckError("fixing crd/kustomization", err)
-
-	err = pluginutil.UncommentCode(
-		filepath.Join(sp.ctx.Dir, "config/crd/kustomization.yaml"),
-		`#- path: patches/cainjection_in_cronjobs.yaml`, `#`)
-	CheckError("fixing crd/kustomization", err)
 }
 
 func updateExample(sp *Sample) {

pkg/plugins/common/kustomize/v2/scaffolds/api.go

@@ -75,7 +75,6 @@ func (s *apiScaffolder) Scaffold() error {
 			&rbac.CRDEditorRole{},
 			&rbac.CRDViewerRole{},
 			&patches.EnableWebhookPatch{},
-			&patches.EnableCAInjectionPatch{},
 			&crd.Kustomization{},
 			&crd.KustomizeConfig{},
 		); err != nil {

pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomization.go

@@ -44,33 +44,28 @@ func (f *Kustomization) SetTemplateDefaults() error {
 	f.TemplateBody = fmt.Sprintf(kustomizationTemplate,
 		machinery.NewMarkerFor(f.Path, resourceMarker),
 		machinery.NewMarkerFor(f.Path, webhookPatchMarker),
-		machinery.NewMarkerFor(f.Path, caInjectionPatchMarker),
 	)
 
 	return nil
 }
 
 const (
-	resourceMarker         = "crdkustomizeresource"
-	webhookPatchMarker     = "crdkustomizewebhookpatch"
-	caInjectionPatchMarker = "crdkustomizecainjectionpatch"
+	resourceMarker     = "crdkustomizeresource"
+	webhookPatchMarker = "crdkustomizewebhookpatch"
 )
 
 // GetMarkers implements file.Inserter
 func (f *Kustomization) GetMarkers() []machinery.Marker {
 	return []machinery.Marker{
 		machinery.NewMarkerFor(f.Path, resourceMarker),
 		machinery.NewMarkerFor(f.Path, webhookPatchMarker),
-		machinery.NewMarkerFor(f.Path, caInjectionPatchMarker),
 	}
 }
 
 const (
 	resourceCodeFragment = `- bases/%s_%s.yaml
 `
 	webhookPatchCodeFragment = `#- path: patches/webhook_in_%s.yaml
-`
-	caInjectionPatchCodeFragment = `#- path: patches/cainjection_in_%s.yaml
 `
 )
 
@@ -86,20 +81,13 @@ func (f *Kustomization) GetCodeFragments() machinery.CodeFragmentsMap {
 	webhookPatch := make([]string, 0)
 	webhookPatch = append(webhookPatch, fmt.Sprintf(webhookPatchCodeFragment, f.Resource.Plural))
 
-	// Generate resource code fragments
-	caInjectionPatch := make([]string, 0)
-	caInjectionPatch = append(caInjectionPatch, fmt.Sprintf(caInjectionPatchCodeFragment, f.Resource.Plural))
-
 	// Only store code fragments in the map if the slices are non-empty
 	if len(res) != 0 {
 		fragments[machinery.NewMarkerFor(f.Path, resourceMarker)] = res
 	}
 	if len(webhookPatch) != 0 {
 		fragments[machinery.NewMarkerFor(f.Path, webhookPatchMarker)] = webhookPatch
 	}
-	if len(caInjectionPatch) != 0 {
-		fragments[machinery.NewMarkerFor(f.Path, caInjectionPatchMarker)] = caInjectionPatch
-	}
 
 	return fragments
 }
@@ -115,10 +103,6 @@ patches:
 # patches here are for enabling the conversion webhook for each CRD
 %s
 
-# [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
-# patches here are for enabling the CA injection for each CRD
-%s
-
 # the following config is for teaching kustomize how to do kustomization for CRDs.
 configurations:
 - kustomizeconfig.yaml

testdata/project-v4-declarative-v1/config/crd/kustomization.yaml

@@ -15,13 +15,6 @@ patches:
 #- path: patches/webhook_in_admirals.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
-#- path: patches/cainjection_in_captains.yaml
-#- path: patches/cainjection_in_firstmates.yaml
-#- path: patches/cainjection_in_admirals.yaml
-#+kubebuilder:scaffold:crdkustomizecainjectionpatch
-
 # the following config is for teaching kustomize how to do kustomization for CRDs.
 configurations:
 - kustomizeconfig.yaml

testdata/project-v4-multigroup/config/crd/bases/example.com.testproject.org_busyboxes.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: busyboxes.example.com.testproject.org
 spec:
   group: example.com.testproject.org

testdata/project-v4-multigroup/config/crd/bases/example.com.testproject.org_memcacheds.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: memcacheds.example.com.testproject.org
 spec:
   group: example.com.testproject.org

testdata/project-v4-multigroup/config/crd/kustomization.yaml

@@ -32,21 +32,6 @@ patches:
 #- path: patches/webhook_in_busyboxes.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
-#- path: patches/cainjection_in_captains.yaml
-#- path: patches/cainjection_in_frigates.yaml
-#- path: patches/cainjection_in_destroyers.yaml
-#- path: patches/cainjection_in_cruisers.yaml
-#- path: patches/cainjection_in_krakens.yaml
-#- path: patches/cainjection_in_leviathans.yaml
-#- path: patches/cainjection_in_healthcheckpolicies.yaml
-#- path: patches/cainjection_in_bars.yaml
-#- path: patches/cainjection_in_lakers.yaml
-#- path: patches/cainjection_in_memcacheds.yaml
-#- path: patches/cainjection_in_busyboxes.yaml
-#+kubebuilder:scaffold:crdkustomizecainjectionpatch
-
 # the following config is for teaching kustomize how to do kustomization for CRDs.
 configurations:
 - kustomizeconfig.yaml

testdata/project-v4-with-deploy-image/config/crd/kustomization.yaml

@@ -13,12 +13,6 @@ patches:
 #- path: patches/webhook_in_busyboxes.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
-#- path: patches/cainjection_in_memcacheds.yaml
-#- path: patches/cainjection_in_busyboxes.yaml
-#+kubebuilder:scaffold:crdkustomizecainjectionpatch
-
 # the following config is for teaching kustomize how to do kustomization for CRDs.
 configurations:
 - kustomizeconfig.yaml