From 44ca021d309973bd1159f5be69db3538472cbc16 Mon Sep 17 00:00:00 2001
From: Zihong Zheng <zihongz@google.com>
Date: Wed, 23 Aug 2017 13:32:47 -0700
Subject: [PATCH 1/2] Use --oom-score-adj flag for kube-proxy

---
 cluster/addons/kube-proxy/kube-proxy-ds.yaml         | 2 +-
 cluster/saltbase/salt/kube-proxy/kube-proxy.manifest | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cluster/addons/kube-proxy/kube-proxy-ds.yaml b/cluster/addons/kube-proxy/kube-proxy-ds.yaml
index 34a1e42bf6..9da857e5ee 100644
--- a/cluster/addons/kube-proxy/kube-proxy-ds.yaml
+++ b/cluster/addons/kube-proxy/kube-proxy-ds.yaml
@@ -46,7 +46,7 @@ spec:
         command:
         - /bin/sh
         - -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}}
         {{kube_cache_mutation_detector_env_name}}
           {{kube_cache_mutation_detector_env_value}}
diff --git a/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest b/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest
index 37d96c9b6a..15bb70dffb 100644
--- a/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest
+++ b/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest
@@ -78,7 +78,7 @@ spec:
     command:
     - /bin/sh
     - -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}}
     {{kube_cache_mutation_detector_env_name}}
       {{kube_cache_mutation_detector_env_value}}

From 47ddd733d5ca37110d7471d49702ff7e9d6c9671 Mon Sep 17 00:00:00 2001
From: Zihong Zheng <zihongz@google.com>
Date: Wed, 23 Aug 2017 20:19:24 -0700
Subject: [PATCH 2/2] Remove cgo flag for oom package

---
 pkg/util/oom/oom_linux.go       | 2 +-
 pkg/util/oom/oom_linux_test.go  | 2 +-
 pkg/util/oom/oom_unsupported.go | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/util/oom/oom_linux.go b/pkg/util/oom/oom_linux.go
index 4d0379fabd..ad6d5c264b 100644
--- a/pkg/util/oom/oom_linux.go
+++ b/pkg/util/oom/oom_linux.go
@@ -1,4 +1,4 @@
-// +build cgo,linux
+// +build linux
 
 /*
 Copyright 2015 The Kubernetes Authors.
diff --git a/pkg/util/oom/oom_linux_test.go b/pkg/util/oom/oom_linux_test.go
index 82a18b66bd..83f4d685f2 100644
--- a/pkg/util/oom/oom_linux_test.go
+++ b/pkg/util/oom/oom_linux_test.go
@@ -1,4 +1,4 @@
-// +build cgo,linux
+// +build linux
 
 /*
 Copyright 2015 The Kubernetes Authors.
diff --git a/pkg/util/oom/oom_unsupported.go b/pkg/util/oom/oom_unsupported.go
index 063839d6b2..cb362a85a5 100644
--- a/pkg/util/oom/oom_unsupported.go
+++ b/pkg/util/oom/oom_unsupported.go
@@ -1,4 +1,4 @@
-// +build !cgo !linux
+// +build !linux
 
 /*
 Copyright 2015 The Kubernetes Authors.