Skip to content

Commit fea9e3a

Browse files
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 {

0 commit comments

Comments
 (0)