diff --git a/controller.go b/controller.go index bea78e72..82c023cd 100644 --- a/controller.go +++ b/controller.go @@ -38,10 +38,10 @@ import ( "k8s.io/klog" samplev1alpha1 "k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1" - clientset "k8s.io/sample-controller/pkg/client/clientset/versioned" - samplescheme "k8s.io/sample-controller/pkg/client/clientset/versioned/scheme" - informers "k8s.io/sample-controller/pkg/client/informers/externalversions/samplecontroller/v1alpha1" - listers "k8s.io/sample-controller/pkg/client/listers/samplecontroller/v1alpha1" + clientset "k8s.io/sample-controller/pkg/generated/clientset/versioned" + samplescheme "k8s.io/sample-controller/pkg/generated/clientset/versioned/scheme" + informers "k8s.io/sample-controller/pkg/generated/informers/externalversions/samplecontroller/v1alpha1" + listers "k8s.io/sample-controller/pkg/generated/listers/samplecontroller/v1alpha1" ) const controllerAgentName = "sample-controller" diff --git a/controller_test.go b/controller_test.go index f25459c6..42e5fa03 100644 --- a/controller_test.go +++ b/controller_test.go @@ -34,8 +34,8 @@ import ( "k8s.io/client-go/tools/record" samplecontroller "k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1" - "k8s.io/sample-controller/pkg/client/clientset/versioned/fake" - informers "k8s.io/sample-controller/pkg/client/informers/externalversions" + "k8s.io/sample-controller/pkg/generated/clientset/versioned/fake" + informers "k8s.io/sample-controller/pkg/generated/informers/externalversions" ) var ( diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 196973b0..5562672b 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -26,10 +26,10 @@ CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code- # k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir # instead of the $GOPATH directly. For normal projects this can be dropped. "${CODEGEN_PKG}"/generate-groups.sh "deepcopy,client,informer,lister" \ - k8s.io/sample-controller/pkg/client k8s.io/sample-controller/pkg/apis \ + k8s.io/sample-controller/pkg/generated k8s.io/sample-controller/pkg/apis \ samplecontroller:v1alpha1 \ --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \ --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate.go.txt -# To use your own boilerplate text use: +# To use your own boilerplate text append: # --go-header-file "${SCRIPT_ROOT}"/hack/custom-boilerplate.go.txt diff --git a/main.go b/main.go index d8167715..e8574a24 100644 --- a/main.go +++ b/main.go @@ -27,8 +27,8 @@ import ( // Uncomment the following line to load the gcp plugin (only required to authenticate against GKE clusters). // _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" - clientset "k8s.io/sample-controller/pkg/client/clientset/versioned" - informers "k8s.io/sample-controller/pkg/client/informers/externalversions" + clientset "k8s.io/sample-controller/pkg/generated/clientset/versioned" + informers "k8s.io/sample-controller/pkg/generated/informers/externalversions" "k8s.io/sample-controller/pkg/signals" ) diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/generated/clientset/versioned/clientset.go similarity index 96% rename from pkg/client/clientset/versioned/clientset.go rename to pkg/generated/clientset/versioned/clientset.go index 5bdd7290..9dd86db1 100644 --- a/pkg/client/clientset/versioned/clientset.go +++ b/pkg/generated/clientset/versioned/clientset.go @@ -22,7 +22,7 @@ import ( discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" - samplecontrollerv1alpha1 "k8s.io/sample-controller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1" + samplecontrollerv1alpha1 "k8s.io/sample-controller/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1" ) type Interface interface { diff --git a/pkg/client/clientset/versioned/doc.go b/pkg/generated/clientset/versioned/doc.go similarity index 100% rename from pkg/client/clientset/versioned/doc.go rename to pkg/generated/clientset/versioned/doc.go diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/generated/clientset/versioned/fake/clientset_generated.go similarity index 89% rename from pkg/client/clientset/versioned/fake/clientset_generated.go rename to pkg/generated/clientset/versioned/fake/clientset_generated.go index 7a388a43..6bed11af 100644 --- a/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/generated/clientset/versioned/fake/clientset_generated.go @@ -24,9 +24,9 @@ import ( "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" - clientset "k8s.io/sample-controller/pkg/client/clientset/versioned" - samplecontrollerv1alpha1 "k8s.io/sample-controller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1" - fakesamplecontrollerv1alpha1 "k8s.io/sample-controller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/fake" + clientset "k8s.io/sample-controller/pkg/generated/clientset/versioned" + samplecontrollerv1alpha1 "k8s.io/sample-controller/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1" + fakesamplecontrollerv1alpha1 "k8s.io/sample-controller/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/pkg/client/clientset/versioned/fake/doc.go b/pkg/generated/clientset/versioned/fake/doc.go similarity index 100% rename from pkg/client/clientset/versioned/fake/doc.go rename to pkg/generated/clientset/versioned/fake/doc.go diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/generated/clientset/versioned/fake/register.go similarity index 100% rename from pkg/client/clientset/versioned/fake/register.go rename to pkg/generated/clientset/versioned/fake/register.go diff --git a/pkg/client/clientset/versioned/scheme/doc.go b/pkg/generated/clientset/versioned/scheme/doc.go similarity index 100% rename from pkg/client/clientset/versioned/scheme/doc.go rename to pkg/generated/clientset/versioned/scheme/doc.go diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/generated/clientset/versioned/scheme/register.go similarity index 100% rename from pkg/client/clientset/versioned/scheme/register.go rename to pkg/generated/clientset/versioned/scheme/register.go diff --git a/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/doc.go b/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/doc.go similarity index 100% rename from pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/doc.go rename to pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/doc.go diff --git a/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/fake/doc.go b/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/fake/doc.go similarity index 100% rename from pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/fake/doc.go rename to pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/fake/doc.go diff --git a/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/fake/fake_foo.go b/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/fake/fake_foo.go similarity index 100% rename from pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/fake/fake_foo.go rename to pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/fake/fake_foo.go diff --git a/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/fake/fake_samplecontroller_client.go b/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/fake/fake_samplecontroller_client.go similarity index 91% rename from pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/fake/fake_samplecontroller_client.go rename to pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/fake/fake_samplecontroller_client.go index 17a28bb6..02088eba 100644 --- a/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/fake/fake_samplecontroller_client.go +++ b/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/fake/fake_samplecontroller_client.go @@ -21,7 +21,7 @@ package fake import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha1 "k8s.io/sample-controller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1" + v1alpha1 "k8s.io/sample-controller/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1" ) type FakeSamplecontrollerV1alpha1 struct { diff --git a/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/foo.go b/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/foo.go similarity index 98% rename from pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/foo.go rename to pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/foo.go index 48bc2152..46738c05 100644 --- a/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/foo.go +++ b/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/foo.go @@ -26,7 +26,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" v1alpha1 "k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1" - scheme "k8s.io/sample-controller/pkg/client/clientset/versioned/scheme" + scheme "k8s.io/sample-controller/pkg/generated/clientset/versioned/scheme" ) // FoosGetter has a method to return a FooInterface. diff --git a/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/generated_expansion.go b/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/generated_expansion.go similarity index 100% rename from pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/generated_expansion.go rename to pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/generated_expansion.go diff --git a/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/samplecontroller_client.go b/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/samplecontroller_client.go similarity index 97% rename from pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/samplecontroller_client.go rename to pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/samplecontroller_client.go index c5927850..57ce1df2 100644 --- a/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/samplecontroller_client.go +++ b/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/samplecontroller_client.go @@ -22,7 +22,7 @@ import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" v1alpha1 "k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1" - "k8s.io/sample-controller/pkg/client/clientset/versioned/scheme" + "k8s.io/sample-controller/pkg/generated/clientset/versioned/scheme" ) type SamplecontrollerV1alpha1Interface interface { diff --git a/pkg/client/informers/externalversions/factory.go b/pkg/generated/informers/externalversions/factory.go similarity index 95% rename from pkg/client/informers/externalversions/factory.go rename to pkg/generated/informers/externalversions/factory.go index b6cf4fe8..a22e1054 100644 --- a/pkg/client/informers/externalversions/factory.go +++ b/pkg/generated/informers/externalversions/factory.go @@ -27,9 +27,9 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - versioned "k8s.io/sample-controller/pkg/client/clientset/versioned" - internalinterfaces "k8s.io/sample-controller/pkg/client/informers/externalversions/internalinterfaces" - samplecontroller "k8s.io/sample-controller/pkg/client/informers/externalversions/samplecontroller" + versioned "k8s.io/sample-controller/pkg/generated/clientset/versioned" + internalinterfaces "k8s.io/sample-controller/pkg/generated/informers/externalversions/internalinterfaces" + samplecontroller "k8s.io/sample-controller/pkg/generated/informers/externalversions/samplecontroller" ) // SharedInformerOption defines the functional option type for SharedInformerFactory. diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/generated/informers/externalversions/generic.go similarity index 100% rename from pkg/client/informers/externalversions/generic.go rename to pkg/generated/informers/externalversions/generic.go diff --git a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go similarity index 94% rename from pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go rename to pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go index 8ab887c1..71c802ba 100644 --- a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -24,7 +24,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" - versioned "k8s.io/sample-controller/pkg/client/clientset/versioned" + versioned "k8s.io/sample-controller/pkg/generated/clientset/versioned" ) // NewInformerFunc takes versioned.Interface and time.Duration to return a SharedIndexInformer. diff --git a/pkg/client/informers/externalversions/samplecontroller/interface.go b/pkg/generated/informers/externalversions/samplecontroller/interface.go similarity index 87% rename from pkg/client/informers/externalversions/samplecontroller/interface.go rename to pkg/generated/informers/externalversions/samplecontroller/interface.go index 145651cc..d06266ac 100644 --- a/pkg/client/informers/externalversions/samplecontroller/interface.go +++ b/pkg/generated/informers/externalversions/samplecontroller/interface.go @@ -19,8 +19,8 @@ limitations under the License. package samplecontroller import ( - internalinterfaces "k8s.io/sample-controller/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "k8s.io/sample-controller/pkg/client/informers/externalversions/samplecontroller/v1alpha1" + internalinterfaces "k8s.io/sample-controller/pkg/generated/informers/externalversions/internalinterfaces" + v1alpha1 "k8s.io/sample-controller/pkg/generated/informers/externalversions/samplecontroller/v1alpha1" ) // Interface provides access to each of this group's versions. diff --git a/pkg/client/informers/externalversions/samplecontroller/v1alpha1/foo.go b/pkg/generated/informers/externalversions/samplecontroller/v1alpha1/foo.go similarity index 92% rename from pkg/client/informers/externalversions/samplecontroller/v1alpha1/foo.go rename to pkg/generated/informers/externalversions/samplecontroller/v1alpha1/foo.go index e9319290..21fda895 100644 --- a/pkg/client/informers/externalversions/samplecontroller/v1alpha1/foo.go +++ b/pkg/generated/informers/externalversions/samplecontroller/v1alpha1/foo.go @@ -26,9 +26,9 @@ import ( watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" samplecontrollerv1alpha1 "k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1" - versioned "k8s.io/sample-controller/pkg/client/clientset/versioned" - internalinterfaces "k8s.io/sample-controller/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "k8s.io/sample-controller/pkg/client/listers/samplecontroller/v1alpha1" + versioned "k8s.io/sample-controller/pkg/generated/clientset/versioned" + internalinterfaces "k8s.io/sample-controller/pkg/generated/informers/externalversions/internalinterfaces" + v1alpha1 "k8s.io/sample-controller/pkg/generated/listers/samplecontroller/v1alpha1" ) // FooInformer provides access to a shared informer and lister for diff --git a/pkg/client/informers/externalversions/samplecontroller/v1alpha1/interface.go b/pkg/generated/informers/externalversions/samplecontroller/v1alpha1/interface.go similarity index 92% rename from pkg/client/informers/externalversions/samplecontroller/v1alpha1/interface.go rename to pkg/generated/informers/externalversions/samplecontroller/v1alpha1/interface.go index 92ab70f7..403b0276 100644 --- a/pkg/client/informers/externalversions/samplecontroller/v1alpha1/interface.go +++ b/pkg/generated/informers/externalversions/samplecontroller/v1alpha1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - internalinterfaces "k8s.io/sample-controller/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "k8s.io/sample-controller/pkg/generated/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/client/listers/samplecontroller/v1alpha1/expansion_generated.go b/pkg/generated/listers/samplecontroller/v1alpha1/expansion_generated.go similarity index 100% rename from pkg/client/listers/samplecontroller/v1alpha1/expansion_generated.go rename to pkg/generated/listers/samplecontroller/v1alpha1/expansion_generated.go diff --git a/pkg/client/listers/samplecontroller/v1alpha1/foo.go b/pkg/generated/listers/samplecontroller/v1alpha1/foo.go similarity index 100% rename from pkg/client/listers/samplecontroller/v1alpha1/foo.go rename to pkg/generated/listers/samplecontroller/v1alpha1/foo.go