Revert ":seeding: Cleanup alpha configgen as plugin"

This reverts commit 4e18efe.
kubernetes-sigs · Mar 21, 2022 · 2e8b509 · 2e8b509
1 parent 3b9e5c4
commit 2e8b509
Show file tree

Hide file tree

Showing 57 changed files with 2 additions and 2 deletions.
diff --git a/pkg/cli/alpha.go b/pkg/cli/alpha.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	configgen "sigs.k8s.io/kubebuilder/v3/pkg/plugins/config-gen"
+	configgen "sigs.k8s.io/kubebuilder/v3/pkg/cli/alpha/config-gen"
 )
 
 const (

diff --git a/pkg/plugins/config-gen/README.md → pkg/cli/alpha/config-gen/README.md b/pkg/plugins/config-gen/README.md → pkg/cli/alpha/config-gen/README.md
diff --git a/...gins/config-gen/cert-generation-filter.go → ...lpha/config-gen/cert-generation-filter.go b/...gins/config-gen/cert-generation-filter.go → ...lpha/config-gen/cert-generation-filter.go
diff --git a/pkg/plugins/config-gen/cmd.go → pkg/cli/alpha/config-gen/cmd.go b/pkg/plugins/config-gen/cmd.go → pkg/cli/alpha/config-gen/cmd.go
diff --git a/pkg/plugins/config-gen/component-filter.go → pkg/cli/alpha/config-gen/component-filter.go b/pkg/plugins/config-gen/component-filter.go → pkg/cli/alpha/config-gen/component-filter.go
diff --git a/pkg/plugins/config-gen/configgen_test.go → pkg/cli/alpha/config-gen/configgen_test.go b/pkg/plugins/config-gen/configgen_test.go → pkg/cli/alpha/config-gen/configgen_test.go
@@ -19,7 +19,7 @@ package configgen_test
 import (
 	"testing"
 
-	configgen "sigs.k8s.io/kubebuilder/v3/pkg/plugins/config-gen"
+	configgen "sigs.k8s.io/kubebuilder/v3/pkg/cli/alpha/config-gen"
 	"sigs.k8s.io/kustomize/kyaml/fn/framework/frameworktestutil"
 )
 

diff --git a/...ugins/config-gen/controller-gen-filter.go → ...alpha/config-gen/controller-gen-filter.go b/...ugins/config-gen/controller-gen-filter.go → ...alpha/config-gen/controller-gen-filter.go
diff --git a/...-gen/examples/advancedextension/README.md → ...-gen/examples/advancedextension/README.md b/...-gen/examples/advancedextension/README.md → ...-gen/examples/advancedextension/README.md
diff --git a/...ples/advancedextension/kustomization.yaml → ...ples/advancedextension/kustomization.yaml b/...ples/advancedextension/kustomization.yaml → ...ples/advancedextension/kustomization.yaml
diff --git a/...ig-gen/examples/advancedextension/main.go → ...ig-gen/examples/advancedextension/main.go b/...ig-gen/examples/advancedextension/main.go → ...ig-gen/examples/advancedextension/main.go
diff --git a/...fig-gen/examples/basicextension/README.md → ...fig-gen/examples/basicextension/README.md b/...fig-gen/examples/basicextension/README.md → ...fig-gen/examples/basicextension/README.md
diff --git a/...xamples/basicextension/kustomization.yaml → ...xamples/basicextension/kustomization.yaml b/...xamples/basicextension/kustomization.yaml → ...xamples/basicextension/kustomization.yaml
diff --git a/...onfig-gen/examples/basicextension/main.go → ...onfig-gen/examples/basicextension/main.go b/...onfig-gen/examples/basicextension/main.go → ...onfig-gen/examples/basicextension/main.go
diff --git a/...gen/examples/kustomize/Kustomization.yaml → ...gen/examples/kustomize/Kustomization.yaml b/...gen/examples/kustomize/Kustomization.yaml → ...gen/examples/kustomize/Kustomization.yaml
diff --git a/...s/config-gen/examples/kustomize/README.md → ...a/config-gen/examples/kustomize/README.md b/...s/config-gen/examples/kustomize/README.md → ...a/config-gen/examples/kustomize/README.md
diff --git a/.../config-gen/examples/standalone/README.md → .../config-gen/examples/standalone/README.md b/.../config-gen/examples/standalone/README.md → .../config-gen/examples/standalone/README.md
diff --git a/...amples/standalone/kubebuilderproject.yaml → ...amples/standalone/kubebuilderproject.yaml b/...amples/standalone/kubebuilderproject.yaml → ...amples/standalone/kubebuilderproject.yaml
diff --git a/...config-gen/examples/standalone/patch.yaml → ...config-gen/examples/standalone/patch.yaml b/...config-gen/examples/standalone/patch.yaml → ...config-gen/examples/standalone/patch.yaml
diff --git a/pkg/plugins/config-gen/sort-filter.go → pkg/cli/alpha/config-gen/sort-filter.go b/pkg/plugins/config-gen/sort-filter.go → pkg/cli/alpha/config-gen/sort-filter.go
diff --git a/...hes/cert-manager/annotation.template.yaml → ...hes/cert-manager/annotation.template.yaml b/...hes/cert-manager/annotation.template.yaml → ...hes/cert-manager/annotation.template.yaml
diff --git a/...oller-manager/01-auth-proxy.template.yaml → ...oller-manager/01-auth-proxy.template.yaml b/...oller-manager/01-auth-proxy.template.yaml → ...oller-manager/01-auth-proxy.template.yaml
diff --git a/...troller-manager/02-webhooks.template.yaml → ...troller-manager/02-webhooks.template.yaml b/...troller-manager/02-webhooks.template.yaml → ...troller-manager/02-webhooks.template.yaml
diff --git a/...roller-manager/99-component.template.yaml → ...roller-manager/99-component.template.yaml b/...roller-manager/99-component.template.yaml → ...roller-manager/99-component.template.yaml
diff --git a/...ates/patches/crd/conversion.template.yaml → ...ates/patches/crd/conversion.template.yaml b/...ates/patches/crd/conversion.template.yaml → ...ates/patches/crd/conversion.template.yaml
diff --git a/...s/resources/auth-proxy-rbac.template.yaml → ...s/resources/auth-proxy-rbac.template.yaml b/...s/resources/auth-proxy-rbac.template.yaml → ...s/resources/auth-proxy-rbac.template.yaml
diff --git a/...ates/resources/cert-manager.template.yaml → ...ates/resources/cert-manager.template.yaml b/...ates/resources/cert-manager.template.yaml → ...ates/resources/cert-manager.template.yaml
diff --git a/...mplates/resources/component.template.yaml → ...mplates/resources/component.template.yaml b/...mplates/resources/component.template.yaml → ...mplates/resources/component.template.yaml
diff --git a/...esources/controller-manager.template.yaml → ...esources/controller-manager.template.yaml b/...esources/controller-manager.template.yaml → ...esources/controller-manager.template.yaml
diff --git a/.../development-webhook-secret.template.yaml → .../development-webhook-secret.template.yaml b/.../development-webhook-secret.template.yaml → .../development-webhook-secret.template.yaml
diff --git a/...mplates/resources/namespace.template.yaml → ...mplates/resources/namespace.template.yaml b/...mplates/resources/namespace.template.yaml → ...mplates/resources/namespace.template.yaml
diff --git a/...plates/resources/prometheus.template.yaml → ...plates/resources/prometheus.template.yaml b/...plates/resources/prometheus.template.yaml → ...plates/resources/prometheus.template.yaml
diff --git a/...en/templates/resources/rbac.template.yaml → ...en/templates/resources/rbac.template.yaml b/...en/templates/resources/rbac.template.yaml → ...en/templates/resources/rbac.template.yaml
diff --git a/...-gen/testdata/componentconfig/config.yaml → ...-gen/testdata/componentconfig/config.yaml b/...-gen/testdata/componentconfig/config.yaml → ...-gen/testdata/componentconfig/config.yaml
diff --git a/...nentconfig/controller_manager_config.yaml → ...nentconfig/controller_manager_config.yaml b/...nentconfig/controller_manager_config.yaml → ...nentconfig/controller_manager_config.yaml
diff --git a/...en/testdata/componentconfig/expected.yaml → ...en/testdata/componentconfig/expected.yaml b/...en/testdata/componentconfig/expected.yaml → ...en/testdata/componentconfig/expected.yaml
diff --git a/...s/config-gen/testdata/default/config.yaml → ...a/config-gen/testdata/default/config.yaml b/...s/config-gen/testdata/default/config.yaml → ...a/config-gen/testdata/default/config.yaml
diff --git a/...config-gen/testdata/default/expected.yaml → ...config-gen/testdata/default/expected.yaml b/...config-gen/testdata/default/expected.yaml → ...config-gen/testdata/default/expected.yaml
diff --git a/...gen/testdata/disableauthproxy/config.yaml → ...gen/testdata/disableauthproxy/config.yaml b/...gen/testdata/disableauthproxy/config.yaml → ...gen/testdata/disableauthproxy/config.yaml
diff --git a/...n/testdata/disableauthproxy/expected.yaml → ...n/testdata/disableauthproxy/expected.yaml b/...n/testdata/disableauthproxy/expected.yaml → ...n/testdata/disableauthproxy/expected.yaml
diff --git a/pkg/plugins/config-gen/testdata/doc.go → pkg/cli/alpha/config-gen/testdata/doc.go b/pkg/plugins/config-gen/testdata/doc.go → pkg/cli/alpha/config-gen/testdata/doc.go
diff --git a/...en/testdata/enablecertmanager/config.yaml → ...en/testdata/enablecertmanager/config.yaml b/...en/testdata/enablecertmanager/config.yaml → ...en/testdata/enablecertmanager/config.yaml
diff --git a/.../testdata/enablecertmanager/expected.yaml → .../testdata/enablecertmanager/expected.yaml b/.../testdata/enablecertmanager/expected.yaml → .../testdata/enablecertmanager/expected.yaml
diff --git a/...data/enableconversionwebhooks/config.yaml → ...data/enableconversionwebhooks/config.yaml b/...data/enableconversionwebhooks/config.yaml → ...data/enableconversionwebhooks/config.yaml
diff --git a/...ta/enableconversionwebhooks/expected.yaml → ...ta/enableconversionwebhooks/expected.yaml b/...ta/enableconversionwebhooks/expected.yaml → ...ta/enableconversionwebhooks/expected.yaml
diff --git a/...gen/testdata/enableprometheus/config.yaml → ...gen/testdata/enableprometheus/config.yaml b/...gen/testdata/enableprometheus/config.yaml → ...gen/testdata/enableprometheus/config.yaml
diff --git a/...n/testdata/enableprometheus/expected.yaml → ...n/testdata/enableprometheus/expected.yaml b/...n/testdata/enableprometheus/expected.yaml → ...n/testdata/enableprometheus/expected.yaml
diff --git a/...g-gen/testdata/enablewebhooks/config.yaml → ...g-gen/testdata/enablewebhooks/config.yaml b/...g-gen/testdata/enablewebhooks/config.yaml → ...g-gen/testdata/enablewebhooks/config.yaml
diff --git a/...gen/testdata/enablewebhooks/expected.yaml → ...gen/testdata/enablewebhooks/expected.yaml b/...gen/testdata/enablewebhooks/expected.yaml → ...gen/testdata/enablewebhooks/expected.yaml
diff --git a/...estdata/project/api/v1alpha1/foo_types.go → ...estdata/project/api/v1alpha1/foo_types.go b/...estdata/project/api/v1alpha1/foo_types.go → ...estdata/project/api/v1alpha1/foo_types.go
diff --git a/...project/api/v1alpha1/groupversion_info.go → ...project/api/v1alpha1/groupversion_info.go b/...project/api/v1alpha1/groupversion_info.go → ...project/api/v1alpha1/groupversion_info.go
diff --git a/...ect/api/v1alpha1/zz_generated.deepcopy.go → ...ect/api/v1alpha1/zz_generated.deepcopy.go b/...ect/api/v1alpha1/zz_generated.deepcopy.go → ...ect/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/...testdata/project/api/v1beta1/bar_types.go → ...testdata/project/api/v1beta1/bar_types.go b/...testdata/project/api/v1beta1/bar_types.go → ...testdata/project/api/v1beta1/bar_types.go
diff --git a/.../project/api/v1beta1/groupversion_info.go → .../project/api/v1beta1/groupversion_info.go b/.../project/api/v1beta1/groupversion_info.go → .../project/api/v1beta1/groupversion_info.go
diff --git a/...ject/api/v1beta1/zz_generated.deepcopy.go → ...ject/api/v1beta1/zz_generated.deepcopy.go b/...ject/api/v1beta1/zz_generated.deepcopy.go → ...ject/api/v1beta1/zz_generated.deepcopy.go
diff --git a/...ata/project/controllers/bar_controller.go → ...ata/project/controllers/bar_controller.go b/...ata/project/controllers/bar_controller.go → ...ata/project/controllers/bar_controller.go
diff --git a/...ata/project/controllers/foo_controller.go → ...ata/project/controllers/foo_controller.go b/...ata/project/controllers/foo_controller.go → ...ata/project/controllers/foo_controller.go
diff --git a/pkg/plugins/config-gen/types.go → pkg/cli/alpha/config-gen/types.go b/pkg/plugins/config-gen/types.go → pkg/cli/alpha/config-gen/types.go