diff --git a/.travis.yml b/.travis.yml index 4b32021303..02cf00f602 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ go: git: depth: 3 -go_import_path: github.com/kubernetes-sigs/kubebuilder +go_import_path: sigs.k8s.io/kubebuilder before_install: - go get -u github.com/golang/dep/cmd/dep diff --git a/BUILD.bazel b/BUILD.bazel index cd0e470a48..859f9eb681 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -18,7 +18,7 @@ load("@io_bazel_rules_go//go:def.bzl", "gazelle") gazelle( name = "gazelle", command = "fix", - prefix = "github.com/kubernetes-sigs/kubebuilder", + prefix = "sigs.k8s.io/kubebuilder", external = "vendored", args = [ "-build_file_name", diff --git a/README.md b/README.md index c66768af31..b8031932b0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Build Status](https://travis-ci.org/kubernetes-sigs/kubebuilder.svg?branch=master)](https://travis-ci.org/kubernetes-sigs/kubebuilder "Travis") -[![Go Report Card](https://goreportcard.com/badge/github.com/kubernetes-sigs/kubebuilder)](https://goreportcard.com/report/github.com/kubernetes-sigs/kubebuilder) +[![Go Report Card](https://goreportcard.com/badge/sigs.k8s.io/kubebuilder)](https://goreportcard.com/report/sigs.k8s.io/kubebuilder) ## Kubebuilder diff --git a/build/.goreleaser.yml b/build/.goreleaser.yml index 135b8c7fa3..0d0b8d86f5 100644 --- a/build/.goreleaser.yml +++ b/build/.goreleaser.yml @@ -3,7 +3,7 @@ builds: - main: ./cmd/kubebuilder binary: kubebuilder - ldflags: -s -X github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder/version.kubeBuilderVersion={{.Version}} -X github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder/version.gitCommit={{.Commit}} -X github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder/version.buildDate={{.Date}} -X github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder/version.kubernetesVendorVersion={{.Env.KUBERNETES_VERSION}} + ldflags: -s -X sigs.k8s.io/kubebuilder/cmd/kubebuilder/version.kubeBuilderVersion={{.Version}} -X sigs.k8s.io/kubebuilder/cmd/kubebuilder/version.gitCommit={{.Commit}} -X sigs.k8s.io/kubebuilder/cmd/kubebuilder/version.buildDate={{.Date}} -X sigs.k8s.io/kubebuilder/cmd/kubebuilder/version.kubernetesVendorVersion={{.Env.KUBERNETES_VERSION}} goos: - darwin - linux diff --git a/build/build_kubebuilder.sh b/build/build_kubebuilder.sh index 068a259310..fd7e024ff1 100644 --- a/build/build_kubebuilder.sh +++ b/build/build_kubebuilder.sh @@ -22,10 +22,10 @@ set -x # - Use /go as the default GOPATH because this is what the image uses # - Link our current directory (containing the source code) to the package location in the GOPATH -OWNER="kubernetes-sigs" +OWNER="sigs.k8s.io" REPO="kubebuilder" -GO_PKG_OWNER=$GOPATH/src/github.com/$OWNER +GO_PKG_OWNER=$GOPATH/src/$OWNER GO_PKG_PATH=$GO_PKG_OWNER/$REPO mkdir -p $GO_PKG_OWNER diff --git a/build/test.sh b/build/test.sh index 521bfa8a9c..0928b2a236 100755 --- a/build/test.sh +++ b/build/test.sh @@ -19,8 +19,8 @@ cp -r /workspace/_output/kubebuilder /tmp/kubebuilder/ if [ $GOOS = "linux" ]; then export GOPATH=/go -mkdir -p $GOPATH/src/github.com/kubernetes-sigs/kubebuilder-test/ -cd $GOPATH/src/github.com/kubernetes-sigs/kubebuilder-test/ +mkdir -p $GOPATH/src/sigs.k8s.io/kubebuilder-test/ +cd $GOPATH/src/sigs.k8s.io/kubebuilder-test/ # Setup env vars export PATH=$PATH:/tmp/kubebuilder/bin/ diff --git a/cmd/internal/codegen/parse/apis.go b/cmd/internal/codegen/parse/apis.go index 862c363f9a..456a9e38fd 100644 --- a/cmd/internal/codegen/parse/apis.go +++ b/cmd/internal/codegen/parse/apis.go @@ -22,9 +22,9 @@ import ( "path/filepath" "strings" - "github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/gengo/types" + "sigs.k8s.io/kubebuilder/cmd/internal/codegen" ) type genUnversionedType struct { diff --git a/cmd/internal/codegen/parse/controllers.go b/cmd/internal/codegen/parse/controllers.go index b542d53877..dd323026db 100644 --- a/cmd/internal/codegen/parse/controllers.go +++ b/cmd/internal/codegen/parse/controllers.go @@ -20,10 +20,11 @@ import ( "log" "strings" - "github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen" "github.com/pkg/errors" + "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/gengo/types" + "sigs.k8s.io/kubebuilder/cmd/internal/codegen" ) // resourceTags contains the tags present in a "+resource=" comment diff --git a/cmd/internal/codegen/parse/index.go b/cmd/internal/codegen/parse/index.go index 2c408400df..57840b75b9 100644 --- a/cmd/internal/codegen/parse/index.go +++ b/cmd/internal/codegen/parse/index.go @@ -21,9 +21,10 @@ import ( "log" "strings" - "github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen" "github.com/pkg/errors" + "k8s.io/gengo/types" + "sigs.k8s.io/kubebuilder/cmd/internal/codegen" ) // parseIndex indexes all types with the comment "// +resource=RESOURCE" by GroupVersionKind and diff --git a/cmd/internal/codegen/parse/parser.go b/cmd/internal/codegen/parse/parser.go index 0199a91fe8..d0b8b13ea2 100644 --- a/cmd/internal/codegen/parse/parser.go +++ b/cmd/internal/codegen/parse/parser.go @@ -26,15 +26,16 @@ import ( "strings" "github.com/golang/glog" - "github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen" "github.com/markbates/inflect" "github.com/pkg/errors" + rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/gengo/args" "k8s.io/gengo/generator" "k8s.io/gengo/types" + "sigs.k8s.io/kubebuilder/cmd/internal/codegen" ) type APIs struct { diff --git a/cmd/kubebuilder-gen/codegen/generators.go b/cmd/kubebuilder-gen/codegen/generators.go index eb87ee8127..75294ce7e4 100644 --- a/cmd/kubebuilder-gen/codegen/generators.go +++ b/cmd/kubebuilder-gen/codegen/generators.go @@ -17,8 +17,8 @@ limitations under the License. package codegen import ( - "github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen" "k8s.io/gengo/generator" + "sigs.k8s.io/kubebuilder/cmd/internal/codegen" ) // ResourceGenerator provides a code generator that takes a package of an API GroupVersion diff --git a/cmd/kubebuilder-gen/codegen/run/generator.go b/cmd/kubebuilder-gen/codegen/run/generator.go index 55c5c03f12..40c1631d00 100644 --- a/cmd/kubebuilder-gen/codegen/run/generator.go +++ b/cmd/kubebuilder-gen/codegen/run/generator.go @@ -18,11 +18,12 @@ package run import ( "github.com/golang/glog" - "github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen/parse" - "github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder-gen/codegen" "github.com/spf13/pflag" + "k8s.io/gengo/args" "k8s.io/gengo/generator" + "sigs.k8s.io/kubebuilder/cmd/internal/codegen/parse" + "sigs.k8s.io/kubebuilder/cmd/kubebuilder-gen/codegen" ) // CodeGenerator generates code for Kubernetes resources and controllers diff --git a/cmd/kubebuilder-gen/internal/controllergen/generator.go b/cmd/kubebuilder-gen/internal/controllergen/generator.go index 6e287030d3..665b28a07c 100644 --- a/cmd/kubebuilder-gen/internal/controllergen/generator.go +++ b/cmd/kubebuilder-gen/internal/controllergen/generator.go @@ -17,8 +17,8 @@ limitations under the License. package controllergen import ( - "github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen" "k8s.io/gengo/generator" + "sigs.k8s.io/kubebuilder/cmd/internal/codegen" ) type Generator struct{} diff --git a/cmd/kubebuilder-gen/internal/controllergen/inject.go b/cmd/kubebuilder-gen/internal/controllergen/inject.go index c26934aa56..598059c80f 100644 --- a/cmd/kubebuilder-gen/internal/controllergen/inject.go +++ b/cmd/kubebuilder-gen/internal/controllergen/inject.go @@ -17,15 +17,16 @@ limitations under the License. package controllergen import ( + "fmt" "io" + "path" "strings" "text/template" - "fmt" - "github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen" "github.com/markbates/inflect" + "k8s.io/gengo/generator" - "path" + "sigs.k8s.io/kubebuilder/cmd/internal/codegen" ) type injectGenerator struct { @@ -43,7 +44,7 @@ func (d *injectGenerator) Imports(c *generator.Context) []string { repo := d.Controllers[0].Repo im := []string{ - "github.com/kubernetes-sigs/kubebuilder/pkg/controller", + "sigs.k8s.io/kubebuilder/pkg/controller", "k8s.io/client-go/rest", repo + "/pkg/controller/sharedinformers", repo + "/pkg/client/informers/externalversions", @@ -52,12 +53,12 @@ func (d *injectGenerator) Imports(c *generator.Context) []string { } if len(d.APIS.Groups) > 0 { - im = append(im, []string{ - "time", - "k8s.io/client-go/kubernetes/scheme", - "rscheme " + "\"" + repo + "/pkg/client/clientset/versioned/scheme\""}... - ) - } + im = append(im, []string{ + "time", + "k8s.io/client-go/kubernetes/scheme", + "rscheme " + "\"" + repo + "/pkg/client/clientset/versioned/scheme\""}..., + ) + } // Import package for each controller repos := map[string]string{} for _, c := range d.Controllers { diff --git a/cmd/kubebuilder-gen/internal/resourcegen/apis_generator.go b/cmd/kubebuilder-gen/internal/resourcegen/apis_generator.go index b2843facc6..f7ea38ef29 100644 --- a/cmd/kubebuilder-gen/internal/resourcegen/apis_generator.go +++ b/cmd/kubebuilder-gen/internal/resourcegen/apis_generator.go @@ -22,8 +22,8 @@ import ( "fmt" - "github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen" "k8s.io/gengo/generator" + "sigs.k8s.io/kubebuilder/cmd/internal/codegen" ) type apiGenerator struct { @@ -37,7 +37,7 @@ func (d *apiGenerator) Imports(c *generator.Context) []string { imports := []string{ "k8s.io/apimachinery/pkg/runtime/schema", "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1", - "github.com/kubernetes-sigs/kubebuilder/pkg/builders", + "sigs.k8s.io/kubebuilder/pkg/builders", "rbacv1 \"k8s.io/api/rbac/v1\"", } for _, group := range d.apis.Groups { diff --git a/cmd/kubebuilder-gen/internal/resourcegen/generator.go b/cmd/kubebuilder-gen/internal/resourcegen/generator.go index 76976b00b0..04ae59706b 100644 --- a/cmd/kubebuilder-gen/internal/resourcegen/generator.go +++ b/cmd/kubebuilder-gen/internal/resourcegen/generator.go @@ -17,8 +17,8 @@ limitations under the License. package resourcegen import ( - "github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen" "k8s.io/gengo/generator" + "sigs.k8s.io/kubebuilder/cmd/internal/codegen" ) type Generator struct{} diff --git a/cmd/kubebuilder-gen/internal/resourcegen/install_generator.go b/cmd/kubebuilder-gen/internal/resourcegen/install_generator.go index e5cb3bc462..22ca75041e 100644 --- a/cmd/kubebuilder-gen/internal/resourcegen/install_generator.go +++ b/cmd/kubebuilder-gen/internal/resourcegen/install_generator.go @@ -21,8 +21,8 @@ import ( "path" "text/template" - "github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen" "k8s.io/gengo/generator" + "sigs.k8s.io/kubebuilder/cmd/internal/codegen" ) type installGenerator struct { diff --git a/cmd/kubebuilder-gen/internal/resourcegen/unversioned_generator.go b/cmd/kubebuilder-gen/internal/resourcegen/unversioned_generator.go index 3d61fc6a65..4acd2a6642 100644 --- a/cmd/kubebuilder-gen/internal/resourcegen/unversioned_generator.go +++ b/cmd/kubebuilder-gen/internal/resourcegen/unversioned_generator.go @@ -20,9 +20,9 @@ import ( "io" "text/template" - "github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/gengo/generator" + "sigs.k8s.io/kubebuilder/cmd/internal/codegen" ) type unversionedGenerator struct { diff --git a/cmd/kubebuilder-gen/internal/resourcegen/versioned_generator.go b/cmd/kubebuilder-gen/internal/resourcegen/versioned_generator.go index f4c9ed753a..35f8b0d53c 100644 --- a/cmd/kubebuilder-gen/internal/resourcegen/versioned_generator.go +++ b/cmd/kubebuilder-gen/internal/resourcegen/versioned_generator.go @@ -20,8 +20,8 @@ import ( "io" "text/template" - "github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen" "k8s.io/gengo/generator" + "sigs.k8s.io/kubebuilder/cmd/internal/codegen" ) type versionedGenerator struct { diff --git a/cmd/kubebuilder-gen/main.go b/cmd/kubebuilder-gen/main.go index c816e059cd..86c36c1f59 100644 --- a/cmd/kubebuilder-gen/main.go +++ b/cmd/kubebuilder-gen/main.go @@ -18,10 +18,10 @@ package main import ( "github.com/golang/glog" - "github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder-gen/codegen/run" - "github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder-gen/internal/controllergen" - "github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder-gen/internal/resourcegen" "k8s.io/apiserver/pkg/util/logs" + "sigs.k8s.io/kubebuilder/cmd/kubebuilder-gen/codegen/run" + "sigs.k8s.io/kubebuilder/cmd/kubebuilder-gen/internal/controllergen" + "sigs.k8s.io/kubebuilder/cmd/kubebuilder-gen/internal/resourcegen" ) func main() { diff --git a/cmd/kubebuilder/api.go b/cmd/kubebuilder/api.go index dda5fd23ba..f0f45982d0 100644 --- a/cmd/kubebuilder/api.go +++ b/cmd/kubebuilder/api.go @@ -25,13 +25,14 @@ import ( "path/filepath" "strings" - "github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder/util" "github.com/spf13/cobra" flag "github.com/spf13/pflag" + "sigs.k8s.io/controller-tools/pkg/scaffold" "sigs.k8s.io/controller-tools/pkg/scaffold/controller" "sigs.k8s.io/controller-tools/pkg/scaffold/input" "sigs.k8s.io/controller-tools/pkg/scaffold/resource" + "sigs.k8s.io/kubebuilder/cmd/kubebuilder/util" ) type apiOptions struct { diff --git a/cmd/kubebuilder/init_project.go b/cmd/kubebuilder/init_project.go index 427f90e8fe..77913854b5 100644 --- a/cmd/kubebuilder/init_project.go +++ b/cmd/kubebuilder/init_project.go @@ -26,13 +26,14 @@ import ( "strings" "github.com/Masterminds/semver" - "github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder/util" "github.com/spf13/cobra" flag "github.com/spf13/pflag" + "sigs.k8s.io/controller-tools/pkg/scaffold" "sigs.k8s.io/controller-tools/pkg/scaffold/input" "sigs.k8s.io/controller-tools/pkg/scaffold/manager" "sigs.k8s.io/controller-tools/pkg/scaffold/project" + "sigs.k8s.io/kubebuilder/cmd/kubebuilder/util" ) func newInitProjectCmd() *cobra.Command { diff --git a/cmd/kubebuilder/main.go b/cmd/kubebuilder/main.go index 5109c2ab0b..0eba674129 100644 --- a/cmd/kubebuilder/main.go +++ b/cmd/kubebuilder/main.go @@ -23,9 +23,10 @@ import ( "path/filepath" "strings" - "github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder/util" - "github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder/version" "github.com/spf13/cobra" + + "sigs.k8s.io/kubebuilder/cmd/kubebuilder/util" + "sigs.k8s.io/kubebuilder/cmd/kubebuilder/version" ) func main() { diff --git a/common.sh b/common.sh index 5c1d58d9a6..88a2cefe09 100644 --- a/common.sh +++ b/common.sh @@ -124,7 +124,7 @@ function build_kb { opts="" else # TODO: what does this thing do. - opts=-ldflags "-X github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder/version.kubeBuilderVersion=$INJECT_KB_VERSION" + opts=-ldflags "-X sigs.k8s.io/kubebuilder/cmd/kubebuilder/version.kubeBuilderVersion=$INJECT_KB_VERSION" fi go build $opts -o $tmp_root/kubebuilder/bin/kubebuilder ./cmd/kubebuilder @@ -132,7 +132,7 @@ function build_kb { } function prepare_testdir_under_gopath { - kb_test_dir=$GOPATH/src/github.com/kubernetes-sigs/kubebuilder-test + kb_test_dir=$GOPATH/src/sigs.k8s.io/kubebuilder-test header_text "preparing test directory $kb_test_dir" rm -rf "$kb_test_dir" && mkdir -p "$kb_test_dir" && cd "$kb_test_dir" header_text "running kubebuilder commands in test directory $kb_test_dir" diff --git a/docs/book/basics/simple_controller.md b/docs/book/basics/simple_controller.md index f322d364e4..d944d71356 100644 --- a/docs/book/basics/simple_controller.md +++ b/docs/book/basics/simple_controller.md @@ -61,7 +61,7 @@ Example: - See the [controller libraries](https://godoc.org/sigs.k8s.io/controller-runtime/pkg) godocs for reference documentation on the controller libraries. -- See the [controller code generation tags](https://godoc.org/github.com/kubernetes-sigs/kubebuilder/pkg/gen/controller) +- See the [controller code generation tags](https://godoc.org/sigs.k8s.io/kubebuilder/pkg/gen/controller) godocs for reference documentation on controller annotations. diff --git a/docs/book/basics/simple_resource.md b/docs/book/basics/simple_resource.md index 3e7b855615..8973211fff 100644 --- a/docs/book/basics/simple_resource.md +++ b/docs/book/basics/simple_resource.md @@ -27,7 +27,7 @@ ContainerSet has 4 fields: #### Reference -- See the [resource code generation tags](https://godoc.org/github.com/kubernetes-sigs/kubebuilder/pkg/gen/apis) +- See the [resource code generation tags](https://godoc.org/sigs.k8s.io/kubebuilder/pkg/gen/apis) godocs for reference documentation on resource annotations. {% sample lang="go" %} @@ -107,7 +107,7 @@ While users don't directly modify generated code, the code must be regenerated a modified by adding or removing fields. This is automatically done when running `make`. Code generation may be configured for resources using annotations of the form `// +something`. -See the [pkg/gen](https://godoc.org/github.com/kubernetes-sigs/kubebuilder/pkg/gen/) reference documentation. +See the [pkg/gen](https://godoc.org/sigs.k8s.io/kubebuilder/pkg/gen/) reference documentation. {% endpanel %} {% method %} diff --git a/docs/book/beyond_basics/controller_watches.md b/docs/book/beyond_basics/controller_watches.md index 4d5a3600f3..d366f1b3f4 100644 --- a/docs/book/beyond_basics/controller_watches.md +++ b/docs/book/beyond_basics/controller_watches.md @@ -3,7 +3,7 @@ This chapter describes how to use the controller package functions to configure Controllers to watch Resources. -[Link to reference documentation](https://godoc.org/github.com/kubernetes-sigs/kubebuilder/pkg/controller) +[Link to reference documentation](https://godoc.org/sigs.k8s.io/controller-runtime) {% method %} ## Watching Controller Resource diff --git a/docs/book/go_docs.md b/docs/book/go_docs.md index 50b8a389f6..6df9cc9d8f 100644 --- a/docs/book/go_docs.md +++ b/docs/book/go_docs.md @@ -3,11 +3,9 @@ ## Controller libraries -- [controller libraries](https://godoc.org/github.com/kubernetes-sigs/kubebuilder/pkg/controller) -- [config libraries](https://godoc.org/github.com/kubernetes-sigs/kubebuilder/pkg/config) -- [signals libraries](https://godoc.org/github.com/kubernetes-sigs/kubebuilder/pkg/signals) +- [controller libraries](https://godoc.org/sigs.k8s.io/controller-runtime/pkg) ## Code generation tags -- [resource code generation tags](https://godoc.org/github.com/kubernetes-sigs/kubebuilder/pkg/gen/apis) -- [controller code generation tags](https://godoc.org/github.com/kubernetes-sigs/kubebuilder/pkg/gen/controller) +- [resource code generation tags](https://godoc.org/sigs.k8s.io/kubebuilder/pkg/gen/apis) +- [controller code generation tags](https://godoc.org/sigs.k8s.io/kubebuilder/pkg/gen/controller) diff --git a/scripts/generate_dep_manifest.sh b/scripts/generate_dep_manifest.sh index ce412a0413..54ff99e190 100755 --- a/scripts/generate_dep_manifest.sh +++ b/scripts/generate_dep_manifest.sh @@ -21,7 +21,7 @@ while read name ; do # strip quotes myver=$(echo "$version" | tr -d '"') myname=$(echo "$name"|tr -d '"') - if [ "$myname" = "github.com/kubernetes-sigs/kubebuilder" ]; then + if [ "$myname" = "sigs.k8s.io/kubebuilder" ]; then continue fi if [ "$myver" = "branch master" ] || [ -z "$myver" ]; then @@ -34,7 +34,7 @@ done < $tmp_file cat << EOF [[override]] -name = "github.com/kubernetes-sigs/kubebuilder" +name = "sigs.k8s.io/kubebuilder" {{ if eq .Version "unknown" -}} branch = "master" {{ else -}} diff --git a/test/e2e/common.go b/test/e2e/common.go index d183fa8e12..5c954ea161 100644 --- a/test/e2e/common.go +++ b/test/e2e/common.go @@ -21,10 +21,11 @@ import ( "os" "path/filepath" - "github.com/kubernetes-sigs/kubebuilder/test/e2e/framework" - e2einternal "github.com/kubernetes-sigs/kubebuilder/test/internal/e2e" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + + "sigs.k8s.io/kubebuilder/test/e2e/framework" + e2einternal "sigs.k8s.io/kubebuilder/test/internal/e2e" ) func prepare(workDir string) { diff --git a/test/e2e/config.go b/test/e2e/config.go index b4d6bb145f..d5c7f3572b 100644 --- a/test/e2e/config.go +++ b/test/e2e/config.go @@ -19,7 +19,7 @@ package e2e import ( "path/filepath" - "github.com/kubernetes-sigs/kubebuilder/test/e2e/framework" + "sigs.k8s.io/kubebuilder/test/e2e/framework" ) // runtime config specified to run e2e tests diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 8ce84232d7..8a0df998ab 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -25,11 +25,12 @@ import ( "testing" "github.com/golang/glog" - "github.com/kubernetes-sigs/kubebuilder/test/e2e/framework" - "github.com/kubernetes-sigs/kubebuilder/test/e2e/framework/ginkgowrapper" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/spf13/pflag" + + "sigs.k8s.io/kubebuilder/test/e2e/framework" + "sigs.k8s.io/kubebuilder/test/e2e/framework/ginkgowrapper" ) func init() { @@ -57,7 +58,7 @@ var _ = BeforeSuite(func(done Done) { targets := []string{"kubebuilder", "kubebuilder-gen"} for _, target := range targets { buildOptions := []string{ - "build", "-o", path.Join(framework.TestContext.BinariesDir, target), path.Join("github.com/kubernetes-sigs/kubebuilder/cmd", target)} + "build", "-o", path.Join(framework.TestContext.BinariesDir, target), path.Join("sigs.k8s.io/kubebuilder/cmd", target)} cmd := exec.Command("go", buildOptions...) cmd.Env = os.Environ() command := strings.Join(cmd.Args, " ") diff --git a/test/e2e/e2e_v0.go b/test/e2e/e2e_v0.go deleted file mode 100644 index 8bacd3f8a7..0000000000 --- a/test/e2e/e2e_v0.go +++ /dev/null @@ -1,140 +0,0 @@ -/* -Copyright 2018 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package e2e - -import ( - "fmt" - "path/filepath" - "strings" - "time" - - "github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder/util" - "github.com/kubernetes-sigs/kubebuilder/test/e2e/framework" - e2einternal "github.com/kubernetes-sigs/kubebuilder/test/internal/e2e" - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" -) - -var _ = Describe("v0 main workflow", func() { - It("should perform main kubebuilder workflow successfully", func() { - testSuffix := framework.RandomSuffix() - c := initConfig(testSuffix) - kubebuilderTest := e2einternal.NewKubebuilderTest(c.workDir, framework.TestContext.BinariesDir) - - prepare(c.workDir) - defer cleanupv0(kubebuilderTest, c.workDir, c.controllerImageName) - - var controllerPodName string - - By("init project") - initOptions := []string{"--domain", c.domain, "--project-version", "v0"} - err := kubebuilderTest.Init(initOptions) - Expect(err).NotTo(HaveOccurred()) - - By("creating resource definition") - resourceOptions := []string{"--group", c.group, "--version", c.version, "--kind", c.kind} - err = kubebuilderTest.CreateResource(resourceOptions) - Expect(err).NotTo(HaveOccurred()) - - By("creating core-type resource controller") - controllerOptions := []string{"--group", "apps", "--version", "v1beta2", "--kind", "Deployment", "--core-type"} - err = kubebuilderTest.CreateController(controllerOptions) - Expect(err).NotTo(HaveOccurred()) - - By("building image") - // The scaffold test cases generated for core types controller cannot work - // without manually modification. - // See https://github.com/kubernetes-sigs/kubebuilder/pull/193 for more details - // Skip the test for core types controller in build process. - testCmdWithoutCoreType := "RUN find ./ -not -path './pkg/controller/deployment/*' -name '*_test.go' -print0 | xargs -0n1 dirname | xargs go test\n" - err = framework.ReplaceFileConent(`RUN go test(.*)\n`, testCmdWithoutCoreType, filepath.Join(c.workDir, "Dockerfile.controller")) - Expect(err).NotTo(HaveOccurred()) - - imageOptions := []string{"-t", c.controllerImageName} - err = kubebuilderTest.BuildImage(imageOptions) - Expect(err).NotTo(HaveOccurred()) - - By("creating config") - configOptions := []string{"--controller-image", c.controllerImageName, "--name", c.installName} - err = kubebuilderTest.CreateConfig(configOptions) - Expect(err).NotTo(HaveOccurred()) - - By("installing controller-manager in cluster") - inputFile := filepath.Join("hack", "install.yaml") - installOptions := []string{"apply", "-f", inputFile} - _, err = kubebuilderTest.RunKubectlCommand(framework.GetKubectlArgs(installOptions)) - Expect(err).NotTo(HaveOccurred()) - - By("validate the controller-manager pod running as expected") - verifyControllerUp := func() error { - // Get pod name - // TODO: Use kubectl to format the output with a go-template - getOptions := []string{"get", "pods", "-n", c.namespace, "-l", "control-plane=controller-manager", "-o", "go-template={{ range .items }}{{ if not .metadata.deletionTimestamp }}{{ .metadata.name }}{{ \"\\n\" }}{{ end }}{{ end }}"} - podOutput, err := kubebuilderTest.RunKubectlCommand(framework.GetKubectlArgs(getOptions)) - Expect(err).NotTo(HaveOccurred()) - // TODO: validate pod replicas if not default to 1 - podNames := framework.ParseCmdOutput(podOutput) - if len(podNames) != 1 { - return fmt.Errorf("expect 1 controller pods running, but got %d", len(podNames)) - } - controllerPodName = podNames[0] - Expect(controllerPodName).Should(HavePrefix(c.installName + "-controller-manager")) - - // Validate pod status - getOptions = []string{"get", "pods", controllerPodName, "-n", c.namespace, "-o", "jsonpath={.status.phase}"} - status, err := kubebuilderTest.RunKubectlCommand(framework.GetKubectlArgs(getOptions)) - Expect(err).NotTo(HaveOccurred()) - if status != "Running" { - return fmt.Errorf("controller pod in %s status", status) - } - - return nil - } - Eventually(verifyControllerUp, 1*time.Minute, 500*time.Millisecond).Should(BeNil()) - - By("creating resource object") - inputFile = filepath.Join(kubebuilderTest.Dir, "hack", "sample", strings.ToLower(c.kind)+".yaml") - createOptions := []string{"create", "-f", inputFile} - _, err = kubebuilderTest.RunKubectlCommand(framework.GetKubectlArgs(createOptions)) - Expect(err).NotTo(HaveOccurred()) - - By("validate the created resource object gets reconciled in controller") - controllerContainerLogs := func() string { - // Check container log to validate that the created resource object gets reconciled in controller - logOptions := []string{"logs", controllerPodName, "-n", c.namespace} - logOutput, err := kubebuilderTest.RunKubectlCommand(framework.GetKubectlArgs(logOptions)) - Expect(err).NotTo(HaveOccurred()) - - return logOutput - } - Eventually(controllerContainerLogs, 1*time.Minute, 500*time.Millisecond).Should(ContainSubstring(fmt.Sprintf("to reconcile %s-example", strings.ToLower(c.kind)))) - - By("creating other kind of resource object") - inputFile = filepath.Join(kubebuilderTest.Dir, "hack", "sample", "deployment.yaml") - util.WriteIfNotFound(inputFile, - "deployment-template", - deploymentTemplate, - deploymentTemplateArguments{Namespace: c.namespace}, - ) - createOptions = []string{"create", "-f", inputFile} - _, err = kubebuilderTest.RunKubectlCommand(framework.GetKubectlArgs(createOptions)) - Expect(err).NotTo(HaveOccurred()) - - By("validate other kind of object gets reconciled in controller") - Eventually(controllerContainerLogs, 1*time.Minute, 500*time.Millisecond).Should(ContainSubstring("to reconcile deployment-example")) - }) -}) diff --git a/test/e2e/e2e_v1.go b/test/e2e/e2e_v1.go index c5592c2a8f..05ebed703b 100644 --- a/test/e2e/e2e_v1.go +++ b/test/e2e/e2e_v1.go @@ -23,10 +23,11 @@ import ( "strings" "time" - "github.com/kubernetes-sigs/kubebuilder/test/e2e/framework" - e2einternal "github.com/kubernetes-sigs/kubebuilder/test/internal/e2e" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + + "sigs.k8s.io/kubebuilder/test/e2e/framework" + e2einternal "sigs.k8s.io/kubebuilder/test/internal/e2e" ) var _ = Describe("v1 main workflow", func() { diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 7f38d0830c..3aeda6991f 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -26,8 +26,8 @@ import ( "strings" "time" - "github.com/kubernetes-sigs/kubebuilder/test/e2e/framework/ginkgowrapper" . "github.com/onsi/ginkgo" + "sigs.k8s.io/kubebuilder/test/e2e/framework/ginkgowrapper" "k8s.io/client-go/tools/clientcmd" )