Merge pull request #41403 from deads2k/agg-12-all

Automatic merge from submit-queue Remove all aggregator dependencies on k8s.io/kubernetes This removes the last links to k8s.io/kubernetes for the aggregator. @sttts last commit.

Merge pull request #41403 from deads2k/agg-12-all
bc29bb02 · Kubernetes Submit Queue · GitHub · f85fc7da · 1f6fd8d1 · bc29bb02
Commit bc29bb02 authored Feb 14, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 14, 2017
25 changed files
--- a/cmd/kube-aggregator/hack/update-codegen.sh
+++ b/cmd/kube-aggregator/hack/update-codegen.sh
@@ -22,6 +22,15 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../..
 APIFEDERATOR_ROOT=$(dirname "${BASH_SOURCE}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"
+if LANG=C sed --help 2>&1 | grep -q GNU; then
+  SED="sed"
+elif which gsed &>/dev/null; then
+  SED="gsed"
+else
+  echo "Failed to find GNU sed as sed or gsed. If you are on Mac: brew install gnu-sed." >&2
+  exit 1
+fi
 # Register function to be called on EXIT to remove generated binary.
 function cleanup {
  rm -f "${CLIENTGEN:-}"
@@ -67,3 +76,13 @@ ${informergen} \
  --listers-package k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers \
  --output-package k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/informers
  "$@"
+# this is a temporary hack until we manage to update codegen to accept a scheme instead of hardcoding it
+echo "rewriting imports"
+grep -R -H  "\"k8s.io/kubernetes/pkg" "${KUBE_ROOT}/cmd/kube-aggregator/pkg/client" | cut -d: -f1 | sort | uniq | \
+    grep "\.go" | \
+    xargs ${SED} -i "s|\"k8s.io/kubernetes/pkg|\"k8s.io/client-go/pkg|g"
+echo "running gofmt"
+find "${KUBE_ROOT}/cmd/kube-aggregator/pkg/client" -type f -name "*.go" -print0 | xargs -0 gofmt -w
--- a/cmd/kube-aggregator/pkg/apis/apiregistration/BUILD
+++ b/cmd/kube-aggregator/pkg/apis/apiregistration/BUILD
@@ -18,11 +18,11 @@ go_library(
    ],
    tags = ["automanaged"],
    deps = [
-        "//pkg/api:go_default_library",
        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
        "//vendor:k8s.io/apimachinery/pkg/conversion",
        "//vendor:k8s.io/apimachinery/pkg/runtime",
        "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
+        "//vendor:k8s.io/client-go/pkg/api",
    ],
 )

--- a/cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD
+++ b/cmd/kube-aggregator/pkg/apis/apiregistration/install/BUILD
@@ -14,11 +14,11 @@ go_library(
    deps = [
        "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library",
        "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library",
-        "//pkg/api:go_default_library",
        "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced",
        "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
        "//vendor:k8s.io/apimachinery/pkg/runtime",
        "//vendor:k8s.io/apimachinery/pkg/util/sets",
+        "//vendor:k8s.io/client-go/pkg/api",
    ],
 )

--- a/cmd/kube-aggregator/pkg/apis/apiregistration/install/install.go
+++ b/cmd/kube-aggregator/pkg/apis/apiregistration/install/install.go
@@ -21,9 +21,9 @@ import (
 	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/client-go/pkg/api"
 	"k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration"
 	"k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1"
-	"k8s.io/kubernetes/pkg/api"
 )
 func init() {

--- a/cmd/kube-aggregator/pkg/apis/apiregistration/register.go
+++ b/cmd/kube-aggregator/pkg/apis/apiregistration/register.go
@@ -20,7 +20,9 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	kapi "k8s.io/kubernetes/pkg/api"
+	// we register here until we separate our scheme, which requires updates to client gen
+	kapi "k8s.io/client-go/pkg/api"
 )
 const GroupName = "apiregistration.k8s.io"

--- a/cmd/kube-aggregator/pkg/apiserver/BUILD
+++ b/cmd/kube-aggregator/pkg/apiserver/BUILD
@@ -19,7 +19,6 @@ go_test(
    deps = [
        "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library",
        "//cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion:go_default_library",
-        "//pkg/api:go_default_library",
        "//vendor:k8s.io/apimachinery/pkg/api/equality",
        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
        "//vendor:k8s.io/apimachinery/pkg/runtime",
@@ -28,6 +27,7 @@ go_test(
        "//vendor:k8s.io/apiserver/pkg/authentication/user",
        "//vendor:k8s.io/apiserver/pkg/endpoints/request",
        "//vendor:k8s.io/client-go/listers/core/v1",
+        "//vendor:k8s.io/client-go/pkg/api",
        "//vendor:k8s.io/client-go/pkg/api/v1",
        "//vendor:k8s.io/client-go/tools/cache",
    ],
@@ -50,9 +50,6 @@ go_library(
        "//cmd/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion:go_default_library",
        "//cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion:go_default_library",
        "//cmd/kube-aggregator/pkg/registry/apiservice/etcd:go_default_library",
-        "//pkg/api:go_default_library",
-        "//pkg/api/install:go_default_library",
-        "//pkg/version:go_default_library",
        "//vendor:github.com/golang/glog",
        "//vendor:k8s.io/apimachinery/pkg/api/errors",
        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
@@ -71,6 +68,9 @@ go_library(
        "//vendor:k8s.io/client-go/informers",
        "//vendor:k8s.io/client-go/kubernetes",
        "//vendor:k8s.io/client-go/listers/core/v1",
+        "//vendor:k8s.io/client-go/pkg/api",
+        "//vendor:k8s.io/client-go/pkg/api/install",
+        "//vendor:k8s.io/client-go/pkg/version",
        "//vendor:k8s.io/client-go/rest",
        "//vendor:k8s.io/client-go/tools/cache",
        "//vendor:k8s.io/client-go/transport",

--- a/cmd/kube-aggregator/pkg/apiserver/apiserver.go
+++ b/cmd/kube-aggregator/pkg/apiserver/apiserver.go
@@ -30,8 +30,8 @@ import (
 	kubeinformers "k8s.io/client-go/informers"
 	kubeclientset "k8s.io/client-go/kubernetes"
 	v1listers "k8s.io/client-go/listers/core/v1"
-	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/client-go/pkg/api"
-	"k8s.io/kubernetes/pkg/version"
+	"k8s.io/client-go/pkg/version"
 	"k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration"
 	"k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1"
@@ -40,7 +40,7 @@ import (
 	listers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion"
 	apiservicestorage "k8s.io/kubernetes/cmd/kube-aggregator/pkg/registry/apiservice/etcd"
-	_ "k8s.io/kubernetes/pkg/api/install"
+	_ "k8s.io/client-go/pkg/api/install"
 )
 // legacyAPIServiceName is the fixed name of the only non-groupified API version

--- a/cmd/kube-aggregator/pkg/apiserver/handler_apis.go
+++ b/cmd/kube-aggregator/pkg/apiserver/handler_apis.go
@@ -26,7 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 	v1listers "k8s.io/client-go/listers/core/v1"
-	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/client-go/pkg/api"
 	apiregistrationapi "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration"
 	apiregistrationv1alpha1api "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1"

--- a/cmd/kube-aggregator/pkg/apiserver/handler_apis_test.go
+++ b/cmd/kube-aggregator/pkg/apiserver/handler_apis_test.go
@@ -28,9 +28,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/diff"
 	v1listers "k8s.io/client-go/listers/core/v1"
+	"k8s.io/client-go/pkg/api"
 	corev1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
-	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration"
 	listers "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/listers/apiregistration/internalversion"

--- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD
+++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/BUILD
@@ -18,11 +18,11 @@ go_library(
        "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset:go_default_library",
        "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:go_default_library",
        "//cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake:go_default_library",
-        "//pkg/api:go_default_library",
        "//vendor:k8s.io/apimachinery/pkg/runtime",
        "//vendor:k8s.io/apimachinery/pkg/watch",
        "//vendor:k8s.io/client-go/discovery",
        "//vendor:k8s.io/client-go/discovery/fake",
+        "//vendor:k8s.io/client-go/pkg/api",
        "//vendor:k8s.io/client-go/testing",
    ],
 )

--- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go
+++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go
@@ -21,11 +21,11 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/discovery"
 	fakediscovery "k8s.io/client-go/discovery/fake"
+	"k8s.io/client-go/pkg/api"
 	"k8s.io/client-go/testing"
 	clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset"
 	v1alpha1apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1"
 	fakev1alpha1apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake"
-	"k8s.io/kubernetes/pkg/api"
 )
 // NewSimpleClientset returns a clientset that will respond with the provided objects.

--- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD
+++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD
@@ -18,12 +18,12 @@ go_library(
    tags = ["automanaged"],
    deps = [
        "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library",
-        "//pkg/api:go_default_library",
        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
        "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
        "//vendor:k8s.io/apimachinery/pkg/runtime/serializer",
        "//vendor:k8s.io/apimachinery/pkg/types",
        "//vendor:k8s.io/apimachinery/pkg/watch",
+        "//vendor:k8s.io/client-go/pkg/api",
        "//vendor:k8s.io/client-go/rest",
    ],
 )

--- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go
+++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go
@@ -20,8 +20,8 @@ import (
 	fmt "fmt"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	api "k8s.io/client-go/pkg/api"
 	rest "k8s.io/client-go/rest"
-	api "k8s.io/kubernetes/pkg/api"
 )
 type ApiregistrationV1alpha1Interface interface {

--- a/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go
+++ b/cmd/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go
@@ -20,9 +20,9 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
+	api "k8s.io/client-go/pkg/api"
 	rest "k8s.io/client-go/rest"
 	v1alpha1 "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1"
-	api "k8s.io/kubernetes/pkg/api"
 )
 // APIServicesGetter has a method to return a APIServiceInterface.

--- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD
+++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/BUILD
@@ -18,11 +18,11 @@ go_library(
        "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library",
        "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:go_default_library",
        "//cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake:go_default_library",
-        "//pkg/api:go_default_library",
        "//vendor:k8s.io/apimachinery/pkg/runtime",
        "//vendor:k8s.io/apimachinery/pkg/watch",
        "//vendor:k8s.io/client-go/discovery",
        "//vendor:k8s.io/client-go/discovery/fake",
+        "//vendor:k8s.io/client-go/pkg/api",
        "//vendor:k8s.io/client-go/testing",
    ],
 )

--- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go
+++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go
@@ -21,11 +21,11 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/discovery"
 	fakediscovery "k8s.io/client-go/discovery/fake"
+	"k8s.io/client-go/pkg/api"
 	"k8s.io/client-go/testing"
 	clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset"
 	internalversionapiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion"
 	fakeinternalversionapiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake"
-	"k8s.io/kubernetes/pkg/api"
 )
 // NewSimpleClientset returns a clientset that will respond with the provided objects.

--- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD
+++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/BUILD
@@ -18,10 +18,10 @@ go_library(
    tags = ["automanaged"],
    deps = [
        "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library",
-        "//pkg/api:go_default_library",
        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
        "//vendor:k8s.io/apimachinery/pkg/types",
        "//vendor:k8s.io/apimachinery/pkg/watch",
+        "//vendor:k8s.io/client-go/pkg/api",
        "//vendor:k8s.io/client-go/rest",
    ],
 )

--- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go
+++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go
@@ -17,8 +17,8 @@ limitations under the License.
 package internalversion
 import (
+	api "k8s.io/client-go/pkg/api"
 	rest "k8s.io/client-go/rest"
-	api "k8s.io/kubernetes/pkg/api"
 )
 type ApiregistrationInterface interface {

--- a/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go
+++ b/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go
@@ -20,9 +20,9 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
+	api "k8s.io/client-go/pkg/api"
 	rest "k8s.io/client-go/rest"
 	apiregistration "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration"
-	api "k8s.io/kubernetes/pkg/api"
 )
 // APIServicesGetter has a method to return a APIServiceInterface.

--- a/cmd/kube-aggregator/pkg/cmd/server/BUILD
+++ b/cmd/kube-aggregator/pkg/cmd/server/BUILD
@@ -14,7 +14,6 @@ go_library(
    deps = [
        "//cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library",
        "//cmd/kube-aggregator/pkg/apiserver:go_default_library",
-        "//pkg/api:go_default_library",
        "//vendor:github.com/spf13/cobra",
        "//vendor:k8s.io/apimachinery/pkg/util/sets",
        "//vendor:k8s.io/apimachinery/pkg/util/wait",
@@ -22,6 +21,7 @@ go_library(
        "//vendor:k8s.io/apiserver/pkg/server/filters",
        "//vendor:k8s.io/apiserver/pkg/server/options",
        "//vendor:k8s.io/client-go/kubernetes",
+        "//vendor:k8s.io/client-go/pkg/api",
        "//vendor:k8s.io/client-go/rest",
    ],
 )

--- a/cmd/kube-aggregator/pkg/cmd/server/start.go
+++ b/cmd/kube-aggregator/pkg/cmd/server/start.go
@@ -29,9 +29,9 @@ import (
 	"k8s.io/apiserver/pkg/server/filters"
 	genericoptions "k8s.io/apiserver/pkg/server/options"
 	kubeclientset "k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/pkg/api"
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/kubernetes/cmd/kube-aggregator/pkg/apiserver"
-	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/v1alpha1"
 )

--- a/cmd/kube-aggregator/pkg/registry/apiservice/BUILD
+++ b/cmd/kube-aggregator/pkg/registry/apiservice/BUILD
@@ -14,7 +14,6 @@ go_library(
    deps = [
        "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library",
        "//cmd/kube-aggregator/pkg/apis/apiregistration/validation:go_default_library",
-        "//pkg/api:go_default_library",
        "//vendor:k8s.io/apimachinery/pkg/fields",
        "//vendor:k8s.io/apimachinery/pkg/labels",
        "//vendor:k8s.io/apimachinery/pkg/runtime",
@@ -23,6 +22,7 @@ go_library(
        "//vendor:k8s.io/apiserver/pkg/registry/generic",
        "//vendor:k8s.io/apiserver/pkg/storage",
        "//vendor:k8s.io/apiserver/pkg/storage/names",
+        "//vendor:k8s.io/client-go/pkg/api",
    ],
 )

--- a/cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD
+++ b/cmd/kube-aggregator/pkg/registry/apiservice/etcd/BUILD
@@ -14,10 +14,10 @@ go_library(
    deps = [
        "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library",
        "//cmd/kube-aggregator/pkg/registry/apiservice:go_default_library",
-        "//pkg/api:go_default_library",
        "//vendor:k8s.io/apimachinery/pkg/runtime",
        "//vendor:k8s.io/apiserver/pkg/registry/generic",
        "//vendor:k8s.io/apiserver/pkg/registry/generic/registry",
+        "//vendor:k8s.io/client-go/pkg/api",
    ],
 )

--- a/cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go
+++ b/cmd/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go
@@ -20,9 +20,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apiserver/pkg/registry/generic"
 	genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"
+	"k8s.io/client-go/pkg/api"
 	"k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration"
 	"k8s.io/kubernetes/cmd/kube-aggregator/pkg/registry/apiservice"
-	"k8s.io/kubernetes/pkg/api"
 )
 // rest implements a RESTStorage for API services against etcd

--- a/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go
+++ b/cmd/kube-aggregator/pkg/registry/apiservice/strategy.go
@@ -27,7 +27,7 @@ import (
 	"k8s.io/apiserver/pkg/registry/generic"
 	"k8s.io/apiserver/pkg/storage"
 	"k8s.io/apiserver/pkg/storage/names"
-	kapi "k8s.io/kubernetes/pkg/api"
+	kapi "k8s.io/client-go/pkg/api"
 	"k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration"
 	"k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration/validation"