🐛 Fix the webhookcainjection_patch.yaml file creation from init proje…

…ct to webhook creation
kubernetes-sigs · Oct 19, 2020 · ab3f59d · ab3f59d
1 parent c993a2a
commit ab3f59d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 18 deletions.
diff --git a/pkg/plugin/v2/scaffolds/internal/templates/webhook/enablecainection_patch.go b/pkg/plugin/v2/scaffolds/internal/templates/webhook/enablecainection_patch.go
@@ -37,7 +37,8 @@ func (f *InjectCAPatch) SetTemplateDefaults() error {
 
 	f.TemplateBody = injectCAPatchTemplate
 
-	f.IfExistsAction = file.Error
+	// If file webhookcainjection_patch.yaml exist, skip its creation
+	f.IfExistsAction = file.Skip
 
 	return nil
 }

diff --git a/pkg/plugin/v3/scaffolds/init.go b/pkg/plugin/v3/scaffolds/init.go
@@ -126,7 +126,6 @@ func (s *initScaffolder) scaffold() error {
 		&webhook.Kustomization{},
 		&webhook.KustomizeConfigWebhook{},
 		&webhook.Service{},
-		&kdefault.InjectCAPatch{},
 		&prometheus.Kustomization{},
 		&prometheus.ServiceMonitor{},
 		&certmanager.CertManager{},

diff --git a/pkg/plugin/v3/scaffolds/internal/templates/config/kdefault/enablecainection_patch.go b/pkg/plugin/v3/scaffolds/internal/templates/config/kdefault/enablecainection_patch.go
@@ -37,7 +37,8 @@ func (f *InjectCAPatch) SetTemplateDefaults() error {
 
 	f.TemplateBody = injectCAPatchTemplate
 
-	f.IfExistsAction = file.Error
+	// If file webhookcainjection_patch.yaml exist, skip its creation
+	f.IfExistsAction = file.Skip
 
 	return nil
 }

diff --git a/pkg/plugin/v3/scaffolds/webhook.go b/pkg/plugin/v3/scaffolds/webhook.go
@@ -19,6 +19,8 @@ package scaffolds
 import (
 	"fmt"
 
+	"sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/config/kdefault"
+
 	"sigs.k8s.io/kubebuilder/pkg/model"
 	"sigs.k8s.io/kubebuilder/pkg/model/config"
 	"sigs.k8s.io/kubebuilder/pkg/model/resource"
@@ -82,6 +84,7 @@ You need to implement the conversion.Hub and conversion.Convertible interfaces f
 		s.newUniverse(),
 		&api.Webhook{Defaulting: s.defaulting, Validating: s.validation},
 		&templates.MainUpdater{WireWebhook: true},
+		&kdefault.InjectCAPatch{},
 	); err != nil {
 		return err
 	}

diff --git a/testdata/project-v3-addon/config/default/webhookcainjection_patch.yaml b/testdata/project-v3-addon/config/default/webhookcainjection_patch.yaml