Merge pull request #2111 from camilamacedo86/fix-certmanager

🐛 do not generate the cert-manager directory by default.
kubernetes-sigs · Mar 25, 2021 · b828d86 · b828d86
2 parents 825b347 + beecada
commit b828d86
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 50 deletions.
diff --git a/pkg/plugins/golang/v3/scaffolds/init.go b/pkg/plugins/golang/v3/scaffolds/init.go
@@ -25,7 +25,6 @@ import (
 	"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds/internal/templates"
-	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds/internal/templates/config/certmanager"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds/internal/templates/config/kdefault"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds/internal/templates/config/manager"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds/internal/templates/config/prometheus"
@@ -132,8 +131,5 @@ func (s *initScaffolder) Scaffold() error {
 		&kdefault.ManagerConfigPatch{},
 		&prometheus.Kustomization{},
 		&prometheus.Monitor{},
-		&certmanager.Certificate{},
-		&certmanager.Kustomization{},
-		&certmanager.KustomizeConfig{},
 	)
 }
diff --git a/pkg/plugins/golang/v3/scaffolds/internal/templates/config/certmanager/certificate.go b/pkg/plugins/golang/v3/scaffolds/internal/templates/config/certmanager/certificate.go
@@ -37,6 +37,9 @@ func (f *Certificate) SetTemplateDefaults() error {
 
 	f.TemplateBody = certManagerTemplate
 
+	// If file exists (ex. because a webhook was already created), skip creation.
+	f.IfExistsAction = machinery.SkipFile
+
 	return nil
 }
 

diff --git a/pkg/plugins/golang/v3/scaffolds/internal/templates/config/certmanager/kustomization.go b/pkg/plugins/golang/v3/scaffolds/internal/templates/config/certmanager/kustomization.go
@@ -37,6 +37,9 @@ func (f *Kustomization) SetTemplateDefaults() error {
 
 	f.TemplateBody = kustomizationTemplate
 
+	// If file exists (ex. because a webhook was already created), skip creation.
+	f.IfExistsAction = machinery.SkipFile
+
 	return nil
 }
 

diff --git a/pkg/plugins/golang/v3/scaffolds/internal/templates/config/certmanager/kustomizeconfig.go b/pkg/plugins/golang/v3/scaffolds/internal/templates/config/certmanager/kustomizeconfig.go
@@ -37,6 +37,9 @@ func (f *KustomizeConfig) SetTemplateDefaults() error {
 
 	f.TemplateBody = kustomizeConfigTemplate
 
+	// If file exists (ex. because a webhook was already created), skip creation.
+	f.IfExistsAction = machinery.SkipFile
+
 	return nil
 }
 

diff --git a/pkg/plugins/golang/v3/scaffolds/webhook.go b/pkg/plugins/golang/v3/scaffolds/webhook.go
@@ -27,6 +27,7 @@ import (
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds/internal/templates"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds/internal/templates/api"
+	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds/internal/templates/config/certmanager"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds/internal/templates/config/kdefault"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds/internal/templates/config/webhook"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds/internal/templates/hack"
@@ -93,6 +94,9 @@ func (s *webhookScaffolder) Scaffold() error {
 		&webhook.Kustomization{Force: s.force},
 		&webhook.KustomizeConfig{},
 		&webhook.Service{},
+		&certmanager.Certificate{},
+		&certmanager.Kustomization{},
+		&certmanager.KustomizeConfig{},
 	); err != nil {
 		return err
 	}

diff --git a/testdata/project-v3-addon/config/certmanager/certificate.yaml b/testdata/project-v3-addon/config/certmanager/certificate.yaml
diff --git a/testdata/project-v3-addon/config/certmanager/kustomization.yaml b/testdata/project-v3-addon/config/certmanager/kustomization.yaml
diff --git a/testdata/project-v3-addon/config/certmanager/kustomizeconfig.yaml b/testdata/project-v3-addon/config/certmanager/kustomizeconfig.yaml