github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #51221 from MrHohn/kube-proxy-adj-flag 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Use `--oom-score-adj` flag for kube-proxy

**What this PR does / why we need it**:
Replace `echo -998 > /proc/$$$/oom_score_adj` with `--oom-score-adj` flag for kube-proxy.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #51083

**Special notes for your reviewer**:
/assign @justinsb @vishh 

**Release note**:

```release-note
NONE
```
pull/6/head
Kubernetes Submit Queue 2017-10-04 14:08:19 -07:00 committed by GitHub
parent e557f184e2 47ddd733d5
commit 33f911cb53
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/kube-proxy/kube-proxy-ds.yaml
View File

@ -37,7 +37,7 @@ spec:
command: command:
- /bin/sh - /bin/sh
- -c - -c
- echo -998 > /proc/$$$/oom_score_adj && kube-proxy {{kubeconfig}} {{cluster_cidr}} --resource-container="" {{params}} 1>>/var/log/kube-proxy.log 2>&1 - kube-proxy {{kubeconfig}} {{cluster_cidr}} --resource-container="" --oom-score-adj=-998 {{params}} 1>>/var/log/kube-proxy.log 2>&1
{{container_env}} {{container_env}}
{{kube_cache_mutation_detector_env_name}} {{kube_cache_mutation_detector_env_name}}
{{kube_cache_mutation_detector_env_value}} {{kube_cache_mutation_detector_env_value}}

2
cluster/saltbase/salt/kube-proxy/kube-proxy.manifest
View File

@ -74,7 +74,7 @@ spec:
command: command:
- /bin/sh - /bin/sh
- -c - -c
- echo -998 > /proc/$$$/oom_score_adj && kube-proxy {{api_servers_with_port}} {{kubeconfig}} {{cluster_cidr}} --resource-container="" {{params}} 1>>/var/log/kube-proxy.log 2>&1 - kube-proxy {{api_servers_with_port}} {{kubeconfig}} {{cluster_cidr}} --resource-container="" --oom-score-adj=-998 {{params}} 1>>/var/log/kube-proxy.log 2>&1
{{container_env}} {{container_env}}
{{kube_cache_mutation_detector_env_name}} {{kube_cache_mutation_detector_env_name}}
{{kube_cache_mutation_detector_env_value}} {{kube_cache_mutation_detector_env_value}}

2
pkg/util/oom/oom_linux.go
View File

@ -1,4 +1,4 @@
// +build cgo,linux // +build linux
/* /*
Copyright 2015 The Kubernetes Authors. Copyright 2015 The Kubernetes Authors.

2
pkg/util/oom/oom_linux_test.go
View File

@ -1,4 +1,4 @@
// +build cgo,linux // +build linux
/* /*
Copyright 2015 The Kubernetes Authors. Copyright 2015 The Kubernetes Authors.

2
pkg/util/oom/oom_unsupported.go
View File

@ -1,4 +1,4 @@
// +build !cgo !linux // +build !linux
/* /*
Copyright 2015 The Kubernetes Authors. Copyright 2015 The Kubernetes Authors.