From 65b8d4354366dd8b98142f46a969f427cd268442 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Sat, 21 Nov 2015 13:39:35 -0800 Subject: [PATCH] remove code that puts kube-proxy into a special cgroup since it runs in a container now --- cluster/saltbase/salt/kube-proxy/kube-proxy.manifest | 2 +- cmd/kube-proxy/app/server.go | 1 + docs/admin/kube-proxy.md | 3 +-- pkg/apis/componentconfig/v1alpha1/defaults.go | 3 --- test/e2e/kubelet_stats.go | 3 --- 5 files changed, 3 insertions(+), 9 deletions(-) diff --git a/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest b/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest index 7b891a9f83b..751d077a513 100644 --- a/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest +++ b/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest @@ -29,7 +29,7 @@ spec: command: - /bin/sh - -c - - kube-proxy {{api_servers_with_port}} {{kubeconfig}} {{pillar['log_level']}} {{test_args}} 1>>/var/log/kube-proxy.log 2>&1 + - kube-proxy {{api_servers_with_port}} {{kubeconfig}} --resource-container="" {{pillar['log_level']}} {{test_args}} 1>>/var/log/kube-proxy.log 2>&1 securityContext: privileged: true volumeMounts: diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index 105e135b335..53f56a60b60 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -88,6 +88,7 @@ func (s *ProxyServerConfig) AddFlags(fs *pflag.FlagSet) { fs.IPVar(&s.HealthzBindAddress, "healthz-bind-address", s.HealthzBindAddress, "The IP address for the health check server to serve on, defaulting to 127.0.0.1 (set to 0.0.0.0 for all interfaces)") fs.IntVar(&s.OOMScoreAdj, "oom-score-adj", s.OOMScoreAdj, "The oom-score-adj value for kube-proxy process. Values must be within the range [-1000, 1000]") fs.StringVar(&s.ResourceContainer, "resource-container", s.ResourceContainer, "Absolute name of the resource-only container to create and run the Kube-proxy in (Default: /kube-proxy).") + fs.MarkDeprecated("resource-container", "This feature will be removed in a later release.") fs.StringVar(&s.Kubeconfig, "kubeconfig", s.Kubeconfig, "Path to kubeconfig file with authorization information (the master location is set by the master flag).") fs.Var(&s.PortRange, "proxy-port-range", "Range of host ports (beginPort-endPort, inclusive) that may be consumed in order to proxy service traffic. If unspecified (0-0) then ports will be randomly chosen.") fs.StringVar(&s.HostnameOverride, "hostname-override", s.HostnameOverride, "If non-empty, will use this string as identification instead of the actual hostname.") diff --git a/docs/admin/kube-proxy.md b/docs/admin/kube-proxy.md index 0bb1daa23f1..d927b116db9 100644 --- a/docs/admin/kube-proxy.md +++ b/docs/admin/kube-proxy.md @@ -70,11 +70,10 @@ kube-proxy --oom-score-adj=-999: The oom-score-adj value for kube-proxy process. Values must be within the range [-1000, 1000] --proxy-mode="": Which proxy mode to use: 'userspace' (older) or 'iptables' (faster). If blank, look at the Node object on the Kubernetes API and respect the 'net.experimental.kubernetes.io/proxy-mode' annotation if provided. Otherwise use the best-available proxy (currently iptables). If the iptables proxy is selected, regardless of how, but the system's kernel or iptables versions are insufficient, this always falls back to the userspace proxy. --proxy-port-range=: Range of host ports (beginPort-endPort, inclusive) that may be consumed in order to proxy service traffic. If unspecified (0-0) then ports will be randomly chosen. - --resource-container="/kube-proxy": Absolute name of the resource-only container to create and run the Kube-proxy in (Default: /kube-proxy). --udp-timeout=250ms: How long an idle UDP connection will be kept open (e.g. '250ms', '2s'). Must be greater than 0. Only applicable for proxy-mode=userspace ``` -###### Auto generated by spf13/cobra on 9-Nov-2015 +###### Auto generated by spf13/cobra on 21-Nov-2015 diff --git a/pkg/apis/componentconfig/v1alpha1/defaults.go b/pkg/apis/componentconfig/v1alpha1/defaults.go index 520fa3a918e..d8b8d80d180 100644 --- a/pkg/apis/componentconfig/v1alpha1/defaults.go +++ b/pkg/apis/componentconfig/v1alpha1/defaults.go @@ -37,9 +37,6 @@ func addDefaultingFuncs() { temp := qos.KubeProxyOOMScoreAdj obj.OOMScoreAdj = &temp } - if obj.ResourceContainer == "" { - obj.ResourceContainer = "/kube-proxy" - } if obj.IPTablesSyncePeriodSeconds == 0 { obj.IPTablesSyncePeriodSeconds = 5 } diff --git a/test/e2e/kubelet_stats.go b/test/e2e/kubelet_stats.go index 6c7c8bcdabd..b9e3f32d4b1 100644 --- a/test/e2e/kubelet_stats.go +++ b/test/e2e/kubelet_stats.go @@ -186,7 +186,6 @@ func targetContainers() []string { "/", "/docker-daemon", "/kubelet", - "/kube-proxy", "/system", } } else { @@ -339,7 +338,6 @@ func formatResourceUsageStats(nodeName string, containerStats resourceUsagePerCo // "/" 0.363 2942.09 // "/docker-daemon" 0.088 521.80 // "/kubelet" 0.086 424.37 - // "/kube-proxy" 0.011 4.66 // "/system" 0.007 119.88 buf := &bytes.Buffer{} w := tabwriter.NewWriter(buf, 1, 0, 1, ' ', 0) @@ -690,7 +688,6 @@ func (r *resourceMonitor) LogCPUSummary() { // "/" 0.051 0.159 0.387 0.455 // "/docker-daemon" 0.000 0.000 0.146 0.166 // "/kubelet" 0.036 0.053 0.091 0.154 - // "/kube-proxy" 0.017 0.000 0.000 0.000 // "/system" 0.001 0.001 0.001 0.002 var header []string header = append(header, "container")