Go module fullfillment for v2+

Signed-off-by: Adrian Orive <[email protected]>

Author: Adirio

build/.goreleaser.yml

@@ -17,7 +17,7 @@
 builds:
 - main: ./cmd
   binary: kubebuilder
-  ldflags: -s -X sigs.k8s.io/kubebuilder/cmd/version.kubeBuilderVersion={{.Version}} -X sigs.k8s.io/kubebuilder/cmd/version.gitCommit={{.Commit}} -X sigs.k8s.io/kubebuilder/cmd/version.buildDate={{.Date}} -X sigs.k8s.io/kubebuilder/cmd/version.kubernetesVendorVersion={{.Env.KUBERNETES_VERSION}}
+  ldflags: -s -X sigs.k8s.io/kubebuilder/v2/cmd/version.kubeBuilderVersion={{.Version}} -X sigs.k8s.io/kubebuilder/v2/cmd/version.gitCommit={{.Commit}} -X sigs.k8s.io/kubebuilder/v2/cmd/version.buildDate={{.Date}} -X sigs.k8s.io/kubebuilder/v2/cmd/version.kubernetesVendorVersion={{.Env.KUBERNETES_VERSION}}
   goos:
    - darwin
    - linux

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() {

common.sh

@@ -149,7 +149,7 @@ function build_kb {
     opts=""
   else
     # TODO: what does this thing do.
-    opts=-ldflags "-X sigs.k8s.io/kubebuilder/cmd/version.kubeBuilderVersion=$INJECT_KB_VERSION"
+    opts=-ldflags "-X sigs.k8s.io/kubebuilder/v2/cmd/version.kubeBuilderVersion=$INJECT_KB_VERSION"
   fi
 
   GO111MODULE=on go build $opts -o $tmp_root/kubebuilder/bin/kubebuilder ./cmd

generate_testdata.sh

@@ -19,7 +19,7 @@ set -e
 source common.sh
 
 build_kb() {
-    go build -o ./bin/kubebuilder sigs.k8s.io/kubebuilder/cmd
+    go build -o ./bin/kubebuilder sigs.k8s.io/kubebuilder/v2/cmd
 }
 
 

go.mod

@@ -1,4 +1,4 @@
-module sigs.k8s.io/kubebuilder
+module sigs.k8s.io/kubebuilder/v2
 
 go 1.15
 

pkg/cli/api.go

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

pkg/cli/cli.go

@@ -25,10 +25,10 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	internalconfig "sigs.k8s.io/kubebuilder/pkg/cli/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/pkg/cli/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 (

pkg/cli/cli_test.go

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

pkg/cli/cmd_helpers.go

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

pkg/cli/edit.go

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