Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⚠ Re-organize pkg/plugin directory #1822

Merged
merged 1 commit into from
Nov 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/main.go
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
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
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
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
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
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
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
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
File renamed without changes.
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
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
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
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
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
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
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
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
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
File renamed without changes.
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
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
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
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
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
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
File renamed without changes.
File renamed without changes.