Update generated code

staging/src/k8s.io/sample-apiserver/BUILD

@@ -39,11 +39,11 @@ filegroup(
         "//staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer:all-srcs",
         "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle:all-srcs",
         "//staging/src/k8s.io/sample-apiserver/pkg/apiserver:all-srcs",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned:all-srcs",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions:all-srcs",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/listers/wardle/v1alpha1:all-srcs",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/listers/wardle/v1beta1:all-srcs",
         "//staging/src/k8s.io/sample-apiserver/pkg/cmd/server:all-srcs",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned:all-srcs",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions:all-srcs",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/listers/wardle/v1alpha1:all-srcs",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/listers/wardle/v1beta1:all-srcs",
         "//staging/src/k8s.io/sample-apiserver/pkg/registry:all-srcs",
     ],
     tags = ["automanaged"],

staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder/BUILD

@@ -18,8 +18,8 @@ go_library(
         "//staging/src/k8s.io/apiserver/pkg/admission:go_default_library",
         "//staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer:go_default_library",
         "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/listers/wardle/v1alpha1:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/listers/wardle/v1alpha1:go_default_library",
     ],
 )
 
@@ -35,8 +35,8 @@ go_test(
         "//staging/src/k8s.io/client-go/testing:go_default_library",
         "//staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer:go_default_library",
         "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/fake:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions:go_default_library",
     ],
 )
 

staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer/BUILD

@@ -16,7 +16,7 @@ go_library(
     importpath = "k8s.io/sample-apiserver/pkg/admission/wardleinitializer",
     deps = [
         "//staging/src/k8s.io/apiserver/pkg/admission:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions:go_default_library",
     ],
 )
 
@@ -26,8 +26,8 @@ go_test(
     embed = [":go_default_library"],
     deps = [
         "//staging/src/k8s.io/apiserver/pkg/admission:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/fake:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions:go_default_library",
     ],
 )
 

staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions/wardle/BUILD

@@ -1,32 +0,0 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library")
-
-go_library(
-    name = "go_default_library",
-    srcs = ["interface.go"],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/client/informers/externalversions/wardle",
-    importpath = "k8s.io/sample-apiserver/pkg/client/informers/externalversions/wardle",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions/internalinterfaces:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions/wardle/v1alpha1:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions/wardle/v1beta1:go_default_library",
-    ],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [
-        ":package-srcs",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions/wardle/v1alpha1:all-srcs",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions/wardle/v1beta1:all-srcs",
-    ],
-    tags = ["automanaged"],
-    visibility = ["//visibility:public"],
-)

staging/src/k8s.io/sample-apiserver/pkg/cmd/server/BUILD

@@ -19,8 +19,8 @@ go_library(
         "//staging/src/k8s.io/sample-apiserver/pkg/admission/wardleinitializer:go_default_library",
         "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1:go_default_library",
         "//staging/src/k8s.io/sample-apiserver/pkg/apiserver:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
     ],
 )

staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/BUILD

@@ -6,15 +6,15 @@ go_library(
         "clientset.go",
         "doc.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/client/clientset/versioned",
-    importpath = "k8s.io/sample-apiserver/pkg/client/clientset/versioned",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/generated/clientset/versioned",
+    importpath = "k8s.io/sample-apiserver/pkg/generated/clientset/versioned",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/client-go/discovery:go_default_library",
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1beta1:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1:go_default_library",
     ],
 )
 
@@ -29,10 +29,10 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake:all-srcs",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/scheme:all-srcs",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1:all-srcs",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1beta1:all-srcs",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/fake:all-srcs",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/scheme:all-srcs",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1:all-srcs",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1:all-srcs",
     ],
     tags = ["automanaged"],
     visibility = ["//visibility:public"],

staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/clientset.go

@@ -22,8 +22,8 @@ import (
 	discovery "k8s.io/client-go/discovery"
 	rest "k8s.io/client-go/rest"
 	flowcontrol "k8s.io/client-go/util/flowcontrol"
-	wardlev1alpha1 "k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1"
-	wardlev1beta1 "k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1beta1"
+	wardlev1alpha1 "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1"
+	wardlev1beta1 "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1"
 )
 
 type Interface interface {

staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/fake/BUILD

@@ -7,8 +7,8 @@ go_library(
         "doc.go",
         "register.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake",
-    importpath = "k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/fake",
+    importpath = "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/fake",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -22,11 +22,11 @@ go_library(
         "//staging/src/k8s.io/client-go/testing:go_default_library",
         "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1:go_default_library",
         "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1/fake:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1beta1:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1beta1/fake:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/fake:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1/fake:go_default_library",
     ],
 )
 

staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/fake/clientset_generated.go

@@ -24,11 +24,11 @@ import (
 	"k8s.io/client-go/discovery"
 	fakediscovery "k8s.io/client-go/discovery/fake"
 	"k8s.io/client-go/testing"
-	clientset "k8s.io/sample-apiserver/pkg/client/clientset/versioned"
-	wardlev1alpha1 "k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1"
-	fakewardlev1alpha1 "k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1/fake"
-	wardlev1beta1 "k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1beta1"
-	fakewardlev1beta1 "k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1beta1/fake"
+	clientset "k8s.io/sample-apiserver/pkg/generated/clientset/versioned"
+	wardlev1alpha1 "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1"
+	fakewardlev1alpha1 "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/fake"
+	wardlev1beta1 "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1"
+	fakewardlev1beta1 "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1/fake"
 )
 
 // NewSimpleClientset returns a clientset that will respond with the provided objects.

staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/scheme/BUILD

@@ -6,8 +6,8 @@ go_library(
         "doc.go",
         "register.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/client/clientset/versioned/scheme",
-    importpath = "k8s.io/sample-apiserver/pkg/client/clientset/versioned/scheme",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/scheme",
+    importpath = "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/scheme",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/BUILD

@@ -9,8 +9,8 @@ go_library(
         "generated_expansion.go",
         "wardle_client.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1",
-    importpath = "k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1",
+    importpath = "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -19,7 +19,7 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/scheme:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/scheme:go_default_library",
     ],
 )
 
@@ -34,7 +34,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1/fake:all-srcs",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/fake:all-srcs",
     ],
     tags = ["automanaged"],
     visibility = ["//visibility:public"],

staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/fake/BUILD

@@ -8,8 +8,8 @@ go_library(
         "fake_flunder.go",
         "fake_wardle_client.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1/fake",
-    importpath = "k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1/fake",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/fake",
+    importpath = "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/fake",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -20,7 +20,7 @@ go_library(
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/client-go/testing:go_default_library",
         "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1:go_default_library",
     ],
 )
 

staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/fake/fake_wardle_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-apiserver/pkg/client/clientset/versioned/typed/wardle/v1alpha1"
+	v1alpha1 "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1"
 )
 
 type FakeWardleV1alpha1 struct {

staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/fischer.go

@@ -26,7 +26,7 @@ import (
 	watch "k8s.io/apimachinery/pkg/watch"
 	rest "k8s.io/client-go/rest"
 	v1alpha1 "k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1"
-	scheme "k8s.io/sample-apiserver/pkg/client/clientset/versioned/scheme"
+	scheme "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/scheme"
 )
 
 // FischersGetter has a method to return a FischerInterface.

staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/flunder.go

@@ -26,7 +26,7 @@ import (
 	watch "k8s.io/apimachinery/pkg/watch"
 	rest "k8s.io/client-go/rest"
 	v1alpha1 "k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1"
-	scheme "k8s.io/sample-apiserver/pkg/client/clientset/versioned/scheme"
+	scheme "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/scheme"
 )
 
 // FlundersGetter has a method to return a FlunderInterface.

staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/wardle_client.go

@@ -22,7 +22,7 @@ import (
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	rest "k8s.io/client-go/rest"
 	v1alpha1 "k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1"
-	"k8s.io/sample-apiserver/pkg/client/clientset/versioned/scheme"
+	"k8s.io/sample-apiserver/pkg/generated/clientset/versioned/scheme"
 )
 
 type WardleV1alpha1Interface interface {

staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1/BUILD

@@ -8,8 +8,8 @@ go_library(
         "generated_expansion.go",
         "wardle_client.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1beta1",
-    importpath = "k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1beta1",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1",
+    importpath = "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -18,7 +18,7 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/scheme:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/scheme:go_default_library",
     ],
 )
 
@@ -33,7 +33,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1beta1/fake:all-srcs",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1/fake:all-srcs",
     ],
     tags = ["automanaged"],
     visibility = ["//visibility:public"],

staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1/fake/BUILD

@@ -7,8 +7,8 @@ go_library(
         "fake_flunder.go",
         "fake_wardle_client.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1beta1/fake",
-    importpath = "k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1beta1/fake",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1/fake",
+    importpath = "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1/fake",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -19,7 +19,7 @@ go_library(
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/client-go/testing:go_default_library",
         "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1beta1:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1:go_default_library",
     ],
 )
 

staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1/fake/fake_wardle_client.go

@@ -21,7 +21,7 @@ package fake
 import (
 	rest "k8s.io/client-go/rest"
 	testing "k8s.io/client-go/testing"
-	v1beta1 "k8s.io/sample-apiserver/pkg/client/clientset/versioned/typed/wardle/v1beta1"
+	v1beta1 "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1"
 )
 
 type FakeWardleV1beta1 struct {

staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1/flunder.go

@@ -26,7 +26,7 @@ import (
 	watch "k8s.io/apimachinery/pkg/watch"
 	rest "k8s.io/client-go/rest"
 	v1beta1 "k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1"
-	scheme "k8s.io/sample-apiserver/pkg/client/clientset/versioned/scheme"
+	scheme "k8s.io/sample-apiserver/pkg/generated/clientset/versioned/scheme"
 )
 
 // FlundersGetter has a method to return a FlunderInterface.

staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1/wardle_client.go

@@ -22,7 +22,7 @@ import (
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	rest "k8s.io/client-go/rest"
 	v1beta1 "k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1"
-	"k8s.io/sample-apiserver/pkg/client/clientset/versioned/scheme"
+	"k8s.io/sample-apiserver/pkg/generated/clientset/versioned/scheme"
 )
 
 type WardleV1beta1Interface interface {

staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/BUILD

@@ -6,8 +6,8 @@ go_library(
         "factory.go",
         "generic.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/client/informers/externalversions",
-    importpath = "k8s.io/sample-apiserver/pkg/client/informers/externalversions",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/generated/informers/externalversions",
+    importpath = "k8s.io/sample-apiserver/pkg/generated/informers/externalversions",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -16,9 +16,9 @@ go_library(
         "//staging/src/k8s.io/client-go/tools/cache:go_default_library",
         "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1:go_default_library",
         "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions/internalinterfaces:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions/wardle:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/internalinterfaces:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle:go_default_library",
     ],
 )
 
@@ -33,8 +33,8 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions/internalinterfaces:all-srcs",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions/wardle:all-srcs",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/internalinterfaces:all-srcs",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle:all-srcs",
     ],
     tags = ["automanaged"],
     visibility = ["//visibility:public"],

staging/src/k8s.io/sample-apiserver/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-apiserver/pkg/client/clientset/versioned"
-	internalinterfaces "k8s.io/sample-apiserver/pkg/client/informers/externalversions/internalinterfaces"
-	wardle "k8s.io/sample-apiserver/pkg/client/informers/externalversions/wardle"
+	versioned "k8s.io/sample-apiserver/pkg/generated/clientset/versioned"
+	internalinterfaces "k8s.io/sample-apiserver/pkg/generated/informers/externalversions/internalinterfaces"
+	wardle "k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle"
 )
 
 // SharedInformerOption defines the functional option type for SharedInformerFactory.

staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/internalinterfaces/BUILD

@@ -3,14 +3,14 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["factory_interfaces.go"],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/client/informers/externalversions/internalinterfaces",
-    importpath = "k8s.io/sample-apiserver/pkg/client/informers/externalversions/internalinterfaces",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/internalinterfaces",
+    importpath = "k8s.io/sample-apiserver/pkg/generated/informers/externalversions/internalinterfaces",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//staging/src/k8s.io/client-go/tools/cache:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned:go_default_library",
     ],
 )
 

staging/src/k8s.io/sample-apiserver/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-apiserver/pkg/client/clientset/versioned"
+	versioned "k8s.io/sample-apiserver/pkg/generated/clientset/versioned"
 )
 
 // NewInformerFunc takes versioned.Interface and time.Duration to return a SharedIndexInformer.

staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle/BUILD

@@ -0,0 +1,32 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = ["interface.go"],
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle",
+    importpath = "k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/internalinterfaces:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle/v1alpha1:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle/v1beta1:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [
+        ":package-srcs",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle/v1alpha1:all-srcs",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle/v1beta1:all-srcs",
+    ],
+    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
+)

staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle/interface.go

@@ -19,9 +19,9 @@ limitations under the License.
 package wardle
 
 import (
-	internalinterfaces "k8s.io/sample-apiserver/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "k8s.io/sample-apiserver/pkg/client/informers/externalversions/wardle/v1alpha1"
-	v1beta1 "k8s.io/sample-apiserver/pkg/client/informers/externalversions/wardle/v1beta1"
+	internalinterfaces "k8s.io/sample-apiserver/pkg/generated/informers/externalversions/internalinterfaces"
+	v1alpha1 "k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle/v1alpha1"
+	v1beta1 "k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle/v1beta1"
 )
 
 // Interface provides access to each of this group's versions.

staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle/v1alpha1/BUILD

@@ -7,8 +7,8 @@ go_library(
         "flunder.go",
         "interface.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/client/informers/externalversions/wardle/v1alpha1",
-    importpath = "k8s.io/sample-apiserver/pkg/client/informers/externalversions/wardle/v1alpha1",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle/v1alpha1",
+    importpath = "k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle/v1alpha1",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -16,9 +16,9 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
         "//staging/src/k8s.io/client-go/tools/cache:go_default_library",
         "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions/internalinterfaces:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/listers/wardle/v1alpha1:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/internalinterfaces:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/listers/wardle/v1alpha1:go_default_library",
     ],
 )
 

staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle/v1alpha1/fischer.go

@@ -26,9 +26,9 @@ import (
 	watch "k8s.io/apimachinery/pkg/watch"
 	cache "k8s.io/client-go/tools/cache"
 	wardlev1alpha1 "k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1"
-	versioned "k8s.io/sample-apiserver/pkg/client/clientset/versioned"
-	internalinterfaces "k8s.io/sample-apiserver/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "k8s.io/sample-apiserver/pkg/client/listers/wardle/v1alpha1"
+	versioned "k8s.io/sample-apiserver/pkg/generated/clientset/versioned"
+	internalinterfaces "k8s.io/sample-apiserver/pkg/generated/informers/externalversions/internalinterfaces"
+	v1alpha1 "k8s.io/sample-apiserver/pkg/generated/listers/wardle/v1alpha1"
 )
 
 // FischerInformer provides access to a shared informer and lister for

staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle/v1alpha1/flunder.go

@@ -26,9 +26,9 @@ import (
 	watch "k8s.io/apimachinery/pkg/watch"
 	cache "k8s.io/client-go/tools/cache"
 	wardlev1alpha1 "k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1"
-	versioned "k8s.io/sample-apiserver/pkg/client/clientset/versioned"
-	internalinterfaces "k8s.io/sample-apiserver/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "k8s.io/sample-apiserver/pkg/client/listers/wardle/v1alpha1"
+	versioned "k8s.io/sample-apiserver/pkg/generated/clientset/versioned"
+	internalinterfaces "k8s.io/sample-apiserver/pkg/generated/informers/externalversions/internalinterfaces"
+	v1alpha1 "k8s.io/sample-apiserver/pkg/generated/listers/wardle/v1alpha1"
 )
 
 // FlunderInformer provides access to a shared informer and lister for

staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle/v1alpha1/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	internalinterfaces "k8s.io/sample-apiserver/pkg/client/informers/externalversions/internalinterfaces"
+	internalinterfaces "k8s.io/sample-apiserver/pkg/generated/informers/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle/v1beta1/BUILD

@@ -6,8 +6,8 @@ go_library(
         "flunder.go",
         "interface.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/client/informers/externalversions/wardle/v1beta1",
-    importpath = "k8s.io/sample-apiserver/pkg/client/informers/externalversions/wardle/v1beta1",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle/v1beta1",
+    importpath = "k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle/v1beta1",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -15,9 +15,9 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
         "//staging/src/k8s.io/client-go/tools/cache:go_default_library",
         "//staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/informers/externalversions/internalinterfaces:go_default_library",
-        "//staging/src/k8s.io/sample-apiserver/pkg/client/listers/wardle/v1beta1:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/internalinterfaces:go_default_library",
+        "//staging/src/k8s.io/sample-apiserver/pkg/generated/listers/wardle/v1beta1:go_default_library",
     ],
 )
 

staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle/v1beta1/flunder.go

@@ -26,9 +26,9 @@ import (
 	watch "k8s.io/apimachinery/pkg/watch"
 	cache "k8s.io/client-go/tools/cache"
 	wardlev1beta1 "k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1"
-	versioned "k8s.io/sample-apiserver/pkg/client/clientset/versioned"
-	internalinterfaces "k8s.io/sample-apiserver/pkg/client/informers/externalversions/internalinterfaces"
-	v1beta1 "k8s.io/sample-apiserver/pkg/client/listers/wardle/v1beta1"
+	versioned "k8s.io/sample-apiserver/pkg/generated/clientset/versioned"
+	internalinterfaces "k8s.io/sample-apiserver/pkg/generated/informers/externalversions/internalinterfaces"
+	v1beta1 "k8s.io/sample-apiserver/pkg/generated/listers/wardle/v1beta1"
 )
 
 // FlunderInformer provides access to a shared informer and lister for

staging/src/k8s.io/sample-apiserver/pkg/generated/informers/externalversions/wardle/v1beta1/interface.go

@@ -19,7 +19,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	internalinterfaces "k8s.io/sample-apiserver/pkg/client/informers/externalversions/internalinterfaces"
+	internalinterfaces "k8s.io/sample-apiserver/pkg/generated/informers/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

staging/src/k8s.io/sample-apiserver/pkg/generated/listers/wardle/v1alpha1/BUILD

@@ -7,8 +7,8 @@ go_library(
         "fischer.go",
         "flunder.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/client/listers/wardle/v1alpha1",
-    importpath = "k8s.io/sample-apiserver/pkg/client/listers/wardle/v1alpha1",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/generated/listers/wardle/v1alpha1",
+    importpath = "k8s.io/sample-apiserver/pkg/generated/listers/wardle/v1alpha1",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",

staging/src/k8s.io/sample-apiserver/pkg/generated/listers/wardle/v1beta1/BUILD

@@ -6,8 +6,8 @@ go_library(
         "expansion_generated.go",
         "flunder.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/client/listers/wardle/v1beta1",
-    importpath = "k8s.io/sample-apiserver/pkg/client/listers/wardle/v1beta1",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/generated/listers/wardle/v1beta1",
+    importpath = "k8s.io/sample-apiserver/pkg/generated/listers/wardle/v1beta1",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",

staging/src/k8s.io/sample-controller/BUILD

@@ -28,11 +28,11 @@ go_library(
         "//staging/src/k8s.io/client-go/tools/record:go_default_library",
         "//staging/src/k8s.io/client-go/util/workqueue:go_default_library",
         "//staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/clientset/versioned:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/clientset/versioned/scheme:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/informers/externalversions:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/informers/externalversions/samplecontroller/v1alpha1:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/listers/samplecontroller/v1alpha1:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/scheme:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/informers/externalversions:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/informers/externalversions/samplecontroller/v1alpha1:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/listers/samplecontroller/v1alpha1:go_default_library",
         "//staging/src/k8s.io/sample-controller/pkg/signals:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
     ],
@@ -56,9 +56,9 @@ filegroup(
     srcs = [
         ":package-srcs",
         "//staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller:all-srcs",
-        "//staging/src/k8s.io/sample-controller/pkg/client/clientset/versioned:all-srcs",
-        "//staging/src/k8s.io/sample-controller/pkg/client/informers/externalversions:all-srcs",
-        "//staging/src/k8s.io/sample-controller/pkg/client/listers/samplecontroller/v1alpha1:all-srcs",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned:all-srcs",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/informers/externalversions:all-srcs",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/listers/samplecontroller/v1alpha1:all-srcs",
         "//staging/src/k8s.io/sample-controller/pkg/signals:all-srcs",
     ],
     tags = ["automanaged"],
@@ -81,7 +81,7 @@ go_test(
         "//staging/src/k8s.io/client-go/tools/cache:go_default_library",
         "//staging/src/k8s.io/client-go/tools/record:go_default_library",
         "//staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/clientset/versioned/fake:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/informers/externalversions:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/fake:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/informers/externalversions:go_default_library",
     ],
 )

staging/src/k8s.io/sample-controller/pkg/client/informers/externalversions/samplecontroller/BUILD

@@ -1,30 +0,0 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library")
-
-go_library(
-    name = "go_default_library",
-    srcs = ["interface.go"],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-controller/pkg/client/informers/externalversions/samplecontroller",
-    importpath = "k8s.io/sample-controller/pkg/client/informers/externalversions/samplecontroller",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//staging/src/k8s.io/sample-controller/pkg/client/informers/externalversions/internalinterfaces:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/informers/externalversions/samplecontroller/v1alpha1:go_default_library",
-    ],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [
-        ":package-srcs",
-        "//staging/src/k8s.io/sample-controller/pkg/client/informers/externalversions/samplecontroller/v1alpha1:all-srcs",
-    ],
-    tags = ["automanaged"],
-    visibility = ["//visibility:public"],
-)

staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/BUILD

@@ -6,14 +6,14 @@ go_library(
         "clientset.go",
         "doc.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-controller/pkg/client/clientset/versioned",
-    importpath = "k8s.io/sample-controller/pkg/client/clientset/versioned",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-controller/pkg/generated/clientset/versioned",
+    importpath = "k8s.io/sample-controller/pkg/generated/clientset/versioned",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/client-go/discovery:go_default_library",
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1:go_default_library",
     ],
 )
 
@@ -28,9 +28,9 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//staging/src/k8s.io/sample-controller/pkg/client/clientset/versioned/fake:all-srcs",
-        "//staging/src/k8s.io/sample-controller/pkg/client/clientset/versioned/scheme:all-srcs",
-        "//staging/src/k8s.io/sample-controller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1:all-srcs",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/fake:all-srcs",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/scheme:all-srcs",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1:all-srcs",
     ],
     tags = ["automanaged"],
     visibility = ["//visibility:public"],

staging/src/k8s.io/sample-controller/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 {

staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/fake/BUILD

@@ -7,8 +7,8 @@ go_library(
         "doc.go",
         "register.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-controller/pkg/client/clientset/versioned/fake",
-    importpath = "k8s.io/sample-controller/pkg/client/clientset/versioned/fake",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-controller/pkg/generated/clientset/versioned/fake",
+    importpath = "k8s.io/sample-controller/pkg/generated/clientset/versioned/fake",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -21,9 +21,9 @@ go_library(
         "//staging/src/k8s.io/client-go/discovery/fake:go_default_library",
         "//staging/src/k8s.io/client-go/testing:go_default_library",
         "//staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/clientset/versioned:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/fake:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/fake:go_default_library",
     ],
 )
 

staging/src/k8s.io/sample-controller/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.

staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/scheme/BUILD

@@ -6,8 +6,8 @@ go_library(
         "doc.go",
         "register.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-controller/pkg/client/clientset/versioned/scheme",
-    importpath = "k8s.io/sample-controller/pkg/client/clientset/versioned/scheme",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-controller/pkg/generated/clientset/versioned/scheme",
+    importpath = "k8s.io/sample-controller/pkg/generated/clientset/versioned/scheme",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/BUILD

@@ -8,8 +8,8 @@ go_library(
         "generated_expansion.go",
         "samplecontroller_client.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-controller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1",
-    importpath = "k8s.io/sample-controller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-controller/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1",
+    importpath = "k8s.io/sample-controller/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -18,7 +18,7 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/clientset/versioned/scheme:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/scheme:go_default_library",
     ],
 )
 
@@ -33,7 +33,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//staging/src/k8s.io/sample-controller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/fake:all-srcs",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/fake:all-srcs",
     ],
     tags = ["automanaged"],
     visibility = ["//visibility:public"],

staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/fake/BUILD

@@ -7,8 +7,8 @@ go_library(
         "fake_foo.go",
         "fake_samplecontroller_client.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-controller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/fake",
-    importpath = "k8s.io/sample-controller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1/fake",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-controller/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/fake",
+    importpath = "k8s.io/sample-controller/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/fake",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -19,7 +19,7 @@ go_library(
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/client-go/testing:go_default_library",
         "//staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/clientset/versioned/typed/samplecontroller/v1alpha1:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1:go_default_library",
     ],
 )
 

staging/src/k8s.io/sample-controller/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 {

staging/src/k8s.io/sample-controller/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.

staging/src/k8s.io/sample-controller/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 {

staging/src/k8s.io/sample-controller/pkg/generated/informers/externalversions/BUILD

@@ -6,8 +6,8 @@ go_library(
         "factory.go",
         "generic.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-controller/pkg/client/informers/externalversions",
-    importpath = "k8s.io/sample-controller/pkg/client/informers/externalversions",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-controller/pkg/generated/informers/externalversions",
+    importpath = "k8s.io/sample-controller/pkg/generated/informers/externalversions",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -15,9 +15,9 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
         "//staging/src/k8s.io/client-go/tools/cache:go_default_library",
         "//staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/clientset/versioned:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/informers/externalversions/internalinterfaces:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/informers/externalversions/samplecontroller:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/informers/externalversions/internalinterfaces:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/informers/externalversions/samplecontroller:go_default_library",
     ],
 )
 
@@ -32,8 +32,8 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//staging/src/k8s.io/sample-controller/pkg/client/informers/externalversions/internalinterfaces:all-srcs",
-        "//staging/src/k8s.io/sample-controller/pkg/client/informers/externalversions/samplecontroller:all-srcs",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/informers/externalversions/internalinterfaces:all-srcs",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/informers/externalversions/samplecontroller:all-srcs",
     ],
     tags = ["automanaged"],
     visibility = ["//visibility:public"],

staging/src/k8s.io/sample-controller/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.

staging/src/k8s.io/sample-controller/pkg/generated/informers/externalversions/internalinterfaces/BUILD

@@ -3,14 +3,14 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["factory_interfaces.go"],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-controller/pkg/client/informers/externalversions/internalinterfaces",
-    importpath = "k8s.io/sample-controller/pkg/client/informers/externalversions/internalinterfaces",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-controller/pkg/generated/informers/externalversions/internalinterfaces",
+    importpath = "k8s.io/sample-controller/pkg/generated/informers/externalversions/internalinterfaces",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//staging/src/k8s.io/client-go/tools/cache:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/clientset/versioned:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned:go_default_library",
     ],
 )
 

staging/src/k8s.io/sample-controller/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.

staging/src/k8s.io/sample-controller/pkg/generated/informers/externalversions/samplecontroller/BUILD

@@ -0,0 +1,30 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = ["interface.go"],
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-controller/pkg/generated/informers/externalversions/samplecontroller",
+    importpath = "k8s.io/sample-controller/pkg/generated/informers/externalversions/samplecontroller",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//staging/src/k8s.io/sample-controller/pkg/generated/informers/externalversions/internalinterfaces:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/informers/externalversions/samplecontroller/v1alpha1:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [
+        ":package-srcs",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/informers/externalversions/samplecontroller/v1alpha1:all-srcs",
+    ],
+    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
+)

staging/src/k8s.io/sample-controller/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.

staging/src/k8s.io/sample-controller/pkg/generated/informers/externalversions/samplecontroller/v1alpha1/BUILD

@@ -6,8 +6,8 @@ go_library(
         "foo.go",
         "interface.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-controller/pkg/client/informers/externalversions/samplecontroller/v1alpha1",
-    importpath = "k8s.io/sample-controller/pkg/client/informers/externalversions/samplecontroller/v1alpha1",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-controller/pkg/generated/informers/externalversions/samplecontroller/v1alpha1",
+    importpath = "k8s.io/sample-controller/pkg/generated/informers/externalversions/samplecontroller/v1alpha1",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -15,9 +15,9 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
         "//staging/src/k8s.io/client-go/tools/cache:go_default_library",
         "//staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/clientset/versioned:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/informers/externalversions/internalinterfaces:go_default_library",
-        "//staging/src/k8s.io/sample-controller/pkg/client/listers/samplecontroller/v1alpha1:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/informers/externalversions/internalinterfaces:go_default_library",
+        "//staging/src/k8s.io/sample-controller/pkg/generated/listers/samplecontroller/v1alpha1:go_default_library",
     ],
 )
 

staging/src/k8s.io/sample-controller/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

staging/src/k8s.io/sample-controller/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.

staging/src/k8s.io/sample-controller/pkg/generated/listers/samplecontroller/v1alpha1/BUILD

@@ -6,8 +6,8 @@ go_library(
         "expansion_generated.go",
         "foo.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-controller/pkg/client/listers/samplecontroller/v1alpha1",
-    importpath = "k8s.io/sample-controller/pkg/client/listers/samplecontroller/v1alpha1",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/sample-controller/pkg/generated/listers/samplecontroller/v1alpha1",
+    importpath = "k8s.io/sample-controller/pkg/generated/listers/samplecontroller/v1alpha1",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",