🐛 (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.
kubernetes-sigs · Aug 28, 2023 · 79165fb · 79165fb
1 parent 8824c0a
commit 79165fb
Show file tree

Hide file tree

Showing 27 changed files with 2 additions and 219 deletions.
diff --git a/...nt-config-tutorial/testdata/project/config/crd/patches/cainjection_in_projectconfigs.yaml b/...nt-config-tutorial/testdata/project/config/crd/patches/cainjection_in_projectconfigs.yaml
diff --git a/...ook/src/cronjob-tutorial/testdata/project/config/crd/patches/cainjection_in_cronjobs.yaml b/...ook/src/cronjob-tutorial/testdata/project/config/crd/patches/cainjection_in_cronjobs.yaml
diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/api.go b/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 {

diff --git a/...n/kustomize/v2/scaffolds/internal/templates/config/crd/patches/enablecainjection_patch.go b/...n/kustomize/v2/scaffolds/internal/templates/config/crd/patches/enablecainjection_patch.go
diff --git a/testdata/project-v4-declarative-v1/config/crd/patches/cainjection_in_admirals.yaml b/testdata/project-v4-declarative-v1/config/crd/patches/cainjection_in_admirals.yaml
diff --git a/testdata/project-v4-declarative-v1/config/crd/patches/cainjection_in_captains.yaml b/testdata/project-v4-declarative-v1/config/crd/patches/cainjection_in_captains.yaml
diff --git a/testdata/project-v4-declarative-v1/config/crd/patches/cainjection_in_firstmates.yaml b/testdata/project-v4-declarative-v1/config/crd/patches/cainjection_in_firstmates.yaml
diff --git a/testdata/project-v4-multigroup/api/example.com/v1alpha1/zz_generated.deepcopy.go b/testdata/project-v4-multigroup/api/example.com/v1alpha1/zz_generated.deepcopy.go
diff --git a/testdata/project-v4-multigroup/config/crd/bases/example.com.testproject.org_busyboxes.yaml b/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

diff --git a/testdata/project-v4-multigroup/config/crd/bases/example.com.testproject.org_memcacheds.yaml b/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

diff --git a/testdata/project-v4-multigroup/config/crd/patches/cainjection_in__lakers.yaml b/testdata/project-v4-multigroup/config/crd/patches/cainjection_in__lakers.yaml
diff --git a/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_crew_captains.yaml b/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_crew_captains.yaml
diff --git a/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_example.com_busyboxes.yaml b/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_example.com_busyboxes.yaml
diff --git a/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_example.com_memcacheds.yaml b/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_example.com_memcacheds.yaml
diff --git a/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_fiz_bars.yaml b/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_fiz_bars.yaml
diff --git a/...oject-v4-multigroup/config/crd/patches/cainjection_in_foo.policy_healthcheckpolicies.yaml b/...oject-v4-multigroup/config/crd/patches/cainjection_in_foo.policy_healthcheckpolicies.yaml
diff --git a/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_foo_bars.yaml b/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_foo_bars.yaml
diff --git a/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_sea-creatures_krakens.yaml b/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_sea-creatures_krakens.yaml
diff --git a/...ata/project-v4-multigroup/config/crd/patches/cainjection_in_sea-creatures_leviathans.yaml b/...ata/project-v4-multigroup/config/crd/patches/cainjection_in_sea-creatures_leviathans.yaml
diff --git a/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_ship_cruisers.yaml b/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_ship_cruisers.yaml
diff --git a/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_ship_destroyers.yaml b/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_ship_destroyers.yaml
diff --git a/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_ship_frigates.yaml b/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_ship_frigates.yaml
diff --git a/testdata/project-v4-with-deploy-image/config/crd/patches/cainjection_in_busyboxes.yaml b/testdata/project-v4-with-deploy-image/config/crd/patches/cainjection_in_busyboxes.yaml
diff --git a/testdata/project-v4-with-deploy-image/config/crd/patches/cainjection_in_memcacheds.yaml b/testdata/project-v4-with-deploy-image/config/crd/patches/cainjection_in_memcacheds.yaml
diff --git a/testdata/project-v4/config/crd/patches/cainjection_in_admirales.yaml b/testdata/project-v4/config/crd/patches/cainjection_in_admirales.yaml
diff --git a/testdata/project-v4/config/crd/patches/cainjection_in_captains.yaml b/testdata/project-v4/config/crd/patches/cainjection_in_captains.yaml
diff --git a/testdata/project-v4/config/crd/patches/cainjection_in_firstmates.yaml b/testdata/project-v4/config/crd/patches/cainjection_in_firstmates.yaml