Skip to content

Commit

Permalink
change import path in samples and add generated files in existing pro…
Browse files Browse the repository at this point in the history
…jects
  • Loading branch information
Liujingfang1 committed Jun 1, 2018
1 parent 83156c1 commit 0dafcd7
Show file tree
Hide file tree
Showing 72 changed files with 2,429 additions and 47 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"github.com/kubernetes-sigs/kubebuilder/pkg/signals"
extensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"

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

var installCRDs = flag.Bool("install-crds", true, "install the CRDs used by the controller as part of startup")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ limitations under the License.
// +k8s:conversion-gen=samplecontroller/pkg/apis/samplecontroller
// +k8s:defaulter-gen=TypeMeta
// +groupName=samplecontroller.k8s.io
package v1alpha1 // import "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
package v1alpha1 // import "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (

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

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

// EDIT THIS FILE!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"github.com/kubernetes-sigs/kubebuilder/pkg/test"
"k8s.io/client-go/rest"

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

var testenv *test.TestEnvironment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
discovery "k8s.io/client-go/discovery"
rest "k8s.io/client-go/rest"
flowcontrol "k8s.io/client-go/util/flowcontrol"
samplecontrollerv1alpha1 "samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1"
samplecontrollerv1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1"
)

type Interface interface {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"k8s.io/client-go/discovery"
fakediscovery "k8s.io/client-go/discovery/fake"
"k8s.io/client-go/testing"
clientset "samplecontroller/pkg/client/clientset/versioned"
samplecontrollerv1alpha1 "samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1"
fakesamplecontrollerv1alpha1 "samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/fake"
clientset "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned"
samplecontrollerv1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1"
fakesamplecontrollerv1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/fake"
)

// NewSimpleClientset returns a clientset that will respond with the provided objects.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
serializer "k8s.io/apimachinery/pkg/runtime/serializer"
samplecontrollerv1alpha1 "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
samplecontrollerv1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
)

var scheme = runtime.NewScheme()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
serializer "k8s.io/apimachinery/pkg/runtime/serializer"
samplecontrollerv1alpha1 "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
samplecontrollerv1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
)

var Scheme = runtime.NewScheme()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
testing "k8s.io/client-go/testing"
v1alpha1 "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
v1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
)

// FakeFoos implements FooInterface
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package fake
import (
rest "k8s.io/client-go/rest"
testing "k8s.io/client-go/testing"
v1alpha1 "samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1"
v1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1"
)

type FakeSamplecontrollerV1alpha1 struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
rest "k8s.io/client-go/rest"
v1alpha1 "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
scheme "samplecontroller/pkg/client/clientset/versioned/scheme"
v1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
scheme "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/scheme"
)

// FoosGetter has a method to return a FooInterface.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package v1alpha1
import (
serializer "k8s.io/apimachinery/pkg/runtime/serializer"
rest "k8s.io/client-go/rest"
v1alpha1 "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
"samplecontroller/pkg/client/clientset/versioned/scheme"
v1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
"github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned/scheme"
)

type SamplecontrollerV1alpha1Interface interface {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
schema "k8s.io/apimachinery/pkg/runtime/schema"
cache "k8s.io/client-go/tools/cache"
reflect "reflect"
versioned "samplecontroller/pkg/client/clientset/versioned"
internalinterfaces "samplecontroller/pkg/client/informers/externalversions/internalinterfaces"
samplecontroller "samplecontroller/pkg/client/informers/externalversions/samplecontroller"
versioned "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned"
internalinterfaces "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/informers/externalversions/internalinterfaces"
samplecontroller "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/informers/externalversions/samplecontroller"
sync "sync"
time "time"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"fmt"
schema "k8s.io/apimachinery/pkg/runtime/schema"
cache "k8s.io/client-go/tools/cache"
v1alpha1 "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
v1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
)

// GenericInformer is type of SharedIndexInformer which will locate and delegate to other
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
cache "k8s.io/client-go/tools/cache"
versioned "samplecontroller/pkg/client/clientset/versioned"
versioned "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned"
time "time"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ limitations under the License.
package samplecontroller

import (
internalinterfaces "samplecontroller/pkg/client/informers/externalversions/internalinterfaces"
v1alpha1 "samplecontroller/pkg/client/informers/externalversions/samplecontroller/v1alpha1"
internalinterfaces "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/informers/externalversions/internalinterfaces"
v1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/informers/externalversions/samplecontroller/v1alpha1"
)

// Interface provides access to each of this group's versions.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch"
cache "k8s.io/client-go/tools/cache"
samplecontroller_v1alpha1 "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
versioned "samplecontroller/pkg/client/clientset/versioned"
internalinterfaces "samplecontroller/pkg/client/informers/externalversions/internalinterfaces"
v1alpha1 "samplecontroller/pkg/client/listers/samplecontroller/v1alpha1"
samplecontroller_v1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
versioned "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned"
internalinterfaces "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/informers/externalversions/internalinterfaces"
v1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/listers/samplecontroller/v1alpha1"
time "time"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ limitations under the License.
package v1alpha1

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

// Interface provides access to all the informers in this group version.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache"
v1alpha1 "samplecontroller/pkg/apis/samplecontroller/v1alpha1"
v1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/apis/samplecontroller/v1alpha1"
)

// FooLister helps list Foos.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ import (
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/tools/record"

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

const controllerAgentName = "sample-controller"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"github.com/kubernetes-sigs/kubebuilder/pkg/controller/types"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

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

// EDIT THIS FILE!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"

"samplecontroller/pkg/client/clientset/versioned"
"samplecontroller/pkg/inject"
"samplecontroller/pkg/inject/args"
"github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/client/clientset/versioned"
"github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/inject"
"github.com/kubernetes-sigs/kubebuilder/samples/full/controller/src/samplecontroller/pkg/inject/args"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"github.com/kubernetes-sigs/kubebuilder/pkg/inject/args"
"k8s.io/client-go/rest"

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

// InjectArgs are the arguments need to initialize controllers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/kubernetes-sigs/kubebuilder/pkg/inject/run"
injectargs "github.com/kubernetes-sigs/kubebuilder/pkg/inject/args"

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

var (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package inject

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

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

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0dafcd7

Please sign in to comment.