Skip to content

Commit 8227962

Browse files
author
Mengqi Yu
committed
change import path to use vanity URL sigs.k8s.io
1 parent 0dee064 commit 8227962

34 files changed

+70
-61
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ go:
1010
git:
1111
depth: 3
1212

13-
go_import_path: github.com/kubernetes-sigs/kubebuilder
13+
go_import_path: sigs.k8s.io/kubebuilder
1414

1515
before_install:
1616
- go get -u github.com/golang/dep/cmd/dep

BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ load("@io_bazel_rules_go//go:def.bzl", "gazelle")
1818
gazelle(
1919
name = "gazelle",
2020
command = "fix",
21-
prefix = "github.com/kubernetes-sigs/kubebuilder",
21+
prefix = "sigs.k8s.io/kubebuilder",
2222
external = "vendored",
2323
args = [
2424
"-build_file_name",

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[![Build Status](https://travis-ci.org/kubernetes-sigs/kubebuilder.svg?branch=master)](https://travis-ci.org/kubernetes-sigs/kubebuilder "Travis")
2-
[![Go Report Card](https://goreportcard.com/badge/github.com/kubernetes-sigs/kubebuilder)](https://goreportcard.com/report/github.com/kubernetes-sigs/kubebuilder)
2+
[![Go Report Card](https://goreportcard.com/badge/sigs.k8s.io/kubebuilder)](https://goreportcard.com/report/sigs.k8s.io/kubebuilder)
33

44
## Kubebuilder
55

build/.goreleaser.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
builds:
44
- main: ./cmd/kubebuilder
55
binary: kubebuilder
6-
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}}
6+
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}}
77
goos:
88
- darwin
99
- linux

build/build_kubebuilder.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ set -x
2222
# - Use /go as the default GOPATH because this is what the image uses
2323
# - Link our current directory (containing the source code) to the package location in the GOPATH
2424

25-
OWNER="kubernetes-sigs"
25+
OWNER="sigs.k8s.io"
2626
REPO="kubebuilder"
2727

28-
GO_PKG_OWNER=$GOPATH/src/github.com/$OWNER
28+
GO_PKG_OWNER=$GOPATH/src/$OWNER
2929
GO_PKG_PATH=$GO_PKG_OWNER/$REPO
3030

3131
mkdir -p $GO_PKG_OWNER

build/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ cp -r /workspace/_output/kubebuilder /tmp/kubebuilder/
1919
if [ $GOOS = "linux" ]; then
2020

2121
export GOPATH=/go
22-
mkdir -p $GOPATH/src/github.com/kubernetes-sigs/kubebuilder-test/
23-
cd $GOPATH/src/github.com/kubernetes-sigs/kubebuilder-test/
22+
mkdir -p $GOPATH/src/sigs.k8s.io/kubebuilder-test/
23+
cd $GOPATH/src/sigs.k8s.io/kubebuilder-test/
2424

2525
# Setup env vars
2626
export PATH=$PATH:/tmp/kubebuilder/bin/

cmd/internal/codegen/parse/apis.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import (
2222
"path/filepath"
2323
"strings"
2424

25-
"github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen"
2625
"k8s.io/apimachinery/pkg/util/sets"
2726
"k8s.io/gengo/types"
27+
"sigs.k8s.io/kubebuilder/cmd/internal/codegen"
2828
)
2929

3030
type genUnversionedType struct {

cmd/internal/codegen/parse/controllers.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ import (
2020
"log"
2121
"strings"
2222

23-
"github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen"
2423
"github.com/pkg/errors"
24+
2525
"k8s.io/apimachinery/pkg/runtime/schema"
2626
"k8s.io/gengo/types"
27+
"sigs.k8s.io/kubebuilder/cmd/internal/codegen"
2728
)
2829

2930
// resourceTags contains the tags present in a "+resource=" comment

cmd/internal/codegen/parse/index.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ import (
2121
"log"
2222
"strings"
2323

24-
"github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen"
2524
"github.com/pkg/errors"
25+
2626
"k8s.io/gengo/types"
27+
"sigs.k8s.io/kubebuilder/cmd/internal/codegen"
2728
)
2829

2930
// parseIndex indexes all types with the comment "// +resource=RESOURCE" by GroupVersionKind and

cmd/internal/codegen/parse/parser.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,16 @@ import (
2626
"strings"
2727

2828
"github.com/golang/glog"
29-
"github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen"
3029
"github.com/markbates/inflect"
3130
"github.com/pkg/errors"
31+
3232
rbacv1 "k8s.io/api/rbac/v1"
3333
"k8s.io/apimachinery/pkg/apis/meta/v1"
3434
"k8s.io/apimachinery/pkg/util/sets"
3535
"k8s.io/gengo/args"
3636
"k8s.io/gengo/generator"
3737
"k8s.io/gengo/types"
38+
"sigs.k8s.io/kubebuilder/cmd/internal/codegen"
3839
)
3940

4041
type APIs struct {

cmd/kubebuilder-gen/codegen/generators.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ limitations under the License.
1717
package codegen
1818

1919
import (
20-
"github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen"
2120
"k8s.io/gengo/generator"
21+
"sigs.k8s.io/kubebuilder/cmd/internal/codegen"
2222
)
2323

2424
// ResourceGenerator provides a code generator that takes a package of an API GroupVersion

cmd/kubebuilder-gen/codegen/run/generator.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ package run
1818

1919
import (
2020
"github.com/golang/glog"
21-
"github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen/parse"
22-
"github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder-gen/codegen"
2321
"github.com/spf13/pflag"
22+
2423
"k8s.io/gengo/args"
2524
"k8s.io/gengo/generator"
25+
"sigs.k8s.io/kubebuilder/cmd/internal/codegen/parse"
26+
"sigs.k8s.io/kubebuilder/cmd/kubebuilder-gen/codegen"
2627
)
2728

2829
// CodeGenerator generates code for Kubernetes resources and controllers

cmd/kubebuilder-gen/internal/controllergen/generator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ limitations under the License.
1717
package controllergen
1818

1919
import (
20-
"github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen"
2120
"k8s.io/gengo/generator"
21+
"sigs.k8s.io/kubebuilder/cmd/internal/codegen"
2222
)
2323

2424
type Generator struct{}

cmd/kubebuilder-gen/internal/controllergen/inject.go

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,16 @@ limitations under the License.
1717
package controllergen
1818

1919
import (
20+
"fmt"
2021
"io"
22+
"path"
2123
"strings"
2224
"text/template"
2325

24-
"fmt"
25-
"github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen"
2626
"github.com/markbates/inflect"
27+
2728
"k8s.io/gengo/generator"
28-
"path"
29+
"sigs.k8s.io/kubebuilder/cmd/internal/codegen"
2930
)
3031

3132
type injectGenerator struct {
@@ -43,7 +44,7 @@ func (d *injectGenerator) Imports(c *generator.Context) []string {
4344

4445
repo := d.Controllers[0].Repo
4546
im := []string{
46-
"github.com/kubernetes-sigs/kubebuilder/pkg/controller",
47+
"sigs.k8s.io/kubebuilder/pkg/controller",
4748
"k8s.io/client-go/rest",
4849
repo + "/pkg/controller/sharedinformers",
4950
repo + "/pkg/client/informers/externalversions",
@@ -52,12 +53,12 @@ func (d *injectGenerator) Imports(c *generator.Context) []string {
5253
}
5354

5455
if len(d.APIS.Groups) > 0 {
55-
im = append(im, []string{
56-
"time",
57-
"k8s.io/client-go/kubernetes/scheme",
58-
"rscheme " + "\"" + repo + "/pkg/client/clientset/versioned/scheme\""}...
59-
)
60-
}
56+
im = append(im, []string{
57+
"time",
58+
"k8s.io/client-go/kubernetes/scheme",
59+
"rscheme " + "\"" + repo + "/pkg/client/clientset/versioned/scheme\""}...,
60+
)
61+
}
6162
// Import package for each controller
6263
repos := map[string]string{}
6364
for _, c := range d.Controllers {

cmd/kubebuilder-gen/internal/resourcegen/apis_generator.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222

2323
"fmt"
2424

25-
"github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen"
2625
"k8s.io/gengo/generator"
26+
"sigs.k8s.io/kubebuilder/cmd/internal/codegen"
2727
)
2828

2929
type apiGenerator struct {
@@ -37,7 +37,7 @@ func (d *apiGenerator) Imports(c *generator.Context) []string {
3737
imports := []string{
3838
"k8s.io/apimachinery/pkg/runtime/schema",
3939
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1",
40-
"github.com/kubernetes-sigs/kubebuilder/pkg/builders",
40+
"sigs.k8s.io/kubebuilder/pkg/builders",
4141
"rbacv1 \"k8s.io/api/rbac/v1\"",
4242
}
4343
for _, group := range d.apis.Groups {

cmd/kubebuilder-gen/internal/resourcegen/generator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ limitations under the License.
1717
package resourcegen
1818

1919
import (
20-
"github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen"
2120
"k8s.io/gengo/generator"
21+
"sigs.k8s.io/kubebuilder/cmd/internal/codegen"
2222
)
2323

2424
type Generator struct{}

cmd/kubebuilder-gen/internal/resourcegen/install_generator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"path"
2222
"text/template"
2323

24-
"github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen"
2524
"k8s.io/gengo/generator"
25+
"sigs.k8s.io/kubebuilder/cmd/internal/codegen"
2626
)
2727

2828
type installGenerator struct {

cmd/kubebuilder-gen/internal/resourcegen/unversioned_generator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
"io"
2121
"text/template"
2222

23-
"github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen"
2423
"k8s.io/apimachinery/pkg/util/sets"
2524
"k8s.io/gengo/generator"
25+
"sigs.k8s.io/kubebuilder/cmd/internal/codegen"
2626
)
2727

2828
type unversionedGenerator struct {

cmd/kubebuilder-gen/internal/resourcegen/versioned_generator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"io"
2121
"text/template"
2222

23-
"github.com/kubernetes-sigs/kubebuilder/cmd/internal/codegen"
2423
"k8s.io/gengo/generator"
24+
"sigs.k8s.io/kubebuilder/cmd/internal/codegen"
2525
)
2626

2727
type versionedGenerator struct {

cmd/kubebuilder-gen/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ package main
1818

1919
import (
2020
"github.com/golang/glog"
21-
"github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder-gen/codegen/run"
22-
"github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder-gen/internal/controllergen"
23-
"github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder-gen/internal/resourcegen"
2421
"k8s.io/apiserver/pkg/util/logs"
22+
"sigs.k8s.io/kubebuilder/cmd/kubebuilder-gen/codegen/run"
23+
"sigs.k8s.io/kubebuilder/cmd/kubebuilder-gen/internal/controllergen"
24+
"sigs.k8s.io/kubebuilder/cmd/kubebuilder-gen/internal/resourcegen"
2525
)
2626

2727
func main() {

cmd/kubebuilder/api.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,14 @@ import (
2525
"path/filepath"
2626
"strings"
2727

28-
"github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder/util"
2928
"github.com/spf13/cobra"
3029
flag "github.com/spf13/pflag"
30+
3131
"sigs.k8s.io/controller-tools/pkg/scaffold"
3232
"sigs.k8s.io/controller-tools/pkg/scaffold/controller"
3333
"sigs.k8s.io/controller-tools/pkg/scaffold/input"
3434
"sigs.k8s.io/controller-tools/pkg/scaffold/resource"
35+
"sigs.k8s.io/kubebuilder/cmd/kubebuilder/util"
3536
)
3637

3738
type apiOptions struct {

cmd/kubebuilder/init_project.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ import (
2626
"strings"
2727

2828
"github.com/Masterminds/semver"
29-
"github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder/util"
3029
"github.com/spf13/cobra"
3130
flag "github.com/spf13/pflag"
31+
3232
"sigs.k8s.io/controller-tools/pkg/scaffold"
3333
"sigs.k8s.io/controller-tools/pkg/scaffold/input"
3434
"sigs.k8s.io/controller-tools/pkg/scaffold/manager"
3535
"sigs.k8s.io/controller-tools/pkg/scaffold/project"
36+
"sigs.k8s.io/kubebuilder/cmd/kubebuilder/util"
3637
)
3738

3839
func newInitProjectCmd() *cobra.Command {

cmd/kubebuilder/main.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ import (
2323
"path/filepath"
2424
"strings"
2525

26-
"github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder/util"
27-
"github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder/version"
2826
"github.com/spf13/cobra"
27+
28+
"sigs.k8s.io/kubebuilder/cmd/kubebuilder/util"
29+
"sigs.k8s.io/kubebuilder/cmd/kubebuilder/version"
2930
)
3031

3132
func main() {

common.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,15 @@ function build_kb {
124124
opts=""
125125
else
126126
# TODO: what does this thing do.
127-
opts=-ldflags "-X github.com/kubernetes-sigs/kubebuilder/cmd/kubebuilder/version.kubeBuilderVersion=$INJECT_KB_VERSION"
127+
opts=-ldflags "-X sigs.k8s.io/kubebuilder/cmd/kubebuilder/version.kubeBuilderVersion=$INJECT_KB_VERSION"
128128
fi
129129

130130
go build $opts -o $tmp_root/kubebuilder/bin/kubebuilder ./cmd/kubebuilder
131131
go build $opts -o $tmp_root/kubebuilder/bin/kubebuilder-gen ./cmd/kubebuilder-gen
132132
}
133133

134134
function prepare_testdir_under_gopath {
135-
kb_test_dir=$GOPATH/src/github.com/kubernetes-sigs/kubebuilder-test
135+
kb_test_dir=$GOPATH/src/sigs.k8s.io/kubebuilder-test
136136
header_text "preparing test directory $kb_test_dir"
137137
rm -rf "$kb_test_dir" && mkdir -p "$kb_test_dir" && cd "$kb_test_dir"
138138
header_text "running kubebuilder commands in test directory $kb_test_dir"

docs/book/basics/simple_controller.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Example:
6161

6262
- See the [controller libraries](https://godoc.org/sigs.k8s.io/controller-runtime/pkg) godocs for reference
6363
documentation on the controller libraries.
64-
- See the [controller code generation tags](https://godoc.org/github.com/kubernetes-sigs/kubebuilder/pkg/gen/controller)
64+
- See the [controller code generation tags](https://godoc.org/sigs.k8s.io/kubebuilder/pkg/gen/controller)
6565
godocs for reference documentation on controller annotations.
6666

6767

docs/book/basics/simple_resource.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ContainerSet has 4 fields:
2727

2828
#### Reference
2929

30-
- See the [resource code generation tags](https://godoc.org/github.com/kubernetes-sigs/kubebuilder/pkg/gen/apis)
30+
- See the [resource code generation tags](https://godoc.org/sigs.k8s.io/kubebuilder/pkg/gen/apis)
3131
godocs for reference documentation on resource annotations.
3232

3333
{% sample lang="go" %}
@@ -107,7 +107,7 @@ While users don't directly modify generated code, the code must be regenerated a
107107
modified by adding or removing fields. This is automatically done when running `make`.
108108

109109
Code generation may be configured for resources using annotations of the form `// +something`.
110-
See the [pkg/gen](https://godoc.org/github.com/kubernetes-sigs/kubebuilder/pkg/gen/) reference documentation.
110+
See the [pkg/gen](https://godoc.org/sigs.k8s.io/kubebuilder/pkg/gen/) reference documentation.
111111
{% endpanel %}
112112

113113
{% method %}

docs/book/beyond_basics/controller_watches.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
This chapter describes how to use the controller package functions to configure Controllers to watch
44
Resources.
55

6-
[Link to reference documentation](https://godoc.org/github.com/kubernetes-sigs/kubebuilder/pkg/controller)
6+
[Link to reference documentation](https://godoc.org/sigs.k8s.io/controller-runtime)
77

88
{% method %}
99
## Watching Controller Resource

docs/book/go_docs.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33

44
## Controller libraries
55

6-
- [controller libraries](https://godoc.org/github.com/kubernetes-sigs/kubebuilder/pkg/controller)
7-
- [config libraries](https://godoc.org/github.com/kubernetes-sigs/kubebuilder/pkg/config)
8-
- [signals libraries](https://godoc.org/github.com/kubernetes-sigs/kubebuilder/pkg/signals)
6+
- [controller libraries](https://godoc.org/sigs.k8s.io/controller-runtime/pkg)
97

108
## Code generation tags
119

12-
- [resource code generation tags](https://godoc.org/github.com/kubernetes-sigs/kubebuilder/pkg/gen/apis)
13-
- [controller code generation tags](https://godoc.org/github.com/kubernetes-sigs/kubebuilder/pkg/gen/controller)
10+
- [resource code generation tags](https://godoc.org/sigs.k8s.io/kubebuilder/pkg/gen/apis)
11+
- [controller code generation tags](https://godoc.org/sigs.k8s.io/kubebuilder/pkg/gen/controller)

0 commit comments

Comments
 (0)