Skip to content

Commit fea9e3a

Browse files
drootdroot
authored
Merge pull request #252 from Liujingfang1/master
change import path in samples and add generated files in existing projects
2 parents 065ad5b + 0dafcd7 commit fea9e3a

File tree

72 files changed

+2429
-47
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+2429
-47
lines changed

‎samples/full/controller/src/samplecontroller/cmd/controller-manager/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
"github.com/kubernetes-sigs/kubebuilder/pkg/signals"
3131
extensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
3232

33-
"samplecontroller/pkg/inject"
34-
"samplecontroller/pkg/inject/args"
33+
"github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/inject"
34+
"github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/inject/args"
3535
)
3636

3737
var installCRDs = flag.Bool("install-crds", true, "install the CRDs used by the controller as part of startup")

‎samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ limitations under the License.
2525
// +k8s:conversion-gen=samplecontroller/pkg/apis/samplecontroller
2626
// +k8s:defaulter-gen=TypeMeta
2727
// +groupName=samplecontroller.k8s.io
28-
package v1alpha1 // import "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
28+
package v1alpha1 // import "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"

‎samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1/foo_types_test.go

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

2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626

27-
. "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
28-
. "samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1"
27+
. "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
28+
. "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1"
2929
)
3030

3131
// EDIT THIS FILE!

‎samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1/v1alpha1_suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"github.com/kubernetes-sigs/kubebuilder/pkg/test"
2727
"k8s.io/client-go/rest"
2828

29-
"samplecontroller/pkg/inject"
30-
"samplecontroller/pkg/client/clientset/versioned"
29+
"github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/inject"
30+
"github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned"
3131
)
3232

3333
var testenv *test.TestEnvironment

‎samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/clientset.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
discovery "k8s.io/client-go/discovery"
2121
rest "k8s.io/client-go/rest"
2222
flowcontrol "k8s.io/client-go/util/flowcontrol"
23-
samplecontrollerv1alpha1 "samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1"
23+
samplecontrollerv1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1"
2424
)
2525

2626
type Interface interface {

‎samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/fake/clientset_generated.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"k8s.io/client-go/discovery"
2222
fakediscovery "k8s.io/client-go/discovery/fake"
2323
"k8s.io/client-go/testing"
24-
clientset "samplecontroller/pkg/client/clientset/versioned"
25-
samplecontrollerv1alpha1 "samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1"
26-
fakesamplecontrollerv1alpha1 "samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/fake"
24+
clientset "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned"
25+
samplecontrollerv1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1"
26+
fakesamplecontrollerv1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/fake"
2727
)
2828

2929
// NewSimpleClientset returns a clientset that will respond with the provided objects.

‎samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/fake/register.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
runtime "k8s.io/apimachinery/pkg/runtime"
2121
schema "k8s.io/apimachinery/pkg/runtime/schema"
2222
serializer "k8s.io/apimachinery/pkg/runtime/serializer"
23-
samplecontrollerv1alpha1 "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
23+
samplecontrollerv1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
2424
)
2525

2626
var scheme = runtime.NewScheme()

‎samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/scheme/register.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
runtime "k8s.io/apimachinery/pkg/runtime"
2121
schema "k8s.io/apimachinery/pkg/runtime/schema"
2222
serializer "k8s.io/apimachinery/pkg/runtime/serializer"
23-
samplecontrollerv1alpha1 "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
23+
samplecontrollerv1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
2424
)
2525

2626
var Scheme = runtime.NewScheme()

‎samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/fake/fake_foo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
types "k8s.io/apimachinery/pkg/types"
2323
watch "k8s.io/apimachinery/pkg/watch"
2424
testing "k8s.io/client-go/testing"
25-
v1alpha1 "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
25+
v1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
2626
)
2727

2828
// FakeFoos implements FooInterface

‎samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/fake/fake_samplecontroller_client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package fake
1818
import (
1919
rest "k8s.io/client-go/rest"
2020
testing "k8s.io/client-go/testing"
21-
v1alpha1 "samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1"
21+
v1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1"
2222
)
2323

2424
type FakeSamplecontrollerV1alpha1 struct {

‎samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/foo.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
types "k8s.io/apimachinery/pkg/types"
2121
watch "k8s.io/apimachinery/pkg/watch"
2222
rest "k8s.io/client-go/rest"
23-
v1alpha1 "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
24-
scheme "samplecontroller/pkg/client/clientset/versioned/scheme"
23+
v1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
24+
scheme "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/scheme"
2525
)
2626

2727
// FoosGetter has a method to return a FooInterface.

‎samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/samplecontroller_client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ package v1alpha1
1818
import (
1919
serializer "k8s.io/apimachinery/pkg/runtime/serializer"
2020
rest "k8s.io/client-go/rest"
21-
v1alpha1 "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
22-
"samplecontroller/pkg/client/clientset/versioned/scheme"
21+
v1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
22+
"github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/scheme"
2323
)
2424

2525
type SamplecontrollerV1alpha1Interface interface {

‎samples/full/controller/src/samplecontroller/pkg/client/informers/externalversions/factory.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
schema "k8s.io/apimachinery/pkg/runtime/schema"
2525
cache "k8s.io/client-go/tools/cache"
2626
reflect "reflect"
27-
versioned "samplecontroller/pkg/client/clientset/versioned"
28-
internalinterfaces "samplecontroller/pkg/client/informers/externalversions/internalinterfaces"
29-
samplecontroller "samplecontroller/pkg/client/informers/externalversions/samplecontroller"
27+
versioned "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned"
28+
internalinterfaces "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/informers/externalversions/internalinterfaces"
29+
samplecontroller "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/informers/externalversions/samplecontroller"
3030
sync "sync"
3131
time "time"
3232
)

‎samples/full/controller/src/samplecontroller/pkg/client/informers/externalversions/generic.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"fmt"
2323
schema "k8s.io/apimachinery/pkg/runtime/schema"
2424
cache "k8s.io/client-go/tools/cache"
25-
v1alpha1 "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
25+
v1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
2626
)
2727

2828
// GenericInformer is type of SharedIndexInformer which will locate and delegate to other

‎samples/full/controller/src/samplecontroller/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2323
runtime "k8s.io/apimachinery/pkg/runtime"
2424
cache "k8s.io/client-go/tools/cache"
25-
versioned "samplecontroller/pkg/client/clientset/versioned"
25+
versioned "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned"
2626
time "time"
2727
)
2828

‎samples/full/controller/src/samplecontroller/pkg/client/informers/externalversions/samplecontroller/interface.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ limitations under the License.
1919
package samplecontroller
2020

2121
import (
22-
internalinterfaces "samplecontroller/pkg/client/informers/externalversions/internalinterfaces"
23-
v1alpha1 "samplecontroller/pkg/client/informers/externalversions/samplecontroller/v1alpha1"
22+
internalinterfaces "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/informers/externalversions/internalinterfaces"
23+
v1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/informers/externalversions/samplecontroller/v1alpha1"
2424
)
2525

2626
// Interface provides access to each of this group's versions.

‎samples/full/controller/src/samplecontroller/pkg/client/informers/externalversions/samplecontroller/v1alpha1/foo.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323
runtime "k8s.io/apimachinery/pkg/runtime"
2424
watch "k8s.io/apimachinery/pkg/watch"
2525
cache "k8s.io/client-go/tools/cache"
26-
samplecontroller_v1alpha1 "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
27-
versioned "samplecontroller/pkg/client/clientset/versioned"
28-
internalinterfaces "samplecontroller/pkg/client/informers/externalversions/internalinterfaces"
29-
v1alpha1 "samplecontroller/pkg/client/listers/samplecontroller/v1alpha1"
26+
samplecontroller_v1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
27+
versioned "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned"
28+
internalinterfaces "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/informers/externalversions/internalinterfaces"
29+
v1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/listers/samplecontroller/v1alpha1"
3030
time "time"
3131
)
3232

‎samples/full/controller/src/samplecontroller/pkg/client/informers/externalversions/samplecontroller/v1alpha1/interface.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ limitations under the License.
1919
package v1alpha1
2020

2121
import (
22-
internalinterfaces "samplecontroller/pkg/client/informers/externalversions/internalinterfaces"
22+
internalinterfaces "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/informers/externalversions/internalinterfaces"
2323
)
2424

2525
// Interface provides access to all the informers in this group version.

‎samples/full/controller/src/samplecontroller/pkg/client/listers/samplecontroller/v1alpha1/foo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"k8s.io/apimachinery/pkg/api/errors"
2323
"k8s.io/apimachinery/pkg/labels"
2424
"k8s.io/client-go/tools/cache"
25-
v1alpha1 "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
25+
v1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
2626
)
2727

2828
// FooLister helps list Foos.

‎samples/full/controller/src/samplecontroller/pkg/controller/foo/controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import (
3333
"k8s.io/client-go/kubernetes/scheme"
3434
"k8s.io/client-go/tools/record"
3535

36-
samplecontrollerv1alpha1 "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
37-
samplescheme "samplecontroller/pkg/client/clientset/versioned/scheme"
38-
"samplecontroller/pkg/inject/args"
36+
samplecontrollerv1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
37+
samplescheme "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/scheme"
38+
"github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/inject/args"
3939
)
4040

4141
const controllerAgentName = "sample-controller"

‎samples/full/controller/src/samplecontroller/pkg/controller/foo/controller_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"github.com/kubernetes-sigs/kubebuilder/pkg/controller/types"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727

28-
. "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
29-
. "samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1"
28+
. "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
29+
. "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1"
3030
)
3131

3232
// EDIT THIS FILE!

‎samples/full/controller/src/samplecontroller/pkg/controller/foo/foo_suite_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import (
2929
"k8s.io/client-go/kubernetes"
3030
"k8s.io/client-go/rest"
3131

32-
"samplecontroller/pkg/client/clientset/versioned"
33-
"samplecontroller/pkg/inject"
34-
"samplecontroller/pkg/inject/args"
32+
"github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned"
33+
"github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/inject"
34+
"github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/inject/args"
3535
)
3636

3737
var (

‎samples/full/controller/src/samplecontroller/pkg/inject/args/args.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"github.com/kubernetes-sigs/kubebuilder/pkg/inject/args"
2424
"k8s.io/client-go/rest"
2525

26-
"samplecontroller/pkg/client/clientset/versioned"
27-
"samplecontroller/pkg/client/informers/externalversions"
26+
"github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned"
27+
"github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/informers/externalversions"
2828
)
2929

3030
// InjectArgs are the arguments need to initialize controllers

‎samples/full/controller/src/samplecontroller/pkg/inject/inject.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/kubernetes-sigs/kubebuilder/pkg/inject/run"
2222
injectargs "github.com/kubernetes-sigs/kubebuilder/pkg/inject/args"
2323

24-
"samplecontroller/pkg/inject/args"
24+
"github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/inject/args"
2525
)
2626

2727
var (

‎samples/full/controller/src/samplecontroller/pkg/inject/zz_generated.kubebuilder.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package inject
22

33
import (
4-
samplecontrollerv1alpha1 "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
5-
rscheme "samplecontroller/pkg/client/clientset/versioned/scheme"
6-
"samplecontroller/pkg/controller/foo"
7-
"samplecontroller/pkg/inject/args"
4+
samplecontrollerv1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
5+
rscheme "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/scheme"
6+
"github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/controller/foo"
7+
"github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/inject/args"
88

99
"github.com/kubernetes-sigs/kubebuilder/pkg/inject/run"
1010
appsv1 "k8s.io/api/apps/v1"

‎test/projects/memcached-api-server/pkg/apis/myapps/v1alpha1/zz_generated.deepcopy.go

Lines changed: 107 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)