From 220b07f2c896a6a523f6fddb20725188da4d5c02 Mon Sep 17 00:00:00 2001 From: aaa <1693291525@qq.com> Date: Sat, 20 Apr 2019 12:40:28 -0400 Subject: [PATCH] Replace variables 10250 and 10255 with constants update pull request --- cmd/kubemark/BUILD | 1 + cmd/kubemark/hollow-node.go | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/kubemark/BUILD b/cmd/kubemark/BUILD index 56f362c1e2..dc7a6933d2 100644 --- a/cmd/kubemark/BUILD +++ b/cmd/kubemark/BUILD @@ -23,6 +23,7 @@ go_library( "//pkg/kubelet/dockershim:go_default_library", "//pkg/kubelet/dockershim/libdocker:go_default_library", "//pkg/kubemark:go_default_library", + "//pkg/master/ports:go_default_library", "//pkg/util/iptables/testing:go_default_library", "//pkg/util/sysctl/testing:go_default_library", "//pkg/version/prometheus:go_default_library", diff --git a/cmd/kubemark/hollow-node.go b/cmd/kubemark/hollow-node.go index 5309b16005..b81cae3deb 100644 --- a/cmd/kubemark/hollow-node.go +++ b/cmd/kubemark/hollow-node.go @@ -42,6 +42,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/dockershim" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" "k8s.io/kubernetes/pkg/kubemark" + "k8s.io/kubernetes/pkg/master/ports" fakeiptables "k8s.io/kubernetes/pkg/util/iptables/testing" fakesysctl "k8s.io/kubernetes/pkg/util/sysctl/testing" _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration @@ -73,8 +74,8 @@ var knownMorphs = sets.NewString("kubelet", "proxy") func (c *hollowNodeConfig) addFlags(fs *pflag.FlagSet) { fs.StringVar(&c.KubeconfigPath, "kubeconfig", "/kubeconfig/kubeconfig", "Path to kubeconfig file.") - fs.IntVar(&c.KubeletPort, "kubelet-port", 10250, "Port on which HollowKubelet should be listening.") - fs.IntVar(&c.KubeletReadOnlyPort, "kubelet-read-only-port", 10255, "Read-only port on which Kubelet is listening.") + fs.IntVar(&c.KubeletPort, "kubelet-port", ports.KubeletPort, "Port on which HollowKubelet should be listening.") + fs.IntVar(&c.KubeletReadOnlyPort, "kubelet-read-only-port", ports.KubeletReadOnlyPort, "Read-only port on which Kubelet is listening.") fs.StringVar(&c.NodeName, "name", "fake-node", "Name of this Hollow Node.") fs.IntVar(&c.ServerPort, "api-server-port", 443, "Port on which API server is listening.") fs.StringVar(&c.Morph, "morph", "", fmt.Sprintf("Specifies into which Hollow component this binary should morph. Allowed values: %v", knownMorphs.List()))