Skip to content

Commit

Permalink
Re-organize pkg/plugin directory
Browse files Browse the repository at this point in the history 
pkg/plugin: interfaces and types for plugins and helper methods
pkg/plugins: kubebuilder defined plugins, one per directory
pkg/plugins/internal: templating and file system interaction machinery used for kubebuilder plugins
pkg/plugins/base: base plugin with qualified name "go.kubebuilder.io"

Signed-off-by: Adrian Orive <adrian.orive.oneca@gmail.com>
  • Loading branch information
@Adirio
Adirio committed Nov 17, 2020
1 parent cd3cb2a commit 34af697
Show file tree
Hide file tree
Showing 121 changed files with 80 additions and 84 deletions.
4 changes: 2 additions & 2 deletions cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"log"

"sigs.k8s.io/kubebuilder/v2/pkg/cli"
pluginv2 "sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2"
pluginv3 "sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3"
pluginv2 "sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2"
pluginv3 "sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3"
)

func main() {
Expand Down
3 changes: 0 additions & 3 deletions pkg/plugin/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ import (
"sigs.k8s.io/kubebuilder/v2/pkg/internal/validation"
)

// DefaultNameQualifier is the suffix appended to all kubebuilder plugin names.
const DefaultNameQualifier = ".kubebuilder.io"

// Key returns a unique identifying string for a plugin's name and version.
func Key(name, version string) string {
if version == "" {
Expand Down
9 changes: 3 additions & 6 deletions pkg/plugin/scaffold/interface.go → pkg/plugins/domain.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package scaffold
package plugins

// Scaffolder interface creates files to set up a controller manager
type Scaffolder interface {
// Scaffold performs the scaffolding
Scaffold() error
}
// DefaultNameQualifier is the suffix appended to all kubebuilder plugin names.
const DefaultNameQualifier = ".kubebuilder.io"
6 changes: 3 additions & 3 deletions pkg/plugin/v2/api.go → pkg/plugins/golang/v2/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ import (
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/util"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/util"
"sigs.k8s.io/kubebuilder/v2/plugins/addon"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/plugin/v2/edit.go → pkg/plugins/golang/v2/edit.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (

"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
)

type editSubcommand struct {
Expand Down
6 changes: 3 additions & 3 deletions pkg/plugin/v2/init.go → pkg/plugins/golang/v2/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (
"sigs.k8s.io/kubebuilder/v2/pkg/internal/validation"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/util"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/util"
)

type initSubcommand struct {
Expand Down
3 changes: 2 additions & 1 deletion pkg/plugin/v2/plugin.go → pkg/plugins/golang/v2/plugin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ package v2
import (
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins"
)

const pluginName = "go" + plugin.DefaultNameQualifier
const pluginName = "go" + plugins.DefaultNameQualifier

var (
supportedProjectVersions = []string{config.Version2, config.Version3Alpha}
Expand Down
18 changes: 9 additions & 9 deletions pkg/plugin/v2/scaffolds/api.go → pkg/plugins/golang/v2/scaffolds/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ import (
"sigs.k8s.io/kubebuilder/v2/pkg/model"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/machinery"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/api"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/config/crd"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/config/crd/patches"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/config/rbac"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/config/samples"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/controllers"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates/api"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates/config/crd"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates/config/crd/patches"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates/config/rbac"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates/config/samples"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates/controllers"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/machinery"
)

// KbDeclarativePattern is the sigs.k8s.io/kubebuilder-declarative-pattern version
Expand Down
0 pkg/plugin/v2/scaffolds/doc.go → pkg/plugins/golang/v2/scaffolds/doc.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/plugin/v2/scaffolds/edit.go → pkg/plugins/golang/v2/scaffolds/edit.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"strings"

"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
)

var _ cmdutil.Scaffolder = &editScaffolder{}
Expand Down
20 changes: 10 additions & 10 deletions pkg/plugin/v2/scaffolds/init.go → pkg/plugins/golang/v2/scaffolds/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ import (

"sigs.k8s.io/kubebuilder/v2/pkg/model"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/machinery"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/config/certmanager"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/config/kdefault"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/config/manager"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/config/prometheus"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/config/rbac"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/config/webhook"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/hack"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates/config/certmanager"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates/config/kdefault"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates/config/manager"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates/config/prometheus"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates/config/rbac"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates/config/webhook"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates/hack"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/machinery"
)

const (
Expand Down
0 ...scaffolds/internal/templates/api/group.go → ...scaffolds/internal/templates/api/group.go
View file
File renamed without changes.
0 ...scaffolds/internal/templates/api/types.go → ...scaffolds/internal/templates/api/types.go
View file
File renamed without changes.
0 ...affolds/internal/templates/api/webhook.go → ...affolds/internal/templates/api/webhook.go
View file
File renamed without changes.
0 ...mplates/config/certmanager/certificate.go → ...mplates/config/certmanager/certificate.go
View file
File renamed without changes.
0 ...lates/config/certmanager/kustomization.go → ...lates/config/certmanager/kustomization.go
View file
File renamed without changes.
0 ...tes/config/certmanager/kustomizeconfig.go → ...tes/config/certmanager/kustomizeconfig.go
View file
File renamed without changes.
0 ...nal/templates/config/crd/kustomization.go → ...nal/templates/config/crd/kustomization.go
View file
File renamed without changes.
0 ...l/templates/config/crd/kustomizeconfig.go → ...l/templates/config/crd/kustomizeconfig.go
View file
File renamed without changes.
0 ...ig/crd/patches/enablecainjection_patch.go → ...ig/crd/patches/enablecainjection_patch.go
View file
File renamed without changes.
0 ...config/crd/patches/enablewebhook_patch.go → ...config/crd/patches/enablewebhook_patch.go
View file
File renamed without changes.
0 ...config/kdefault/enablecainection_patch.go → ...config/kdefault/enablecainection_patch.go
View file
File renamed without changes.
0 ...emplates/config/kdefault/kustomization.go → ...emplates/config/kdefault/kustomization.go
View file
File renamed without changes.
0 ...nfig/kdefault/manager_auth_proxy_patch.go → ...nfig/kdefault/manager_auth_proxy_patch.go
View file
File renamed without changes.
0 .../config/kdefault/webhook_manager_patch.go → .../config/kdefault/webhook_manager_patch.go
View file
File renamed without changes.
0 ...ternal/templates/config/manager/config.go → ...ternal/templates/config/manager/config.go
View file
File renamed without changes.
0 ...templates/config/manager/kustomization.go → ...templates/config/manager/kustomization.go
View file
File renamed without changes.
0 ...plates/config/prometheus/kustomization.go → ...plates/config/prometheus/kustomization.go
View file
File renamed without changes.
0 ...al/templates/config/prometheus/monitor.go → ...al/templates/config/prometheus/monitor.go
View file
File renamed without changes.
0 ...tes/config/rbac/auth_proxy_client_role.go → ...tes/config/rbac/auth_proxy_client_role.go
View file
File renamed without changes.
0 .../templates/config/rbac/auth_proxy_role.go → .../templates/config/rbac/auth_proxy_role.go
View file
File renamed without changes.
0 ...es/config/rbac/auth_proxy_role_binding.go → ...es/config/rbac/auth_proxy_role_binding.go
View file
File renamed without changes.
0 ...mplates/config/rbac/auth_proxy_service.go → ...mplates/config/rbac/auth_proxy_service.go
View file
File renamed without changes.
0 .../templates/config/rbac/crd_editor_role.go → .../templates/config/rbac/crd_editor_role.go
View file
File renamed without changes.
0 .../templates/config/rbac/crd_viewer_role.go → .../templates/config/rbac/crd_viewer_role.go
View file
File renamed without changes.
0 ...al/templates/config/rbac/kustomization.go → ...al/templates/config/rbac/kustomization.go
View file
File renamed without changes.
0 ...lates/config/rbac/leader_election_role.go → ...lates/config/rbac/leader_election_role.go
View file
File renamed without changes.
0 ...nfig/rbac/leader_election_role_binding.go → ...nfig/rbac/leader_election_role_binding.go
View file
File renamed without changes.
0 ...nal/templates/config/rbac/role_binding.go → ...nal/templates/config/rbac/role_binding.go
View file
File renamed without changes.
0 ...al/templates/config/samples/crd_sample.go → ...al/templates/config/samples/crd_sample.go
View file
File renamed without changes.
0 ...templates/config/webhook/kustomization.go → ...templates/config/webhook/kustomization.go
View file
File renamed without changes.
0 ...mplates/config/webhook/kustomizeconfig.go → ...mplates/config/webhook/kustomizeconfig.go
View file
File renamed without changes.
0 ...ernal/templates/config/webhook/service.go → ...ernal/templates/config/webhook/service.go
View file
File renamed without changes.
0 ...ernal/templates/controllers/controller.go → ...ernal/templates/controllers/controller.go
View file
File renamed without changes.
0 ...lates/controllers/controller_suitetest.go → ...lates/controllers/controller_suitetest.go
View file
File renamed without changes.
0 ...caffolds/internal/templates/dockerfile.go → ...caffolds/internal/templates/dockerfile.go
View file
File renamed without changes.
0 ...scaffolds/internal/templates/gitignore.go → ...scaffolds/internal/templates/gitignore.go
View file
File renamed without changes.
0 .../v2/scaffolds/internal/templates/gomod.go → .../v2/scaffolds/internal/templates/gomod.go
View file
File renamed without changes.
0 ...ds/internal/templates/hack/boilerplate.go → ...ds/internal/templates/hack/boilerplate.go
View file
File renamed without changes.
0 ...n/v2/scaffolds/internal/templates/main.go → ...g/v2/scaffolds/internal/templates/main.go
View file
File renamed without changes.
0 .../scaffolds/internal/templates/makefile.go → .../scaffolds/internal/templates/makefile.go
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions pkg/plugin/v2/scaffolds/webhook.go → pkg/plugins/golang/v2/scaffolds/webhook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"sigs.k8s.io/kubebuilder/v2/pkg/model"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/machinery"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/api"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds/internal/templates/api"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/machinery"
)

var _ cmdutil.Scaffolder = &webhookScaffolder{}
Expand Down
4 changes: 2 additions & 2 deletions pkg/plugin/v2/webhook.go → pkg/plugins/golang/v2/webhook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2/scaffolds"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
)

type createWebhookSubcommand struct {
Expand Down
6 changes: 3 additions & 3 deletions pkg/plugin/v3/api.go → pkg/plugins/golang/v3/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ import (
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/util"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/util"
"sigs.k8s.io/kubebuilder/v2/plugins/addon"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/plugin/v3/edit.go → pkg/plugins/golang/v3/edit.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (

"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
)

type editSubcommand struct {
Expand Down
6 changes: 3 additions & 3 deletions pkg/plugin/v3/init.go → pkg/plugins/golang/v3/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
"sigs.k8s.io/kubebuilder/v2/pkg/internal/validation"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/util"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/util"
)

type initSubcommand struct {
Expand Down
3 changes: 2 additions & 1 deletion pkg/plugin/v3/plugin.go → pkg/plugins/golang/v3/plugin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ package v3
import (
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins"
)

const pluginName = "go" + plugin.DefaultNameQualifier
const pluginName = "go" + plugins.DefaultNameQualifier

var (
supportedProjectVersions = []string{config.Version3Alpha}
Expand Down
18 changes: 9 additions & 9 deletions pkg/plugin/v3/scaffolds/api.go → pkg/plugins/golang/v3/scaffolds/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ import (
"sigs.k8s.io/kubebuilder/v2/pkg/model"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/machinery"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds/internal/templates"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds/internal/templates/api"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds/internal/templates/config/crd"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds/internal/templates/config/crd/patches"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds/internal/templates/config/rbac"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds/internal/templates/config/samples"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds/internal/templates/controllers"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds/internal/templates"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds/internal/templates/api"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds/internal/templates/config/crd"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds/internal/templates/config/crd/patches"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds/internal/templates/config/rbac"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds/internal/templates/config/samples"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds/internal/templates/controllers"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/machinery"
)

var _ cmdutil.Scaffolder = &apiScaffolder{}
Expand Down
0 pkg/plugin/v3/scaffolds/doc.go → pkg/plugins/golang/v3/scaffolds/doc.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/plugin/v3/scaffolds/edit.go → pkg/plugins/golang/v3/scaffolds/edit.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"strings"

"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
)

var _ cmdutil.Scaffolder = &editScaffolder{}
Expand Down
18 changes: 9 additions & 9 deletions pkg/plugin/v3/scaffolds/init.go → pkg/plugins/golang/v3/scaffolds/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ import (

"sigs.k8s.io/kubebuilder/v2/pkg/model"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/machinery"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds/internal/templates"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds/internal/templates/config/certmanager"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds/internal/templates/config/kdefault"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds/internal/templates/config/manager"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds/internal/templates/config/prometheus"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds/internal/templates/config/rbac"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds/internal/templates/hack"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds/internal/templates"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds/internal/templates/config/certmanager"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds/internal/templates/config/kdefault"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds/internal/templates/config/manager"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds/internal/templates/config/prometheus"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds/internal/templates/config/rbac"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds/internal/templates/hack"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/machinery"
)

const (
Expand Down
0 ...scaffolds/internal/templates/api/group.go → ...scaffolds/internal/templates/api/group.go
View file
File renamed without changes.
0 ...scaffolds/internal/templates/api/types.go → ...scaffolds/internal/templates/api/types.go
View file
File renamed without changes.
0 ...affolds/internal/templates/api/webhook.go → ...affolds/internal/templates/api/webhook.go
View file
File renamed without changes.
0 ...ternal/templates/api/webhook_suitetest.go → ...ternal/templates/api/webhook_suitetest.go
View file
File renamed without changes.
0 ...mplates/config/certmanager/certificate.go → ...mplates/config/certmanager/certificate.go
View file
File renamed without changes.
0 ...lates/config/certmanager/kustomization.go → ...lates/config/certmanager/kustomization.go
View file
File renamed without changes.
0 ...tes/config/certmanager/kustomizeconfig.go → ...tes/config/certmanager/kustomizeconfig.go
View file
File renamed without changes.
0 ...nal/templates/config/crd/kustomization.go → ...nal/templates/config/crd/kustomization.go
View file
File renamed without changes.
0 ...l/templates/config/crd/kustomizeconfig.go → ...l/templates/config/crd/kustomizeconfig.go
View file
File renamed without changes.
0 ...ig/crd/patches/enablecainjection_patch.go → ...ig/crd/patches/enablecainjection_patch.go
View file
File renamed without changes.
0 ...config/crd/patches/enablewebhook_patch.go → ...config/crd/patches/enablewebhook_patch.go
View file
File renamed without changes.
0 ...config/kdefault/enablecainection_patch.go → ...config/kdefault/enablecainection_patch.go
View file
File renamed without changes.
0 ...emplates/config/kdefault/kustomization.go → ...emplates/config/kdefault/kustomization.go
View file
File renamed without changes.
0 ...nfig/kdefault/manager_auth_proxy_patch.go → ...nfig/kdefault/manager_auth_proxy_patch.go
View file
File renamed without changes.
0 .../config/kdefault/webhook_manager_patch.go → .../config/kdefault/webhook_manager_patch.go
View file
File renamed without changes.
0 ...ternal/templates/config/manager/config.go → ...ternal/templates/config/manager/config.go
View file
File renamed without changes.
0 ...templates/config/manager/kustomization.go → ...templates/config/manager/kustomization.go
View file
File renamed without changes.
0 ...plates/config/prometheus/kustomization.go → ...plates/config/prometheus/kustomization.go
View file
File renamed without changes.
0 ...al/templates/config/prometheus/monitor.go → ...al/templates/config/prometheus/monitor.go
View file
File renamed without changes.
0 ...tes/config/rbac/auth_proxy_client_role.go → ...tes/config/rbac/auth_proxy_client_role.go
View file
File renamed without changes.
0 .../templates/config/rbac/auth_proxy_role.go → .../templates/config/rbac/auth_proxy_role.go
View file
File renamed without changes.
0 ...es/config/rbac/auth_proxy_role_binding.go → ...es/config/rbac/auth_proxy_role_binding.go
View file
File renamed without changes.
0 ...mplates/config/rbac/auth_proxy_service.go → ...mplates/config/rbac/auth_proxy_service.go
View file
File renamed without changes.
0 .../templates/config/rbac/crd_editor_role.go → .../templates/config/rbac/crd_editor_role.go
View file
File renamed without changes.
0 .../templates/config/rbac/crd_viewer_role.go → .../templates/config/rbac/crd_viewer_role.go
View file
File renamed without changes.
0 ...al/templates/config/rbac/kustomization.go → ...al/templates/config/rbac/kustomization.go
View file
File renamed without changes.
0 ...lates/config/rbac/leader_election_role.go → ...lates/config/rbac/leader_election_role.go
View file
File renamed without changes.
0 ...nfig/rbac/leader_election_role_binding.go → ...nfig/rbac/leader_election_role_binding.go
View file
File renamed without changes.
0 ...nal/templates/config/rbac/role_binding.go → ...nal/templates/config/rbac/role_binding.go
View file
File renamed without changes.
0 ...al/templates/config/samples/crd_sample.go → ...al/templates/config/samples/crd_sample.go
View file
File renamed without changes.
0 ...templates/config/webhook/kustomization.go → ...templates/config/webhook/kustomization.go
View file
File renamed without changes.
0 ...mplates/config/webhook/kustomizeconfig.go → ...mplates/config/webhook/kustomizeconfig.go
View file
File renamed without changes.
0 ...ernal/templates/config/webhook/service.go → ...ernal/templates/config/webhook/service.go
View file
File renamed without changes.
0 ...ernal/templates/controllers/controller.go → ...ernal/templates/controllers/controller.go
View file
File renamed without changes.
0 ...lates/controllers/controller_suitetest.go → ...lates/controllers/controller_suitetest.go
View file
File renamed without changes.
0 ...caffolds/internal/templates/dockerfile.go → ...caffolds/internal/templates/dockerfile.go
View file
File renamed without changes.
0 ...ffolds/internal/templates/dockerignore.go → ...ffolds/internal/templates/dockerignore.go
View file
File renamed without changes.
0 ...scaffolds/internal/templates/gitignore.go → ...scaffolds/internal/templates/gitignore.go
View file
File renamed without changes.
0 .../v3/scaffolds/internal/templates/gomod.go → .../v3/scaffolds/internal/templates/gomod.go
View file
File renamed without changes.
0 ...ds/internal/templates/hack/boilerplate.go → ...ds/internal/templates/hack/boilerplate.go
View file
File renamed without changes.
0 ...n/v3/scaffolds/internal/templates/main.go → ...g/v3/scaffolds/internal/templates/main.go
View file
File renamed without changes.
0 .../scaffolds/internal/templates/makefile.go → .../scaffolds/internal/templates/makefile.go
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions pkg/plugin/v3/scaffolds/webhook.go → pkg/plugins/golang/v3/scaffolds/webhook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import (
"sigs.k8s.io/kubebuilder/v2/pkg/model"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/machinery"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds/internal/templates"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds/internal/templates/api"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds/internal/templates/config/kdefault"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds/internal/templates/config/webhook"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds/internal/templates"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds/internal/templates/api"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds/internal/templates/config/kdefault"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds/internal/templates/config/webhook"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/machinery"
)

var _ cmdutil.Scaffolder = &webhookScaffolder{}
Expand Down
4 changes: 2 additions & 2 deletions pkg/plugin/v3/webhook.go → pkg/plugins/golang/v3/webhook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3/scaffolds"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3/scaffolds"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/cmdutil"
)

// defaultWebhookVersion is the default mutating/validating webhook config API version to scaffold.
Expand Down
0 pkg/plugin/internal/cmdutil/cmdutil.go → pkg/plugins/internal/cmdutil/cmdutil.go
View file
File renamed without changes.
0 pkg/plugin/internal/filesystem/errors.go → pkg/plugins/internal/filesystem/errors.go
View file
File renamed without changes.
0 ...plugin/internal/filesystem/errors_test.go → ...lugins/internal/filesystem/errors_test.go
View file
File renamed without changes.
0 pkg/plugin/internal/filesystem/filesystem.go → ...plugins/internal/filesystem/filesystem.go
View file
File renamed without changes.
0 ...in/internal/filesystem/filesystem_test.go → ...ns/internal/filesystem/filesystem_test.go
View file
File renamed without changes.
0 pkg/plugin/internal/filesystem/mock.go → pkg/plugins/internal/filesystem/mock.go
View file
File renamed without changes.
0 pkg/plugin/internal/filesystem/mock_test.go → pkg/plugins/internal/filesystem/mock_test.go
View file
File renamed without changes.
0 pkg/plugin/internal/machinery/errors.go → pkg/plugins/internal/machinery/errors.go
View file
File renamed without changes.
0 pkg/plugin/internal/machinery/errors_test.go → ...plugins/internal/machinery/errors_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/plugin/internal/machinery/scaffold.go → pkg/plugins/internal/machinery/scaffold.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

"sigs.k8s.io/kubebuilder/v2/pkg/model"
"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/filesystem"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/filesystem"
)

var options = imports.Options{
Expand Down
2 changes: 1 addition & 1 deletion ...lugin/internal/machinery/scaffold_test.go → ...ugins/internal/machinery/scaffold_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"sigs.k8s.io/kubebuilder/v2/pkg/model"
"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/filesystem"
"sigs.k8s.io/kubebuilder/v2/pkg/plugins/internal/filesystem"
)

func TestScaffold(t *testing.T) {
Expand Down
0 pkg/plugin/internal/util/exec.go → pkg/plugins/internal/util/exec.go
View file
File renamed without changes.
0 pkg/plugin/internal/util/go_version.go → pkg/plugins/internal/util/go_version.go
View file
File renamed without changes.
0 pkg/plugin/internal/util/go_version_test.go → pkg/plugins/internal/util/go_version_test.go
View file
File renamed without changes.
0 pkg/plugin/internal/util/repository.go → pkg/plugins/internal/util/repository.go
View file
File renamed without changes.
0 pkg/plugin/internal/util/stdin.go → pkg/plugins/internal/util/stdin.go
View file
File renamed without changes.

0 comments on commit 34af697

Please sign in to comment.