Adopt CIS Kubernetes Benchmark, Part 3: Kubelet (#2098)

JunSun17 · jackfrancis · commit 88bbc89b9a10 · 2018-01-19T13:48:09.000-08:00
diff --git a/pkg/acsengine/const.go b/pkg/acsengine/const.go
@@ -115,6 +115,10 @@ const (
 	DefaultMasterEtcdServerPort = 2380
 	// DefaultMasterEtcdClientPort is the default etcd client port for Kubernetes master nodes
 	DefaultMasterEtcdClientPort = 2379
+	// DefaultKubeletEventQPS is 0, see --event-qps at https://kubernetes.io/docs/reference/generated/kubelet/
+	DefaultKubeletEventQPS = "0"
+	// DefaultKubeletCadvisorPort is 0, see --cadvisor-port at https://kubernetes.io/docs/reference/generated/kubelet/
+	DefaultKubeletCadvisorPort = "0"
 )
 
 const (
diff --git a/pkg/acsengine/defaults-kubelet.go b/pkg/acsengine/defaults-kubelet.go
@@ -49,6 +49,8 @@ func setKubeletConfig(cs *api.ContainerService) {
 		"--non-masquerade-cidr":          DefaultNonMasqueradeCidr,
 		"--cloud-provider":               "azure",
 		"--cloud-config":                 "/etc/kubernetes/azure.json",
+		"--event-qps":                    DefaultKubeletEventQPS,
+		"--cadvisor-port":                DefaultKubeletCadvisorPort,
 	}
 
 	// If no user-configurable kubelet config values exists, use the defaults

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,8 @@ func setKubeletConfig(cs *api.ContainerService) {`
`49`	`49`	`"--non-masquerade-cidr": DefaultNonMasqueradeCidr,`
`50`	`50`	`"--cloud-provider": "azure",`
`51`	`51`	`"--cloud-config": "/etc/kubernetes/azure.json",`
	`52`	`+ "--event-qps": DefaultKubeletEventQPS,`
	`53`	`+ "--cadvisor-port": DefaultKubeletCadvisorPort,`
`52`	`54`	`}`
`53`	`55`
`54`	`56`	`// If no user-configurable kubelet config values exists, use the defaults`