diff --git a/pkg/plugin/v3/scaffolds/api.go b/pkg/plugin/v3/scaffolds/api.go index 7a954d4bd96..a6c86cdd320 100644 --- a/pkg/plugin/v3/scaffolds/api.go +++ b/pkg/plugin/v3/scaffolds/api.go @@ -25,8 +25,11 @@ import ( "sigs.k8s.io/kubebuilder/pkg/plugin/internal/machinery" "sigs.k8s.io/kubebuilder/pkg/plugin/scaffold" "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates" - "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/controller" - "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/crd" + "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/config/api" + "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/config/controller" + "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/config/crd" + "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/config/rbac" + "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/config/samples" ) var _ scaffold.Scaffolder = &apiScaffolder{} @@ -84,11 +87,11 @@ func (s *apiScaffolder) scaffold() error { if err := machinery.NewScaffold(s.plugins...).Execute( s.newUniverse(), - &templates.Types{}, - &templates.Group{}, - &templates.CRDSample{}, - &templates.CRDEditorRole{}, - &templates.CRDViewerRole{}, + &api.Types{}, + &api.Group{}, + &samples.CRDSample{}, + &rbac.CRDEditorRole{}, + &rbac.CRDViewerRole{}, &crd.EnableWebhookPatch{}, &crd.EnableCAInjectionPatch{}, ); err != nil { diff --git a/pkg/plugin/v3/scaffolds/init.go b/pkg/plugin/v3/scaffolds/init.go index 7ea614e98c8..cd9b0b9dde3 100644 --- a/pkg/plugin/v3/scaffolds/init.go +++ b/pkg/plugin/v3/scaffolds/init.go @@ -26,11 +26,13 @@ import ( "sigs.k8s.io/kubebuilder/pkg/plugin/internal/machinery" "sigs.k8s.io/kubebuilder/pkg/plugin/scaffold" "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates" - "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/certmanager" - "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/manager" - "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/metricsauth" - "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/prometheus" - "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/webhook" + "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/config/certmanager" + "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/config/hack" + "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/config/kdefault" + "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/config/manager" + "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/config/prometheus" + "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/config/rbac" + "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/config/webhook" ) const ( @@ -78,7 +80,7 @@ func (s *initScaffolder) Scaffold() error { // TODO: re-use universe created by s.newUniverse() if possible. func (s *initScaffolder) scaffold() error { - bpFile := &templates.Boilerplate{} + bpFile := &hack.Boilerplate{} bpFile.Path = s.boilerplatePath bpFile.License = s.license bpFile.Owner = s.owner @@ -97,11 +99,11 @@ func (s *initScaffolder) scaffold() error { return machinery.NewScaffold().Execute( s.newUniverse(string(boilerplate)), &templates.GitIgnore{}, - &templates.AuthProxyRole{}, - &templates.AuthProxyRoleBinding{}, - &metricsauth.AuthProxyPatch{}, - &metricsauth.AuthProxyService{}, - &metricsauth.ClientClusterRole{}, + &rbac.AuthProxyRole{}, + &rbac.AuthProxyRoleBinding{}, + &kdefault.AuthProxyPatch{}, + &rbac.AuthProxyService{}, + &rbac.ClientClusterRole{}, &manager.Config{Image: imageName}, &templates.Main{}, &templates.GoMod{ControllerRuntimeVersion: ControllerRuntimeVersion}, @@ -113,17 +115,17 @@ func (s *initScaffolder) scaffold() error { }, &templates.Dockerfile{}, &templates.DockerignoreFile{}, - &templates.Kustomize{}, - &templates.ManagerWebhookPatch{}, - &templates.ManagerRoleBinding{}, - &templates.LeaderElectionRole{}, - &templates.LeaderElectionRoleBinding{}, - &templates.KustomizeRBAC{}, + &kdefault.Kustomize{}, + &kdefault.ManagerWebhookPatch{}, + &rbac.ManagerRoleBinding{}, + &rbac.LeaderElectionRole{}, + &rbac.LeaderElectionRoleBinding{}, + &rbac.KustomizeRBAC{}, &manager.Kustomization{}, &webhook.Kustomization{}, &webhook.KustomizeConfigWebhook{}, &webhook.Service{}, - &webhook.InjectCAPatch{}, + &kdefault.InjectCAPatch{}, &prometheus.Kustomization{}, &prometheus.ServiceMonitor{}, &certmanager.CertManager{}, diff --git a/pkg/plugin/v3/scaffolds/internal/templates/group.go b/pkg/plugin/v3/scaffolds/internal/templates/config/api/group.go similarity index 99% rename from pkg/plugin/v3/scaffolds/internal/templates/group.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/api/group.go index 6d699b84139..3c019b80004 100644 --- a/pkg/plugin/v3/scaffolds/internal/templates/group.go +++ b/pkg/plugin/v3/scaffolds/internal/templates/config/api/group.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package templates +package api import ( "path/filepath" diff --git a/pkg/plugin/v3/scaffolds/internal/templates/types.go b/pkg/plugin/v3/scaffolds/internal/templates/config/api/types.go similarity index 99% rename from pkg/plugin/v3/scaffolds/internal/templates/types.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/api/types.go index 80294b0d1b3..aff013bfdaf 100644 --- a/pkg/plugin/v3/scaffolds/internal/templates/types.go +++ b/pkg/plugin/v3/scaffolds/internal/templates/config/api/types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package templates +package api import ( "fmt" diff --git a/pkg/plugin/v3/scaffolds/internal/templates/webhook/webhook.go b/pkg/plugin/v3/scaffolds/internal/templates/config/api/webhook.go similarity index 99% rename from pkg/plugin/v3/scaffolds/internal/templates/webhook/webhook.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/api/webhook.go index d697319bd05..6d2bf672314 100644 --- a/pkg/plugin/v3/scaffolds/internal/templates/webhook/webhook.go +++ b/pkg/plugin/v3/scaffolds/internal/templates/config/api/webhook.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package webhook +package api import ( "fmt" diff --git a/pkg/plugin/v3/scaffolds/internal/templates/certmanager/certificate.go b/pkg/plugin/v3/scaffolds/internal/templates/config/certmanager/certificate.go similarity index 100% rename from pkg/plugin/v3/scaffolds/internal/templates/certmanager/certificate.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/certmanager/certificate.go diff --git a/pkg/plugin/v3/scaffolds/internal/templates/certmanager/kustomize.go b/pkg/plugin/v3/scaffolds/internal/templates/config/certmanager/kustomize.go similarity index 100% rename from pkg/plugin/v3/scaffolds/internal/templates/certmanager/kustomize.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/certmanager/kustomize.go diff --git a/pkg/plugin/v3/scaffolds/internal/templates/certmanager/kustomizeconfig.go b/pkg/plugin/v3/scaffolds/internal/templates/config/certmanager/kustomizeconfig.go similarity index 100% rename from pkg/plugin/v3/scaffolds/internal/templates/certmanager/kustomizeconfig.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/certmanager/kustomizeconfig.go diff --git a/pkg/plugin/v3/scaffolds/internal/templates/controller/controller.go b/pkg/plugin/v3/scaffolds/internal/templates/config/controller/controller.go similarity index 100% rename from pkg/plugin/v3/scaffolds/internal/templates/controller/controller.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/controller/controller.go diff --git a/pkg/plugin/v3/scaffolds/internal/templates/controller/controller_suitetest.go b/pkg/plugin/v3/scaffolds/internal/templates/config/controller/controller_suitetest.go similarity index 100% rename from pkg/plugin/v3/scaffolds/internal/templates/controller/controller_suitetest.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/controller/controller_suitetest.go diff --git a/pkg/plugin/v3/scaffolds/internal/templates/crd/enablecainjection_patch.go b/pkg/plugin/v3/scaffolds/internal/templates/config/crd/enablecainjection_patch.go similarity index 100% rename from pkg/plugin/v3/scaffolds/internal/templates/crd/enablecainjection_patch.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/crd/enablecainjection_patch.go diff --git a/pkg/plugin/v3/scaffolds/internal/templates/crd/enablewebhook_patch.go b/pkg/plugin/v3/scaffolds/internal/templates/config/crd/enablewebhook_patch.go similarity index 100% rename from pkg/plugin/v3/scaffolds/internal/templates/crd/enablewebhook_patch.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/crd/enablewebhook_patch.go diff --git a/pkg/plugin/v3/scaffolds/internal/templates/crd/kustomization.go b/pkg/plugin/v3/scaffolds/internal/templates/config/crd/kustomization.go similarity index 100% rename from pkg/plugin/v3/scaffolds/internal/templates/crd/kustomization.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/crd/kustomization.go diff --git a/pkg/plugin/v3/scaffolds/internal/templates/crd/kustomizeconfig.go b/pkg/plugin/v3/scaffolds/internal/templates/config/crd/kustomizeconfig.go similarity index 100% rename from pkg/plugin/v3/scaffolds/internal/templates/crd/kustomizeconfig.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/crd/kustomizeconfig.go diff --git a/pkg/plugin/v3/scaffolds/internal/templates/boilerplate.go b/pkg/plugin/v3/scaffolds/internal/templates/config/hack/boilerplate.go similarity index 99% rename from pkg/plugin/v3/scaffolds/internal/templates/boilerplate.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/hack/boilerplate.go index 63a2dba4d68..4518c1587d7 100644 --- a/pkg/plugin/v3/scaffolds/internal/templates/boilerplate.go +++ b/pkg/plugin/v3/scaffolds/internal/templates/config/hack/boilerplate.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package templates +package hack import ( "fmt" diff --git a/pkg/plugin/v3/scaffolds/internal/templates/metricsauth/auth_proxy_patch.go b/pkg/plugin/v3/scaffolds/internal/templates/config/kdefault/auth_proxy_patch.go similarity index 98% rename from pkg/plugin/v3/scaffolds/internal/templates/metricsauth/auth_proxy_patch.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/kdefault/auth_proxy_patch.go index a08371ae87d..4126549ece8 100644 --- a/pkg/plugin/v3/scaffolds/internal/templates/metricsauth/auth_proxy_patch.go +++ b/pkg/plugin/v3/scaffolds/internal/templates/config/kdefault/auth_proxy_patch.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package metricsauth +package kdefault import ( "path/filepath" diff --git a/pkg/plugin/v3/scaffolds/internal/templates/webhook/enablecainection_patch.go b/pkg/plugin/v3/scaffolds/internal/templates/config/kdefault/enablecainection_patch.go similarity index 99% rename from pkg/plugin/v3/scaffolds/internal/templates/webhook/enablecainection_patch.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/kdefault/enablecainection_patch.go index 6ce41f585ef..2e69e629972 100644 --- a/pkg/plugin/v3/scaffolds/internal/templates/webhook/enablecainection_patch.go +++ b/pkg/plugin/v3/scaffolds/internal/templates/config/kdefault/enablecainection_patch.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package webhook +package kdefault import ( "path/filepath" diff --git a/pkg/plugin/v3/scaffolds/internal/templates/kustomize.go b/pkg/plugin/v3/scaffolds/internal/templates/config/kdefault/kustomize.go similarity index 99% rename from pkg/plugin/v3/scaffolds/internal/templates/kustomize.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/kdefault/kustomize.go index 00febf5360d..b40d18444c6 100644 --- a/pkg/plugin/v3/scaffolds/internal/templates/kustomize.go +++ b/pkg/plugin/v3/scaffolds/internal/templates/config/kdefault/kustomize.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package templates +package kdefault import ( "path/filepath" diff --git a/pkg/plugin/v3/scaffolds/internal/templates/webhook_manager_patch.go b/pkg/plugin/v3/scaffolds/internal/templates/config/kdefault/webhook_manager_patch.go similarity index 98% rename from pkg/plugin/v3/scaffolds/internal/templates/webhook_manager_patch.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/kdefault/webhook_manager_patch.go index b9ab065da50..0de1a777302 100644 --- a/pkg/plugin/v3/scaffolds/internal/templates/webhook_manager_patch.go +++ b/pkg/plugin/v3/scaffolds/internal/templates/config/kdefault/webhook_manager_patch.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package templates +package kdefault import ( "path/filepath" diff --git a/pkg/plugin/v3/scaffolds/internal/templates/manager/config.go b/pkg/plugin/v3/scaffolds/internal/templates/config/manager/config.go similarity index 100% rename from pkg/plugin/v3/scaffolds/internal/templates/manager/config.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/manager/config.go diff --git a/pkg/plugin/v3/scaffolds/internal/templates/manager/kustomization.go b/pkg/plugin/v3/scaffolds/internal/templates/config/manager/kustomization.go similarity index 100% rename from pkg/plugin/v3/scaffolds/internal/templates/manager/kustomization.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/manager/kustomization.go diff --git a/pkg/plugin/v3/scaffolds/internal/templates/prometheus/kustomize.go b/pkg/plugin/v3/scaffolds/internal/templates/config/prometheus/kustomize.go similarity index 100% rename from pkg/plugin/v3/scaffolds/internal/templates/prometheus/kustomize.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/prometheus/kustomize.go diff --git a/pkg/plugin/v3/scaffolds/internal/templates/prometheus/monitor.go b/pkg/plugin/v3/scaffolds/internal/templates/config/prometheus/monitor.go similarity index 100% rename from pkg/plugin/v3/scaffolds/internal/templates/prometheus/monitor.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/prometheus/monitor.go diff --git a/pkg/plugin/v3/scaffolds/internal/templates/authproxyrole.go b/pkg/plugin/v3/scaffolds/internal/templates/config/rbac/auth_proxy_role.go similarity index 98% rename from pkg/plugin/v3/scaffolds/internal/templates/authproxyrole.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/rbac/auth_proxy_role.go index 8b4a9193dc7..bed14a4cce1 100644 --- a/pkg/plugin/v3/scaffolds/internal/templates/authproxyrole.go +++ b/pkg/plugin/v3/scaffolds/internal/templates/config/rbac/auth_proxy_role.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package templates +package rbac import ( "path/filepath" diff --git a/pkg/plugin/v3/scaffolds/internal/templates/authproxyrolebinding.go b/pkg/plugin/v3/scaffolds/internal/templates/config/rbac/auth_proxy_rolebinding.go similarity index 98% rename from pkg/plugin/v3/scaffolds/internal/templates/authproxyrolebinding.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/rbac/auth_proxy_rolebinding.go index a65c7dd4e1e..244a99b567d 100644 --- a/pkg/plugin/v3/scaffolds/internal/templates/authproxyrolebinding.go +++ b/pkg/plugin/v3/scaffolds/internal/templates/config/rbac/auth_proxy_rolebinding.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package templates +package rbac import ( "path/filepath" diff --git a/pkg/plugin/v3/scaffolds/internal/templates/metricsauth/authproxyservice.go b/pkg/plugin/v3/scaffolds/internal/templates/config/rbac/auth_proxy_service.go similarity index 98% rename from pkg/plugin/v3/scaffolds/internal/templates/metricsauth/authproxyservice.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/rbac/auth_proxy_service.go index a35c836dba1..6005f44de7a 100644 --- a/pkg/plugin/v3/scaffolds/internal/templates/metricsauth/authproxyservice.go +++ b/pkg/plugin/v3/scaffolds/internal/templates/config/rbac/auth_proxy_service.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package metricsauth +package rbac import ( "path/filepath" diff --git a/pkg/plugin/v3/scaffolds/internal/templates/metricsauth/clientclusterrole.go b/pkg/plugin/v3/scaffolds/internal/templates/config/rbac/client_cluster_role.go similarity index 98% rename from pkg/plugin/v3/scaffolds/internal/templates/metricsauth/clientclusterrole.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/rbac/client_cluster_role.go index 114f6f273a0..5a31619ee3e 100644 --- a/pkg/plugin/v3/scaffolds/internal/templates/metricsauth/clientclusterrole.go +++ b/pkg/plugin/v3/scaffolds/internal/templates/config/rbac/client_cluster_role.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package metricsauth +package rbac import ( "path/filepath" diff --git a/pkg/plugin/v3/scaffolds/internal/templates/crd_editor_rbac.go b/pkg/plugin/v3/scaffolds/internal/templates/config/rbac/crd_editor_rbac.go similarity index 98% rename from pkg/plugin/v3/scaffolds/internal/templates/crd_editor_rbac.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/rbac/crd_editor_rbac.go index cb78abf0dfc..b5183e11104 100644 --- a/pkg/plugin/v3/scaffolds/internal/templates/crd_editor_rbac.go +++ b/pkg/plugin/v3/scaffolds/internal/templates/config/rbac/crd_editor_rbac.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package templates +package rbac import ( "path/filepath" diff --git a/pkg/plugin/v3/scaffolds/internal/templates/crd_viewer_rbac.go b/pkg/plugin/v3/scaffolds/internal/templates/config/rbac/crd_viewer_rbac.go similarity index 98% rename from pkg/plugin/v3/scaffolds/internal/templates/crd_viewer_rbac.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/rbac/crd_viewer_rbac.go index 09844e15df8..d47540bbf2a 100644 --- a/pkg/plugin/v3/scaffolds/internal/templates/crd_viewer_rbac.go +++ b/pkg/plugin/v3/scaffolds/internal/templates/config/rbac/crd_viewer_rbac.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package templates +package rbac import ( "path/filepath" diff --git a/pkg/plugin/v3/scaffolds/internal/templates/leaderelectionrole.go b/pkg/plugin/v3/scaffolds/internal/templates/config/rbac/leader_election_role.go similarity index 98% rename from pkg/plugin/v3/scaffolds/internal/templates/leaderelectionrole.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/rbac/leader_election_role.go index 794fbe153da..e3a69238676 100644 --- a/pkg/plugin/v3/scaffolds/internal/templates/leaderelectionrole.go +++ b/pkg/plugin/v3/scaffolds/internal/templates/config/rbac/leader_election_role.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package templates +package rbac import ( "path/filepath" diff --git a/pkg/plugin/v3/scaffolds/internal/templates/leaderelectionrolebinding.go b/pkg/plugin/v3/scaffolds/internal/templates/config/rbac/leader_election_rolebinding.go similarity index 98% rename from pkg/plugin/v3/scaffolds/internal/templates/leaderelectionrolebinding.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/rbac/leader_election_rolebinding.go index dd6b1eb7a9d..a9cbf8c48b7 100644 --- a/pkg/plugin/v3/scaffolds/internal/templates/leaderelectionrolebinding.go +++ b/pkg/plugin/v3/scaffolds/internal/templates/config/rbac/leader_election_rolebinding.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package templates +package rbac import ( "path/filepath" diff --git a/pkg/plugin/v3/scaffolds/internal/templates/mgrrolebinding.go b/pkg/plugin/v3/scaffolds/internal/templates/config/rbac/manager_role_binding.go similarity index 98% rename from pkg/plugin/v3/scaffolds/internal/templates/mgrrolebinding.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/rbac/manager_role_binding.go index 213fbd7f3c3..bd4b336bb80 100644 --- a/pkg/plugin/v3/scaffolds/internal/templates/mgrrolebinding.go +++ b/pkg/plugin/v3/scaffolds/internal/templates/config/rbac/manager_role_binding.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package templates +package rbac import ( "path/filepath" diff --git a/pkg/plugin/v3/scaffolds/internal/templates/rbac.go b/pkg/plugin/v3/scaffolds/internal/templates/config/rbac/rbac.go similarity index 98% rename from pkg/plugin/v3/scaffolds/internal/templates/rbac.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/rbac/rbac.go index b34d5deda69..03dad100c2b 100644 --- a/pkg/plugin/v3/scaffolds/internal/templates/rbac.go +++ b/pkg/plugin/v3/scaffolds/internal/templates/config/rbac/rbac.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package templates +package rbac import ( "path/filepath" diff --git a/pkg/plugin/v3/scaffolds/internal/templates/crd_sample.go b/pkg/plugin/v3/scaffolds/internal/templates/config/samples/crd_sample.go similarity index 98% rename from pkg/plugin/v3/scaffolds/internal/templates/crd_sample.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/samples/crd_sample.go index bfdf42a9244..9c58c32ab70 100644 --- a/pkg/plugin/v3/scaffolds/internal/templates/crd_sample.go +++ b/pkg/plugin/v3/scaffolds/internal/templates/config/samples/crd_sample.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package templates +package samples import ( "path/filepath" diff --git a/pkg/plugin/v3/scaffolds/internal/templates/webhook/kustomization.go b/pkg/plugin/v3/scaffolds/internal/templates/config/webhook/kustomization.go similarity index 100% rename from pkg/plugin/v3/scaffolds/internal/templates/webhook/kustomization.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/webhook/kustomization.go diff --git a/pkg/plugin/v3/scaffolds/internal/templates/webhook/kustomizeconfig.go b/pkg/plugin/v3/scaffolds/internal/templates/config/webhook/kustomizeconfig.go similarity index 100% rename from pkg/plugin/v3/scaffolds/internal/templates/webhook/kustomizeconfig.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/webhook/kustomizeconfig.go diff --git a/pkg/plugin/v3/scaffolds/internal/templates/webhook/service.go b/pkg/plugin/v3/scaffolds/internal/templates/config/webhook/service.go similarity index 100% rename from pkg/plugin/v3/scaffolds/internal/templates/webhook/service.go rename to pkg/plugin/v3/scaffolds/internal/templates/config/webhook/service.go diff --git a/pkg/plugin/v3/scaffolds/webhook.go b/pkg/plugin/v3/scaffolds/webhook.go index 622b0aea93b..3ee2b0e5dbf 100644 --- a/pkg/plugin/v3/scaffolds/webhook.go +++ b/pkg/plugin/v3/scaffolds/webhook.go @@ -25,7 +25,7 @@ import ( "sigs.k8s.io/kubebuilder/pkg/plugin/internal/machinery" "sigs.k8s.io/kubebuilder/pkg/plugin/scaffold" "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates" - "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/webhook" + "sigs.k8s.io/kubebuilder/pkg/plugin/v3/scaffolds/internal/templates/config/api" ) var _ scaffold.Scaffolder = &webhookScaffolder{} @@ -80,7 +80,7 @@ You need to implement the conversion.Hub and conversion.Convertible interfaces f if err := machinery.NewScaffold().Execute( s.newUniverse(), - &webhook.Webhook{Defaulting: s.defaulting, Validating: s.validation}, + &api.Webhook{Defaulting: s.defaulting, Validating: s.validation}, &templates.MainUpdater{WireWebhook: true}, ); err != nil { return err