Skip to content

🐛 do not generate the cert-manager directory by default. #2111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 25, 2021
Merged

🐛 do not generate the cert-manager directory by default. #2111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
🐛 do not generate the cert-manager directory by default.
  • Loading branch information
@camilamacedo86
camilamacedo86 committed Mar 25, 2021
commit beecada05f59f40c88a9edd5d04007d46b9e919a
4 changes: 0 additions & 4 deletions pkg/plugins/golang/v3/scaffolds/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -132,8 +131,5 @@ func (s *initScaffolder) Scaffold() error {
&kdefault.ManagerConfigPatch{},
&prometheus.Kustomization{},
&prometheus.Monitor{},
&certmanager.Certificate{},
&certmanager.Kustomization{},
&certmanager.KustomizeConfig{},
)
}
3 changes: 3 additions & 0 deletions pkg/plugins/golang/v3/scaffolds/internal/templates/config/certmanager/certificate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
3 changes: 3 additions & 0 deletions pkg/plugins/golang/v3/scaffolds/internal/templates/config/certmanager/kustomization.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
3 changes: 3 additions & 0 deletions pkg/plugins/golang/v3/scaffolds/internal/templates/config/certmanager/kustomizeconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
4 changes: 4 additions & 0 deletions pkg/plugins/golang/v3/scaffolds/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
25 changes: 0 additions & 25 deletions testdata/project-v3-addon/config/certmanager/certificate.yaml
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions testdata/project-v3-addon/config/certmanager/kustomization.yaml
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions testdata/project-v3-addon/config/certmanager/kustomizeconfig.yaml
View file
Open in desktop

This file was deleted.