cleanup: organize templates in the same structure that the are scaffo…

…lded
kubernetes-sigs · Jul 31, 2020 · 2c1b579 · 2c1b579
1 parent 21f9343
commit 2c1b579
Show file tree

Hide file tree

Showing 38 changed files with 51 additions and 46 deletions.
diff --git 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
@@ -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/.../v3/scaffolds/internal/templates/group.go → ...ds/internal/templates/config/api/group.go b/.../v3/scaffolds/internal/templates/group.go → ...ds/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/.../v3/scaffolds/internal/templates/types.go → ...ds/internal/templates/config/api/types.go b/.../v3/scaffolds/internal/templates/types.go → ...ds/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/...lds/internal/templates/webhook/webhook.go → .../internal/templates/config/api/webhook.go b/...lds/internal/templates/webhook/webhook.go → .../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/...rnal/templates/certmanager/certificate.go → ...mplates/config/certmanager/certificate.go b/...rnal/templates/certmanager/certificate.go → ...mplates/config/certmanager/certificate.go
diff --git a/...ternal/templates/certmanager/kustomize.go → ...templates/config/certmanager/kustomize.go b/...ternal/templates/certmanager/kustomize.go → ...templates/config/certmanager/kustomize.go
diff --git a/.../templates/certmanager/kustomizeconfig.go → ...tes/config/certmanager/kustomizeconfig.go b/.../templates/certmanager/kustomizeconfig.go → ...tes/config/certmanager/kustomizeconfig.go
diff --git a/...ternal/templates/controller/controller.go → ...templates/config/controller/controller.go b/...ternal/templates/controller/controller.go → ...templates/config/controller/controller.go
diff --git a/...plates/controller/controller_suitetest.go → ...config/controller/controller_suitetest.go b/...plates/controller/controller_suitetest.go → ...config/controller/controller_suitetest.go
diff --git a/.../templates/crd/enablecainjection_patch.go → ...tes/config/crd/enablecainjection_patch.go b/.../templates/crd/enablecainjection_patch.go → ...tes/config/crd/enablecainjection_patch.go
diff --git a/...rnal/templates/crd/enablewebhook_patch.go → ...mplates/config/crd/enablewebhook_patch.go b/...rnal/templates/crd/enablewebhook_patch.go → ...mplates/config/crd/enablewebhook_patch.go
diff --git a/...s/internal/templates/crd/kustomization.go → ...nal/templates/config/crd/kustomization.go b/...s/internal/templates/crd/kustomization.go → ...nal/templates/config/crd/kustomization.go
diff --git a/...internal/templates/crd/kustomizeconfig.go → ...l/templates/config/crd/kustomizeconfig.go b/...internal/templates/crd/kustomizeconfig.go → ...l/templates/config/crd/kustomizeconfig.go
diff --git a/...affolds/internal/templates/boilerplate.go → ...rnal/templates/config/hack/boilerplate.go b/...affolds/internal/templates/boilerplate.go → ...rnal/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/...templates/metricsauth/auth_proxy_patch.go → ...lates/config/kdefault/auth_proxy_patch.go b/...templates/metricsauth/auth_proxy_patch.go → ...lates/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/...mplates/webhook/enablecainection_patch.go → ...config/kdefault/enablecainection_patch.go b/...mplates/webhook/enablecainection_patch.go → ...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/...scaffolds/internal/templates/kustomize.go → ...al/templates/config/kdefault/kustomize.go b/...scaffolds/internal/templates/kustomize.go → ...al/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/...ternal/templates/webhook_manager_patch.go → .../config/kdefault/webhook_manager_patch.go b/...ternal/templates/webhook_manager_patch.go → .../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/...olds/internal/templates/manager/config.go → ...ternal/templates/config/manager/config.go b/...olds/internal/templates/manager/config.go → ...ternal/templates/config/manager/config.go
diff --git a/...ternal/templates/manager/kustomization.go → ...templates/config/manager/kustomization.go b/...ternal/templates/manager/kustomization.go → ...templates/config/manager/kustomization.go
diff --git a/...nternal/templates/prometheus/kustomize.go → .../templates/config/prometheus/kustomize.go b/...nternal/templates/prometheus/kustomize.go → .../templates/config/prometheus/kustomize.go
diff --git a/.../internal/templates/prometheus/monitor.go → ...al/templates/config/prometheus/monitor.go b/.../internal/templates/prometheus/monitor.go → ...al/templates/config/prometheus/monitor.go
diff --git a/...folds/internal/templates/authproxyrole.go → .../templates/config/rbac/auth_proxy_role.go b/...folds/internal/templates/authproxyrole.go → .../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/...nternal/templates/authproxyrolebinding.go → ...tes/config/rbac/auth_proxy_rolebinding.go b/...nternal/templates/authproxyrolebinding.go → ...tes/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/...templates/metricsauth/authproxyservice.go → ...mplates/config/rbac/auth_proxy_service.go b/...templates/metricsauth/authproxyservice.go → ...mplates/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/...emplates/metricsauth/clientclusterrole.go → ...plates/config/rbac/client_cluster_role.go b/...emplates/metricsauth/clientclusterrole.go → ...plates/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/...lds/internal/templates/crd_editor_rbac.go → .../templates/config/rbac/crd_editor_rbac.go b/...lds/internal/templates/crd_editor_rbac.go → .../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/...lds/internal/templates/crd_viewer_rbac.go → .../templates/config/rbac/crd_viewer_rbac.go b/...lds/internal/templates/crd_viewer_rbac.go → .../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/.../internal/templates/leaderelectionrole.go → ...lates/config/rbac/leader_election_role.go b/.../internal/templates/leaderelectionrole.go → ...lates/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/...al/templates/leaderelectionrolebinding.go → ...onfig/rbac/leader_election_rolebinding.go b/...al/templates/leaderelectionrolebinding.go → ...onfig/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/...olds/internal/templates/mgrrolebinding.go → ...lates/config/rbac/manager_role_binding.go b/...olds/internal/templates/mgrrolebinding.go → ...lates/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/...n/v3/scaffolds/internal/templates/rbac.go → ...ds/internal/templates/config/rbac/rbac.go b/...n/v3/scaffolds/internal/templates/rbac.go → ...ds/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/...caffolds/internal/templates/crd_sample.go → ...al/templates/config/samples/crd_sample.go b/...caffolds/internal/templates/crd_sample.go → ...al/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/...ternal/templates/webhook/kustomization.go → ...templates/config/webhook/kustomization.go b/...ternal/templates/webhook/kustomization.go → ...templates/config/webhook/kustomization.go
diff --git a/...rnal/templates/webhook/kustomizeconfig.go → ...mplates/config/webhook/kustomizeconfig.go b/...rnal/templates/webhook/kustomizeconfig.go → ...mplates/config/webhook/kustomizeconfig.go
diff --git a/...lds/internal/templates/webhook/service.go → ...ernal/templates/config/webhook/service.go b/...lds/internal/templates/webhook/service.go → ...ernal/templates/config/webhook/service.go
diff --git 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