Go module fullfillment for v2+

Signed-off-by: Adrian Orive <adrian.orive.oneca@gmail.com>
kubernetes-sigs · Nov 5, 2020 · 47e880b · 47e880b
1 parent 0149acd
commit 47e880b
Show file tree

Hide file tree

Showing 134 changed files with 269 additions and 269 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -19,10 +19,10 @@ package main
 import (
 	"log"
 
-	"sigs.k8s.io/kubebuilder/cmd/version"
-	"sigs.k8s.io/kubebuilder/pkg/cli"
-	pluginv2 "sigs.k8s.io/kubebuilder/pkg/plugin/v2"
-	pluginv3 "sigs.k8s.io/kubebuilder/pkg/plugin/v3"
+	"sigs.k8s.io/kubebuilder/v2/cmd/version"
+	"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"
 )
 
 func main() {

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module sigs.k8s.io/kubebuilder
+module sigs.k8s.io/kubebuilder/v2
 
 go 1.15
 

diff --git a/internal/cmdutil/cmdutil.go b/internal/cmdutil/cmdutil.go
@@ -17,7 +17,7 @@ limitations under the License.
 package cmdutil
 
 import (
-	"sigs.k8s.io/kubebuilder/pkg/plugin/scaffold"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin/scaffold"
 )
 
 // RunOptions represent the types used to implement the different commands

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/spf13/afero"
 
-	"sigs.k8s.io/kubebuilder/pkg/model/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
 )
 
 const (

diff --git a/internal/config/config_test.go b/internal/config/config_test.go
@@ -23,7 +23,7 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/spf13/afero"
 
-	"sigs.k8s.io/kubebuilder/pkg/model/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
 )
 
 var _ = Describe("Config", func() {

diff --git a/pkg/cli/api.go b/pkg/cli/api.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"sigs.k8s.io/kubebuilder/internal/config"
-	"sigs.k8s.io/kubebuilder/pkg/plugin"
+	"sigs.k8s.io/kubebuilder/v2/internal/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
 )
 
 func (c *cli) newCreateAPICmd() *cobra.Command {

diff --git a/pkg/cli/cli.go b/pkg/cli/cli.go
@@ -25,10 +25,10 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	internalconfig "sigs.k8s.io/kubebuilder/internal/config"
-	"sigs.k8s.io/kubebuilder/pkg/internal/validation"
-	"sigs.k8s.io/kubebuilder/pkg/model/config"
-	"sigs.k8s.io/kubebuilder/pkg/plugin"
+	internalconfig "sigs.k8s.io/kubebuilder/v2/internal/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/internal/validation"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
 )
 
 const (

diff --git a/pkg/cli/cli_test.go b/pkg/cli/cli_test.go
@@ -24,9 +24,9 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	internalconfig "sigs.k8s.io/kubebuilder/internal/config"
-	"sigs.k8s.io/kubebuilder/pkg/model/config"
-	"sigs.k8s.io/kubebuilder/pkg/plugin"
+	internalconfig "sigs.k8s.io/kubebuilder/v2/internal/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
 )
 
 // Test plugin types and constructors.

diff --git a/pkg/cli/cmd_helpers.go b/pkg/cli/cmd_helpers.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"sigs.k8s.io/kubebuilder/internal/config"
-	"sigs.k8s.io/kubebuilder/pkg/plugin"
+	"sigs.k8s.io/kubebuilder/v2/internal/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
 )
 
 // cmdErr updates a cobra command to output error information when executed

diff --git a/pkg/cli/edit.go b/pkg/cli/edit.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"sigs.k8s.io/kubebuilder/internal/config"
-	"sigs.k8s.io/kubebuilder/pkg/plugin"
+	"sigs.k8s.io/kubebuilder/v2/internal/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
 )
 
 func (c *cli) newEditCmd() *cobra.Command {

diff --git a/pkg/cli/init.go b/pkg/cli/init.go
@@ -26,9 +26,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	internalconfig "sigs.k8s.io/kubebuilder/internal/config"
-	"sigs.k8s.io/kubebuilder/pkg/model/config"
-	"sigs.k8s.io/kubebuilder/pkg/plugin"
+	internalconfig "sigs.k8s.io/kubebuilder/v2/internal/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
 )
 
 func (c *cli) newInitCmd() *cobra.Command {

diff --git a/pkg/cli/plugins.go b/pkg/cli/plugins.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"sort"
 
-	"sigs.k8s.io/kubebuilder/pkg/internal/validation"
-	"sigs.k8s.io/kubebuilder/pkg/plugin"
+	"sigs.k8s.io/kubebuilder/v2/pkg/internal/validation"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
 )
 
 // errAmbiguousPlugin should be returned when an ambiguous plugin key is

diff --git a/pkg/cli/plugins_test.go b/pkg/cli/plugins_test.go
@@ -22,7 +22,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"sigs.k8s.io/kubebuilder/pkg/plugin"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
 )
 
 var _ = Describe("resolvePluginsByKey", func() {

diff --git a/pkg/cli/webhook.go b/pkg/cli/webhook.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"sigs.k8s.io/kubebuilder/internal/config"
-	"sigs.k8s.io/kubebuilder/pkg/plugin"
+	"sigs.k8s.io/kubebuilder/v2/internal/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
 )
 
 func (c *cli) newCreateWebhookCmd() *cobra.Command {

diff --git a/pkg/model/file/interfaces.go b/pkg/model/file/interfaces.go
@@ -19,7 +19,7 @@ package file
 import (
 	"text/template"
 
-	"sigs.k8s.io/kubebuilder/pkg/model/resource"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
 )
 
 // Builder defines the basic methods that any file builder must implement

diff --git a/pkg/model/file/mixins.go b/pkg/model/file/mixins.go
@@ -17,7 +17,7 @@ limitations under the License.
 package file
 
 import (
-	"sigs.k8s.io/kubebuilder/pkg/model/resource"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
 )
 
 // PathMixin provides file builders with a path field

diff --git a/pkg/model/resource/options.go b/pkg/model/resource/options.go
@@ -24,8 +24,8 @@ import (
 
 	"github.com/gobuffalo/flect"
 
-	"sigs.k8s.io/kubebuilder/pkg/internal/validation"
-	"sigs.k8s.io/kubebuilder/pkg/model/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/internal/validation"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
 )
 
 const (

diff --git a/pkg/model/resource/options_test.go b/pkg/model/resource/options_test.go
@@ -7,7 +7,7 @@ import (
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
 
-	. "sigs.k8s.io/kubebuilder/pkg/model/resource"
+	. "sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
 )
 
 var _ = Describe("Resource Options", func() {

diff --git a/pkg/model/resource/resource.go b/pkg/model/resource/resource.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"sigs.k8s.io/kubebuilder/pkg/model/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
 )
 
 // Resource contains the information required to scaffold files for a resource.

diff --git a/pkg/model/resource/resource_test.go b/pkg/model/resource/resource_test.go
@@ -22,8 +22,8 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"sigs.k8s.io/kubebuilder/pkg/model/config"
-	. "sigs.k8s.io/kubebuilder/pkg/model/resource"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
+	. "sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
 )
 
 var _ = Describe("Resource", func() {

diff --git a/pkg/model/universe.go b/pkg/model/universe.go
@@ -17,9 +17,9 @@ limitations under the License.
 package model
 
 import (
-	"sigs.k8s.io/kubebuilder/pkg/model/config"
-	"sigs.k8s.io/kubebuilder/pkg/model/file"
-	"sigs.k8s.io/kubebuilder/pkg/model/resource"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
 )
 
 // Universe describes the entire state of file generation

diff --git a/pkg/plugin/helpers.go b/pkg/plugin/helpers.go
@@ -21,7 +21,7 @@ import (
 	"path"
 	"strings"
 
-	"sigs.k8s.io/kubebuilder/pkg/internal/validation"
+	"sigs.k8s.io/kubebuilder/v2/pkg/internal/validation"
 )
 
 // DefaultNameQualifier is the suffix appended to all kubebuilder plugin names.

diff --git a/pkg/plugin/interfaces.go b/pkg/plugin/interfaces.go
@@ -19,7 +19,7 @@ package plugin
 import (
 	"github.com/spf13/pflag"
 
-	"sigs.k8s.io/kubebuilder/pkg/model/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
 )
 
 // Plugin is an interface that defines the common base for all plugins

diff --git a/pkg/plugin/internal/machinery/errors.go b/pkg/plugin/internal/machinery/errors.go
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"fmt"
 
-	"sigs.k8s.io/kubebuilder/pkg/model/file"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
 )
 
 // This file contains the errors returned by the scaffolding machinery

diff --git a/pkg/plugin/internal/machinery/scaffold.go b/pkg/plugin/internal/machinery/scaffold.go
@@ -27,9 +27,9 @@ import (
 
 	"golang.org/x/tools/imports"
 
-	"sigs.k8s.io/kubebuilder/pkg/model"
-	"sigs.k8s.io/kubebuilder/pkg/model/file"
-	"sigs.k8s.io/kubebuilder/pkg/plugin/internal/filesystem"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/filesystem"
 )
 
 var options = imports.Options{

diff --git a/pkg/plugin/internal/machinery/scaffold_test.go b/pkg/plugin/internal/machinery/scaffold_test.go
@@ -23,9 +23,9 @@ import (
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
 
-	"sigs.k8s.io/kubebuilder/pkg/model"
-	"sigs.k8s.io/kubebuilder/pkg/model/file"
-	"sigs.k8s.io/kubebuilder/pkg/plugin/internal/filesystem"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/filesystem"
 )
 
 func TestScaffold(t *testing.T) {

diff --git a/pkg/plugin/v2/api.go b/pkg/plugin/v2/api.go
@@ -27,15 +27,15 @@ import (
 
 	"github.com/spf13/pflag"
 
-	"sigs.k8s.io/kubebuilder/internal/cmdutil"
-	"sigs.k8s.io/kubebuilder/pkg/model"
-	"sigs.k8s.io/kubebuilder/pkg/model/config"
-	"sigs.k8s.io/kubebuilder/pkg/model/resource"
-	"sigs.k8s.io/kubebuilder/pkg/plugin"
-	"sigs.k8s.io/kubebuilder/pkg/plugin/internal/util"
-	"sigs.k8s.io/kubebuilder/pkg/plugin/scaffold"
-	"sigs.k8s.io/kubebuilder/pkg/plugin/v2/scaffolds"
-	"sigs.k8s.io/kubebuilder/plugins/addon"
+	"sigs.k8s.io/kubebuilder/v2/internal/cmdutil"
+	"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"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/util"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin/scaffold"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds"
+	"sigs.k8s.io/kubebuilder/v2/plugins/addon"
 )
 
 type createAPISubcommand struct {

diff --git a/pkg/plugin/v2/edit.go b/pkg/plugin/v2/edit.go
@@ -21,11 +21,11 @@ import (
 
 	"github.com/spf13/pflag"
 
-	"sigs.k8s.io/kubebuilder/internal/cmdutil"
-	"sigs.k8s.io/kubebuilder/pkg/model/config"
-	"sigs.k8s.io/kubebuilder/pkg/plugin"
-	"sigs.k8s.io/kubebuilder/pkg/plugin/scaffold"
-	"sigs.k8s.io/kubebuilder/pkg/plugin/v2/scaffolds"
+	"sigs.k8s.io/kubebuilder/v2/internal/cmdutil"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin/scaffold"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds"
 )
 
 type editSubcommand struct {

diff --git a/pkg/plugin/v2/init.go b/pkg/plugin/v2/init.go
@@ -24,13 +24,13 @@ import (
 
 	"github.com/spf13/pflag"
 
-	"sigs.k8s.io/kubebuilder/internal/cmdutil"
-	"sigs.k8s.io/kubebuilder/pkg/internal/validation"
-	"sigs.k8s.io/kubebuilder/pkg/model/config"
-	"sigs.k8s.io/kubebuilder/pkg/plugin"
-	"sigs.k8s.io/kubebuilder/pkg/plugin/internal/util"
-	"sigs.k8s.io/kubebuilder/pkg/plugin/scaffold"
-	"sigs.k8s.io/kubebuilder/pkg/plugin/v2/scaffolds"
+	"sigs.k8s.io/kubebuilder/v2/internal/cmdutil"
+	"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/util"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin/scaffold"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds"
 )
 
 type initSubcommand struct {

diff --git a/pkg/plugin/v2/plugin.go b/pkg/plugin/v2/plugin.go
@@ -17,8 +17,8 @@ limitations under the License.
 package v2
 
 import (
-	"sigs.k8s.io/kubebuilder/pkg/model/config"
-	"sigs.k8s.io/kubebuilder/pkg/plugin"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
 )
 
 const pluginName = "go" + plugin.DefaultNameQualifier

diff --git a/pkg/plugin/v2/scaffolds/api.go b/pkg/plugin/v2/scaffolds/api.go
@@ -19,18 +19,18 @@ package scaffolds
 import (
 	"fmt"
 
-	"sigs.k8s.io/kubebuilder/pkg/model"
-	"sigs.k8s.io/kubebuilder/pkg/model/config"
-	"sigs.k8s.io/kubebuilder/pkg/model/resource"
-	"sigs.k8s.io/kubebuilder/pkg/plugin/internal/machinery"
-	"sigs.k8s.io/kubebuilder/pkg/plugin/scaffold"
-	"sigs.k8s.io/kubebuilder/pkg/plugin/v2/scaffolds/internal/templates"
-	"sigs.k8s.io/kubebuilder/pkg/plugin/v2/scaffolds/internal/templates/api"
-	"sigs.k8s.io/kubebuilder/pkg/plugin/v2/scaffolds/internal/templates/config/crd"
-	"sigs.k8s.io/kubebuilder/pkg/plugin/v2/scaffolds/internal/templates/config/crd/patches"
-	"sigs.k8s.io/kubebuilder/pkg/plugin/v2/scaffolds/internal/templates/config/rbac"
-	"sigs.k8s.io/kubebuilder/pkg/plugin/v2/scaffolds/internal/templates/config/samples"
-	"sigs.k8s.io/kubebuilder/pkg/plugin/v2/scaffolds/internal/templates/controllers"
+	"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/machinery"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin/scaffold"
+	"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"
 )
 
 // KbDeclarativePattern is the sigs.k8s.io/kubebuilder-declarative-pattern version

diff --git a/pkg/plugin/v2/scaffolds/edit.go b/pkg/plugin/v2/scaffolds/edit.go
@@ -21,8 +21,8 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"sigs.k8s.io/kubebuilder/pkg/model/config"
-	"sigs.k8s.io/kubebuilder/pkg/plugin/scaffold"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/plugin/scaffold"
 )
 
 var _ scaffold.Scaffolder = &editScaffolder{}