Commit e9018006 authored by Klaus Ma's avatar Klaus Ma

Update NodeRef to v1.ObjectReference.

parent 4495af38
......@@ -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",
......
......@@ -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
}
......
......@@ -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),
......
......@@ -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",
......
......@@ -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),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment