Merge pull request #2764 from camilamacedo86/rename-dir

🌱 : rename kustomize v2 dir/pakage to v2-alpha to make clear its level of maturity
kubernetes-sigs · Jun 24, 2022 · 26d12ab · 26d12ab
2 parents 4fad85e + d19bedc
commit 26d12ab
Show file tree

Hide file tree

Showing 43 changed files with 26 additions and 26 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugin"
 	kustomizecommonv1 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v1"
-	kustomizecommonv2 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2"
+	kustomizecommonv2alpha "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang"
 	declarativev1 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/declarative/v1"
 	golangv2 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v2"
@@ -58,7 +58,7 @@ func main() {
 			golangv3.Plugin{},
 			gov3Bundle,
 			&kustomizecommonv1.Plugin{},
-			&kustomizecommonv2.Plugin{},
+			&kustomizecommonv2alpha.Plugin{},
 			&declarativev1.Plugin{},
 		),
 		cli.WithPlugins(externalPlugins...),

diff --git a/docs/book/src/plugins/kustomize-v2-alpha.md b/docs/book/src/plugins/kustomize-v2-alpha.md
@@ -44,7 +44,7 @@ all that is language specific and kustomize for its configuration, see:
 ```go
 import (
 ...
-   kustomizecommonv2 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2"
+   kustomizecommonv2alpha "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha"
    golangv3 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3"
 ...
 )
@@ -53,7 +53,7 @@ import (
 	// The follow code is creating a new plugin with its name and version via composition
 	// You can define that one plugin is composite by 1 or Many others plugins
 	gov3Bundle, _ := plugin.NewBundle(golang.DefaultNameQualifier, plugin.Version{Number: 3},
-		kustomizecommonv2.Plugin{}, // scaffold the config/ directory and all kustomize files
+        kustomizecommonv2alpha.Plugin{}, // scaffold the config/ directory and all kustomize files
 		golangv3.Plugin{}, // Scaffold the Golang files and all that specific for the language e.g. go.mod, apis, controllers
 	)
 ```

diff --git a/pkg/plugins/common/kustomize/v2/api.go → pkg/plugins/common/kustomize/v2-alpha/api.go b/pkg/plugins/common/kustomize/v2/api.go → pkg/plugins/common/kustomize/v2-alpha/api.go
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2
+package v2_alpha
 
 import (
 	"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugin"
-	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds"
+	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds"
 )
 
 var _ plugin.CreateAPISubcommand = &createAPISubcommand{}

diff --git a/pkg/plugins/common/kustomize/v2/create.go → ...ugins/common/kustomize/v2-alpha/create.go b/pkg/plugins/common/kustomize/v2/create.go → ...ugins/common/kustomize/v2-alpha/create.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2
+package v2_alpha
 
 import (
 	"strconv"

diff --git a/pkg/plugins/common/kustomize/v2/init.go → ...plugins/common/kustomize/v2-alpha/init.go b/pkg/plugins/common/kustomize/v2/init.go → ...plugins/common/kustomize/v2-alpha/init.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2
+package v2_alpha
 
 import (
 	"fmt"
@@ -28,7 +28,7 @@ import (
 	"sigs.k8s.io/kubebuilder/v3/pkg/internal/validation"
 	"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugin"
-	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds"
+	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds"
 )
 
 var _ plugin.InitSubcommand = &initSubcommand{}

diff --git a/pkg/plugins/common/kustomize/v2/plugin.go → ...ugins/common/kustomize/v2-alpha/plugin.go b/pkg/plugins/common/kustomize/v2/plugin.go → ...ugins/common/kustomize/v2-alpha/plugin.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2
+package v2_alpha
 
 import (
 	"sigs.k8s.io/kubebuilder/v3/pkg/config"

diff --git a/...gins/common/kustomize/v2/scaffolds/api.go → ...ommon/kustomize/v2-alpha/scaffolds/api.go b/...gins/common/kustomize/v2/scaffolds/api.go → ...ommon/kustomize/v2-alpha/scaffolds/api.go
@@ -23,10 +23,10 @@ import (
 	"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
 	"sigs.k8s.io/kubebuilder/v3/pkg/model/resource"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins"
-	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd"
-	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/patches"
-	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac"
-	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples"
+	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/crd"
+	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/crd/patches"
+	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/rbac"
+	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/samples"
 )
 
 var _ plugins.Scaffolder = &apiScaffolder{}

diff --git a/...ins/common/kustomize/v2/scaffolds/init.go → ...mmon/kustomize/v2-alpha/scaffolds/init.go b/...ins/common/kustomize/v2/scaffolds/init.go → ...mmon/kustomize/v2-alpha/scaffolds/init.go
@@ -22,10 +22,10 @@ import (
 	"sigs.k8s.io/kubebuilder/v3/pkg/config"
 	"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins"
-	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault"
-	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager"
-	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/prometheus"
-	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac"
+	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/kdefault"
+	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/manager"
+	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/prometheus"
+	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/rbac"
 )
 
 const (

diff --git a/...mplates/config/certmanager/certificate.go → ...mplates/config/certmanager/certificate.go b/...mplates/config/certmanager/certificate.go → ...mplates/config/certmanager/certificate.go
diff --git a/...lates/config/certmanager/kustomization.go → ...lates/config/certmanager/kustomization.go b/...lates/config/certmanager/kustomization.go → ...lates/config/certmanager/kustomization.go
diff --git a/...tes/config/certmanager/kustomizeconfig.go → ...tes/config/certmanager/kustomizeconfig.go b/...tes/config/certmanager/kustomizeconfig.go → ...tes/config/certmanager/kustomizeconfig.go
diff --git a/...nal/templates/config/crd/kustomization.go → ...nal/templates/config/crd/kustomization.go b/...nal/templates/config/crd/kustomization.go → ...nal/templates/config/crd/kustomization.go
diff --git a/...l/templates/config/crd/kustomizeconfig.go → ...l/templates/config/crd/kustomizeconfig.go b/...l/templates/config/crd/kustomizeconfig.go → ...l/templates/config/crd/kustomizeconfig.go
diff --git a/...ig/crd/patches/enablecainjection_patch.go → ...ig/crd/patches/enablecainjection_patch.go b/...ig/crd/patches/enablecainjection_patch.go → ...ig/crd/patches/enablecainjection_patch.go
diff --git a/...config/crd/patches/enablewebhook_patch.go → ...config/crd/patches/enablewebhook_patch.go b/...config/crd/patches/enablewebhook_patch.go → ...config/crd/patches/enablewebhook_patch.go
diff --git a/...config/kdefault/enablecainection_patch.go → ...config/kdefault/enablecainection_patch.go b/...config/kdefault/enablecainection_patch.go → ...config/kdefault/enablecainection_patch.go
diff --git a/...emplates/config/kdefault/kustomization.go → ...emplates/config/kdefault/kustomization.go b/...emplates/config/kdefault/kustomization.go → ...emplates/config/kdefault/kustomization.go
diff --git a/...nfig/kdefault/manager_auth_proxy_patch.go → ...nfig/kdefault/manager_auth_proxy_patch.go b/...nfig/kdefault/manager_auth_proxy_patch.go → ...nfig/kdefault/manager_auth_proxy_patch.go
diff --git a/...s/config/kdefault/manager_config_patch.go → ...s/config/kdefault/manager_config_patch.go b/...s/config/kdefault/manager_config_patch.go → ...s/config/kdefault/manager_config_patch.go
diff --git a/.../config/kdefault/webhook_manager_patch.go → .../config/kdefault/webhook_manager_patch.go b/.../config/kdefault/webhook_manager_patch.go → .../config/kdefault/webhook_manager_patch.go
diff --git a/...ternal/templates/config/manager/config.go → ...ternal/templates/config/manager/config.go b/...ternal/templates/config/manager/config.go → ...ternal/templates/config/manager/config.go
diff --git a/...nfig/manager/controller_manager_config.go → ...nfig/manager/controller_manager_config.go b/...nfig/manager/controller_manager_config.go → ...nfig/manager/controller_manager_config.go
diff --git a/...templates/config/manager/kustomization.go → ...templates/config/manager/kustomization.go b/...templates/config/manager/kustomization.go → ...templates/config/manager/kustomization.go
diff --git a/...plates/config/prometheus/kustomization.go → ...plates/config/prometheus/kustomization.go b/...plates/config/prometheus/kustomization.go → ...plates/config/prometheus/kustomization.go
diff --git a/...al/templates/config/prometheus/monitor.go → ...al/templates/config/prometheus/monitor.go b/...al/templates/config/prometheus/monitor.go → ...al/templates/config/prometheus/monitor.go
diff --git a/...tes/config/rbac/auth_proxy_client_role.go → ...tes/config/rbac/auth_proxy_client_role.go b/...tes/config/rbac/auth_proxy_client_role.go → ...tes/config/rbac/auth_proxy_client_role.go
diff --git a/.../templates/config/rbac/auth_proxy_role.go → .../templates/config/rbac/auth_proxy_role.go b/.../templates/config/rbac/auth_proxy_role.go → .../templates/config/rbac/auth_proxy_role.go
diff --git a/...es/config/rbac/auth_proxy_role_binding.go → ...es/config/rbac/auth_proxy_role_binding.go b/...es/config/rbac/auth_proxy_role_binding.go → ...es/config/rbac/auth_proxy_role_binding.go
diff --git a/...mplates/config/rbac/auth_proxy_service.go → ...mplates/config/rbac/auth_proxy_service.go b/...mplates/config/rbac/auth_proxy_service.go → ...mplates/config/rbac/auth_proxy_service.go
diff --git a/.../templates/config/rbac/crd_editor_role.go → .../templates/config/rbac/crd_editor_role.go b/.../templates/config/rbac/crd_editor_role.go → .../templates/config/rbac/crd_editor_role.go
diff --git a/.../templates/config/rbac/crd_viewer_role.go → .../templates/config/rbac/crd_viewer_role.go b/.../templates/config/rbac/crd_viewer_role.go → .../templates/config/rbac/crd_viewer_role.go
diff --git a/...al/templates/config/rbac/kustomization.go → ...al/templates/config/rbac/kustomization.go b/...al/templates/config/rbac/kustomization.go → ...al/templates/config/rbac/kustomization.go
diff --git a/...lates/config/rbac/leader_election_role.go → ...lates/config/rbac/leader_election_role.go b/...lates/config/rbac/leader_election_role.go → ...lates/config/rbac/leader_election_role.go
diff --git a/...nfig/rbac/leader_election_role_binding.go → ...nfig/rbac/leader_election_role_binding.go b/...nfig/rbac/leader_election_role_binding.go → ...nfig/rbac/leader_election_role_binding.go
diff --git a/...nal/templates/config/rbac/role_binding.go → ...nal/templates/config/rbac/role_binding.go b/...nal/templates/config/rbac/role_binding.go → ...nal/templates/config/rbac/role_binding.go
diff --git a/.../templates/config/rbac/service_account.go → .../templates/config/rbac/service_account.go b/.../templates/config/rbac/service_account.go → .../templates/config/rbac/service_account.go
diff --git a/...al/templates/config/samples/crd_sample.go → ...al/templates/config/samples/crd_sample.go b/...al/templates/config/samples/crd_sample.go → ...al/templates/config/samples/crd_sample.go
diff --git a/...templates/config/webhook/kustomization.go → ...templates/config/webhook/kustomization.go b/...templates/config/webhook/kustomization.go → ...templates/config/webhook/kustomization.go
diff --git a/...mplates/config/webhook/kustomizeconfig.go → ...mplates/config/webhook/kustomizeconfig.go b/...mplates/config/webhook/kustomizeconfig.go → ...mplates/config/webhook/kustomizeconfig.go
diff --git a/...ernal/templates/config/webhook/service.go → ...ernal/templates/config/webhook/service.go b/...ernal/templates/config/webhook/service.go → ...ernal/templates/config/webhook/service.go
diff --git a/.../common/kustomize/v2/scaffolds/webhook.go → ...n/kustomize/v2-alpha/scaffolds/webhook.go b/.../common/kustomize/v2/scaffolds/webhook.go → ...n/kustomize/v2-alpha/scaffolds/webhook.go
@@ -23,9 +23,9 @@ import (
 	"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
 	"sigs.k8s.io/kubebuilder/v3/pkg/model/resource"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins"
-	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager"
-	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault"
-	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook"
+	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/certmanager"
+	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/kdefault"
+	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/webhook"
 )
 
 var _ plugins.Scaffolder = &webhookScaffolder{}

diff --git a/pkg/plugins/common/kustomize/v2/webhook.go → ...gins/common/kustomize/v2-alpha/webhook.go b/pkg/plugins/common/kustomize/v2/webhook.go → ...gins/common/kustomize/v2-alpha/webhook.go
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2
+package v2_alpha
 
 import (
 	"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugin"
-	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds"
+	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds"
 )
 
 var _ plugin.CreateWebhookSubcommand = &createWebhookSubcommand{}

diff --git a/pkg/plugins/golang/v3/scaffolds/init.go b/pkg/plugins/golang/v3/scaffolds/init.go
@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins"
 	kustomizecommonv1 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v1"
-	kustomizecommonv2 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2"
+	kustomizecommonv2alpha "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds/internal/templates"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds/internal/templates/hack"
 )
@@ -115,12 +115,12 @@ func (s *initScaffolder) Scaffold() error {
 	// we need to ensure that we use its supported Kustomize Version
 	// in order to support it
 	kustomizeVersion = kustomizecommonv1.KustomizeVersion
-	kustomizev2 := kustomizecommonv2.Plugin{}
+	kustomizev2 := kustomizecommonv2alpha.Plugin{}
 	pluginKeyForKustomizeV2 := plugin.KeyFor(kustomizev2)
 
 	for _, pluginKey := range s.config.GetPluginChain() {
 		if pluginKey == pluginKeyForKustomizeV2 {
-			kustomizeVersion = kustomizecommonv2.KustomizeVersion
+			kustomizeVersion = kustomizecommonv2alpha.KustomizeVersion
 			break
 		}
 	}