Merge pull request #624 from yue9944882/refactor/bump-v2

Bump apiserver-builder to v2
kubernetes-sigs · Apr 3, 2022 · e8140aa · e8140aa
2 parents 326a01b + 8a84532
commit e8140aa
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ same capabilities when building from scratch.
 ##### Install by Go Get
 
 ```bash
-GO111MODULE=on go get sigs.k8s.io/apiserver-builder-alpha/cmd/apiserver-boot
+go install sigs.k8s.io/apiserver-builder-alpha/v2/cmd/apiserver-boot@v2.0.0
 ```
 
 ##### Manual Download

diff --git a/cmd/apiserver-boot/main.go b/cmd/apiserver-boot/main.go
@@ -19,12 +19,12 @@ package main
 import (
 	"github.com/spf13/cobra"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/build"
-	"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/create"
-	"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/init_repo"
-	"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/run"
-	"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/show"
-	"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/version"
+	"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/build"
+	"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/create"
+	"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/init_repo"
+	"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/run"
+	"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/show"
+	"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/version"
 )
 
 func main() {

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module sigs.k8s.io/apiserver-builder-alpha
+module sigs.k8s.io/apiserver-builder-alpha/v2
 
 go 1.17
 

diff --git a/pkg/boot/build/build_container.go b/pkg/boot/build/build_container.go
@@ -23,7 +23,7 @@ import (
 	"github.com/spf13/cobra"
 	"io/ioutil"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/util"
+	"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/util"
 )
 
 var Image string

diff --git a/pkg/boot/build/build_resource_config.go b/pkg/boot/build/build_resource_config.go
@@ -31,7 +31,7 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/util"
+	"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/util"
 )
 
 var Name, Namespace string

diff --git a/pkg/boot/create/group.go b/pkg/boot/create/group.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/util"
+	"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/util"
 )
 
 var createGroupCmd = &cobra.Command{

diff --git a/pkg/boot/create/resource.go b/pkg/boot/create/resource.go
@@ -27,7 +27,7 @@ import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/util"
+	"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/util"
 	config "sigs.k8s.io/kubebuilder/v3/pkg/config/v3"
 	"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
 	"sigs.k8s.io/kubebuilder/v3/pkg/model/resource"

diff --git a/pkg/boot/create/subresource.go b/pkg/boot/create/subresource.go
@@ -27,7 +27,7 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/util"
+	"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/util"
 )
 
 var subresourceName string

diff --git a/pkg/boot/create/util.go b/pkg/boot/create/util.go
@@ -29,7 +29,7 @@ import (
 	"github.com/spf13/cobra"
 	utilvalidation "k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/util"
+	"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/util"
 )
 
 func ValidateResourceFlags() {

diff --git a/pkg/boot/create/version.go b/pkg/boot/create/version.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/util"
+	"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/util"
 )
 
 var versionName string

diff --git a/pkg/boot/init_repo/repo.go b/pkg/boot/init_repo/repo.go
@@ -23,7 +23,7 @@ import (
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/util"
+	"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/util"
 	config "sigs.k8s.io/kubebuilder/v3/pkg/config/v3"
 	"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds"

diff --git a/pkg/boot/run/in_cluster.go b/pkg/boot/run/in_cluster.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/build"
-	"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/util"
+	"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/build"
+	"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/util"
 )
 
 var runInClusterCmd = &cobra.Command{

diff --git a/pkg/boot/run/local.go b/pkg/boot/run/local.go
@@ -29,8 +29,8 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/build"
-	"sigs.k8s.io/apiserver-builder-alpha/pkg/boot/util"
+	"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/build"
+	"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/boot/util"
 )
 
 var localCmd = &cobra.Command{

diff --git a/pkg/boot/show/cmd_apiserver.go b/pkg/boot/show/cmd_apiserver.go
@@ -14,7 +14,7 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
-	"sigs.k8s.io/apiserver-builder-alpha/pkg/utils"
+	"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/utils"
 )
 
 var showApiserverCmd = &cobra.Command{

diff --git a/pkg/boot/show/cmd_resource.go b/pkg/boot/show/cmd_resource.go
@@ -20,7 +20,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
 	"k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
-	"sigs.k8s.io/apiserver-builder-alpha/pkg/utils"
+	"sigs.k8s.io/apiserver-builder-alpha/v2/pkg/utils"
 )
 
 var showResourceCmd = &cobra.Command{