From e901800687049c8681cf711a96a21097a3f71a7f Mon Sep 17 00:00:00 2001 From: Klaus Ma Date: Thu, 22 Dec 2016 16:28:20 +0800 Subject: [PATCH] Update NodeRef to v1.ObjectReference. --- cmd/kube-proxy/app/options/BUILD | 1 + cmd/kube-proxy/app/options/options.go | 3 ++- cmd/kube-proxy/app/server.go | 2 +- pkg/kubemark/BUILD | 1 + pkg/kubemark/hollow_proxy.go | 3 ++- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmd/kube-proxy/app/options/BUILD b/cmd/kube-proxy/app/options/BUILD index fae8a944b6c..ccadd208a3d 100644 --- a/cmd/kube-proxy/app/options/BUILD +++ b/cmd/kube-proxy/app/options/BUILD @@ -13,6 +13,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/api/v1:go_default_library", "//pkg/apis/componentconfig:go_default_library", "//pkg/apis/componentconfig/v1alpha1:go_default_library", "//pkg/kubelet/qos:go_default_library", diff --git a/cmd/kube-proxy/app/options/options.go b/cmd/kube-proxy/app/options/options.go index dffa1ffcfdb..0ea68fb1b87 100644 --- a/cmd/kube-proxy/app/options/options.go +++ b/cmd/kube-proxy/app/options/options.go @@ -22,6 +22,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/qos" @@ -44,7 +45,7 @@ type ProxyServerConfig struct { KubeAPIBurst int32 ConfigSyncPeriod time.Duration CleanupAndExit bool - NodeRef *api.ObjectReference + NodeRef *v1.ObjectReference Master string Kubeconfig string } diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index ed9f24ecb6d..8b8199faf98 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -292,7 +292,7 @@ func NewProxyServerDefault(config *options.ProxyServerConfig) (*ProxyServer, err endpointsConfig.Channel("api"), ) - config.NodeRef = &api.ObjectReference{ + config.NodeRef = &v1.ObjectReference{ Kind: "Node", Name: hostname, UID: types.UID(hostname), diff --git a/pkg/kubemark/BUILD b/pkg/kubemark/BUILD index c84fb88d752..9e02336a5c8 100644 --- a/pkg/kubemark/BUILD +++ b/pkg/kubemark/BUILD @@ -19,6 +19,7 @@ go_library( "//cmd/kube-proxy/app/options:go_default_library", "//cmd/kubelet/app:go_default_library", "//pkg/api:go_default_library", + "//pkg/api/v1:go_default_library", "//pkg/apis/componentconfig:go_default_library", "//pkg/apis/componentconfig/v1alpha1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", diff --git a/pkg/kubemark/hollow_proxy.go b/pkg/kubemark/hollow_proxy.go index f8d8f9187f1..6b7408b4b94 100644 --- a/pkg/kubemark/hollow_proxy.go +++ b/pkg/kubemark/hollow_proxy.go @@ -22,6 +22,7 @@ import ( proxyapp "k8s.io/kubernetes/cmd/kube-proxy/app" "k8s.io/kubernetes/cmd/kube-proxy/app/options" "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/record" proxyconfig "k8s.io/kubernetes/pkg/proxy/config" @@ -62,7 +63,7 @@ func NewHollowProxyOrDie( config := options.NewProxyConfig() config.OOMScoreAdj = util.Int32Ptr(0) config.ResourceContainer = "" - config.NodeRef = &api.ObjectReference{ + config.NodeRef = &v1.ObjectReference{ Kind: "Node", Name: nodeName, UID: types.UID(nodeName),