Merge pull request #2007 from camilamacedo86/v2intorelease-2

:seeding: rebase v2 into release-2
kubernetes-sigs · Feb 16, 2021 · 5da27b8 · 5da27b8
2 parents 8b53abe + 1c598b4
commit 5da27b8
Show file tree

Hide file tree

Showing 249 changed files with 308 additions and 305 deletions.
diff --git a/build/.goreleaser.yml b/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

diff --git a/cmd/api.go b/cmd/api.go
@@ -29,12 +29,12 @@ import (
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
 
-	"sigs.k8s.io/kubebuilder/cmd/internal"
-	"sigs.k8s.io/kubebuilder/internal/config"
-	"sigs.k8s.io/kubebuilder/pkg/model"
-	"sigs.k8s.io/kubebuilder/pkg/model/resource"
-	"sigs.k8s.io/kubebuilder/pkg/scaffold"
-	"sigs.k8s.io/kubebuilder/plugins/addon"
+	"sigs.k8s.io/kubebuilder/v2/cmd/internal"
+	"sigs.k8s.io/kubebuilder/v2/internal/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
+	"sigs.k8s.io/kubebuilder/v2/pkg/scaffold"
+	"sigs.k8s.io/kubebuilder/v2/plugins/addon"
 )
 
 type apiError struct {

diff --git a/cmd/edit.go b/cmd/edit.go
@@ -24,8 +24,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"sigs.k8s.io/kubebuilder/internal/config"
-	"sigs.k8s.io/kubebuilder/pkg/scaffold"
+	"sigs.k8s.io/kubebuilder/v2/internal/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/scaffold"
 )
 
 type editError struct {

diff --git a/cmd/init.go b/cmd/init.go
@@ -29,9 +29,9 @@ import (
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
 
-	"sigs.k8s.io/kubebuilder/cmd/internal"
-	"sigs.k8s.io/kubebuilder/internal/config"
-	"sigs.k8s.io/kubebuilder/pkg/scaffold"
+	"sigs.k8s.io/kubebuilder/v2/cmd/internal"
+	"sigs.k8s.io/kubebuilder/v2/internal/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/scaffold"
 )
 
 type initError struct {

diff --git a/cmd/internal/config.go b/cmd/internal/config.go
@@ -21,7 +21,7 @@ import (
 	"log"
 	"os"
 
-	"sigs.k8s.io/kubebuilder/internal/config"
+	"sigs.k8s.io/kubebuilder/v2/internal/config"
 )
 
 const (

diff --git a/cmd/main.go b/cmd/main.go
@@ -21,10 +21,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"sigs.k8s.io/kubebuilder/cmd/internal"
-	"sigs.k8s.io/kubebuilder/cmd/version"
-	"sigs.k8s.io/kubebuilder/internal/config"
-	"sigs.k8s.io/kubebuilder/pkg/scaffold"
+	"sigs.k8s.io/kubebuilder/v2/cmd/internal"
+	"sigs.k8s.io/kubebuilder/v2/cmd/version"
+	"sigs.k8s.io/kubebuilder/v2/internal/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/scaffold"
 )
 
 // commandOptions represent the types used to implement the different commands

diff --git a/cmd/update.go b/cmd/update.go
@@ -24,8 +24,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"sigs.k8s.io/kubebuilder/internal/config"
-	"sigs.k8s.io/kubebuilder/pkg/scaffold"
+	"sigs.k8s.io/kubebuilder/v2/internal/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/scaffold"
 )
 
 type updateError struct {

diff --git a/cmd/webhook.go b/cmd/webhook.go
@@ -26,10 +26,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"sigs.k8s.io/kubebuilder/cmd/internal"
-	"sigs.k8s.io/kubebuilder/internal/config"
-	"sigs.k8s.io/kubebuilder/pkg/model/resource"
-	"sigs.k8s.io/kubebuilder/pkg/scaffold"
+	"sigs.k8s.io/kubebuilder/v2/cmd/internal"
+	"sigs.k8s.io/kubebuilder/v2/internal/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
+	"sigs.k8s.io/kubebuilder/v2/pkg/scaffold"
 )
 
 type webhookError struct {

diff --git a/common.sh b/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

diff --git a/generate_testdata.sh b/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
 }
 
 
@@ -103,6 +103,9 @@ scaffold_test_project() {
             header_text 'initializing  project-v2-addon ...'
             $kb init --project-version $version --domain testproject.org --license apache2 --owner "The Kubernetes authors"
 
+            # pin the version of the declarative pattern to make tests pass
+            go get sigs.k8s.io/kubebuilder-declarative-pattern@v0.0.0-20200317144824-bbf1fb2a4a9a
+
             header_text 'enableling --pattern flag ...'
             export KUBEBUILDER_ENABLE_PLUGINS=1
             header_text 'Creating APIs ...'

diff --git a/generate_vendor.sh b/generate_vendor.sh
@@ -34,7 +34,7 @@ fi
 
 build_kb() {
 	rm -f /tmp/kb && \
-	GO111MODULE=on go build -o /tmp/kb sigs.k8s.io/kubebuilder/cmd
+	GO111MODULE=on go build -o /tmp/kb sigs.k8s.io/kubebuilder/v2/cmd
 }
 
 

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.13
 

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -22,7 +22,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"sigs.k8s.io/kubebuilder/pkg/model/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
 	"sigs.k8s.io/yaml"
 )
 

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
@@ -26,7 +26,7 @@ import (
 
 	"github.com/gobuffalo/flect"
 
-	"sigs.k8s.io/kubebuilder/pkg/model/config"
+	"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/scaffold/api.go b/pkg/scaffold/api.go
@@ -19,15 +19,15 @@ package scaffold
 import (
 	"fmt"
 
-	"sigs.k8s.io/kubebuilder/internal/config"
-	"sigs.k8s.io/kubebuilder/pkg/model"
-	"sigs.k8s.io/kubebuilder/pkg/model/resource"
-	"sigs.k8s.io/kubebuilder/pkg/scaffold/internal/machinery"
-	controllerv1 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v1/controller"
-	crdv1 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v1/crd"
-	templatesv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2"
-	controllerv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/controller"
-	crdv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/crd"
+	"sigs.k8s.io/kubebuilder/v2/internal/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
+	"sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/machinery"
+	controllerv1 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v1/controller"
+	crdv1 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v1/crd"
+	templatesv2 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v2"
+	controllerv2 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v2/controller"
+	crdv2 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v2/crd"
 )
 
 var _ Scaffolder = &apiScaffolder{}

diff --git a/pkg/scaffold/edit.go b/pkg/scaffold/edit.go
@@ -17,7 +17,7 @@ limitations under the License.
 package scaffold
 
 import (
-	"sigs.k8s.io/kubebuilder/internal/config"
+	"sigs.k8s.io/kubebuilder/v2/internal/config"
 )
 
 var _ Scaffolder = &editScaffolder{}

diff --git a/pkg/scaffold/init.go b/pkg/scaffold/init.go
@@ -21,18 +21,18 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
-	"sigs.k8s.io/kubebuilder/internal/config"
-	"sigs.k8s.io/kubebuilder/pkg/model"
-	"sigs.k8s.io/kubebuilder/pkg/scaffold/internal/machinery"
-	templatesv1 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v1"
-	managerv1 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v1/manager"
-	metricsauthv1 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v1/metricsauth"
-	templatesv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2"
-	certmanagerv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/certmanager"
-	managerv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/manager"
-	metricsauthv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/metricsauth"
-	prometheusv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/prometheus"
-	webhookv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/webhook"
+	"sigs.k8s.io/kubebuilder/v2/internal/config"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model"
+	"sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/machinery"
+	templatesv1 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v1"
+	managerv1 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v1/manager"
+	metricsauthv1 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v1/metricsauth"
+	templatesv2 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v2"
+	certmanagerv2 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v2/certmanager"
+	managerv2 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v2/manager"
+	metricsauthv2 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v2/metricsauth"
+	prometheusv2 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v2/prometheus"
+	webhookv2 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v2/webhook"
 )
 
 const (

diff --git a/pkg/scaffold/internal/machinery/scaffold.go b/pkg/scaffold/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/scaffold/internal/filesystem"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
+	"sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/filesystem"
 )
 
 var options = imports.Options{

diff --git a/pkg/scaffold/internal/machinery/scaffold_test.go b/pkg/scaffold/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/scaffold/internal/filesystem"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
+	"sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/filesystem"
 )
 
 func TestScaffold(t *testing.T) {

diff --git a/pkg/scaffold/internal/templates/v1/authproxyrole.go b/pkg/scaffold/internal/templates/v1/authproxyrole.go
@@ -19,7 +19,7 @@ package v1
 import (
 	"path/filepath"
 
-	"sigs.k8s.io/kubebuilder/pkg/model/file"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
 )
 
 var _ file.Template = &AuthProxyRole{}

diff --git a/pkg/scaffold/internal/templates/v1/authproxyrolebinding.go b/pkg/scaffold/internal/templates/v1/authproxyrolebinding.go
@@ -19,7 +19,7 @@ package v1
 import (
 	"path/filepath"
 
-	"sigs.k8s.io/kubebuilder/pkg/model/file"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
 )
 
 var _ file.Template = &AuthProxyRoleBinding{}

diff --git a/pkg/scaffold/internal/templates/v1/authproxyservice.go b/pkg/scaffold/internal/templates/v1/authproxyservice.go
@@ -19,7 +19,7 @@ package v1
 import (
 	"path/filepath"
 
-	"sigs.k8s.io/kubebuilder/pkg/model/file"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
 )
 
 var _ file.Template = &AuthProxyService{}

diff --git a/pkg/scaffold/internal/templates/v1/boilerplate.go b/pkg/scaffold/internal/templates/v1/boilerplate.go
@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"sigs.k8s.io/kubebuilder/pkg/model/file"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
 )
 
 var _ file.Template = &Boilerplate{}

diff --git a/pkg/scaffold/internal/templates/v1/controller/add.go b/pkg/scaffold/internal/templates/v1/controller/add.go
@@ -19,7 +19,7 @@ package controller
 import (
 	"path/filepath"
 
-	"sigs.k8s.io/kubebuilder/pkg/model/file"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
 )
 
 var _ file.Template = &AddController{}

diff --git a/pkg/scaffold/internal/templates/v1/controller/controller.go b/pkg/scaffold/internal/templates/v1/controller/controller.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"sigs.k8s.io/kubebuilder/pkg/model/file"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
 )
 
 var _ file.Template = &Controller{}

diff --git a/pkg/scaffold/internal/templates/v1/controller/controllersuitetest.go b/pkg/scaffold/internal/templates/v1/controller/controllersuitetest.go
@@ -19,7 +19,7 @@ package controller
 import (
 	"path/filepath"
 
-	"sigs.k8s.io/kubebuilder/pkg/model/file"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
 )
 
 var _ file.Template = &SuiteTest{}

diff --git a/pkg/scaffold/internal/templates/v1/controller/controllertest.go b/pkg/scaffold/internal/templates/v1/controller/controllertest.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"sigs.k8s.io/kubebuilder/pkg/model/file"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
 )
 
 var _ file.Template = &Test{}

diff --git a/pkg/scaffold/internal/templates/v1/crd/addtoscheme.go b/pkg/scaffold/internal/templates/v1/crd/addtoscheme.go
@@ -19,7 +19,7 @@ package crd
 import (
 	"path/filepath"
 
-	"sigs.k8s.io/kubebuilder/pkg/model/file"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
 )
 
 var _ file.Template = &AddToScheme{}