From a8bc8a79e3a18ea743c052e6823efc5eb09eb9a2 Mon Sep 17 00:00:00 2001
From: Ed Robinson <edward-robinson@cookpad.com>
Date: Fri, 26 Jun 2020 12:35:20 +0100
Subject: [PATCH] Fix exposing kube-proxy metrics

When kube-proxy is configured with a config file, trying to change
settings with a cmd flag doesn't work.

This pulls in the eks provisioned config-map and changes
`metricsBindAddress` from `127.0.0.1:10249` to `0.0.0.0:10249`
---
 modules/cluster/addons/kube-proxy.yaml | 51 +++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/modules/cluster/addons/kube-proxy.yaml b/modules/cluster/addons/kube-proxy.yaml
index c85c3f85..bdc19940 100644
--- a/modules/cluster/addons/kube-proxy.yaml
+++ b/modules/cluster/addons/kube-proxy.yaml
@@ -1,3 +1,51 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    eks.amazonaws.com/component: kube-proxy
+    k8s-app: kube-proxy
+  name: kube-proxy-config
+  namespace: kube-system
+data:
+  config: |-
+    apiVersion: kubeproxy.config.k8s.io/v1alpha1
+    bindAddress: 0.0.0.0
+    clientConnection:
+      acceptContentTypes: ""
+      burst: 10
+      contentType: application/vnd.kubernetes.protobuf
+      kubeconfig: /var/lib/kube-proxy/kubeconfig
+      qps: 5
+    clusterCIDR: ""
+    configSyncPeriod: 15m0s
+    conntrack:
+      max: 0
+      maxPerCore: 32768
+      min: 131072
+      tcpCloseWaitTimeout: 1h0m0s
+      tcpEstablishedTimeout: 24h0m0s
+    enableProfiling: false
+    healthzBindAddress: 0.0.0.0:10256
+    hostnameOverride: ""
+    iptables:
+      masqueradeAll: false
+      masqueradeBit: 14
+      minSyncPeriod: 0s
+      syncPeriod: 30s
+    ipvs:
+      excludeCIDRs: null
+      minSyncPeriod: 0s
+      scheduler: ""
+      syncPeriod: 30s
+    kind: KubeProxyConfiguration
+    metricsBindAddress: 0.0.0.0:10249
+    mode: "iptables"
+    nodePortAddresses: null
+    oomScoreAdj: -998
+    portRange: ""
+    resourceContainer: ""
+    udpIdleTimeout: 250ms
+---
 apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
@@ -5,6 +53,7 @@ metadata:
     eks.amazonaws.com/component: kube-proxy
     k8s-app: kube-proxy
   name: kube-proxy
+  namespace: kube-system
 spec:
   revisionHistoryLimit: 10
   selector:
@@ -32,7 +81,7 @@ spec:
       - command:
         - /bin/sh
         - -c
-        - kube-proxy --v=2 --config=/var/lib/kube-proxy-config/config --metrics-bind-address=0.0.0.0
+        - kube-proxy --v=2 --config=/var/lib/kube-proxy-config/config
         image: 602401143452.dkr.ecr.${aws_region}.amazonaws.com/eks/kube-proxy:v1.15.11
         imagePullPolicy: IfNotPresent
         name: kube-proxy