From f5859ded047d72f4e20771d4333417784a9bb477 Mon Sep 17 00:00:00 2001
From: Oleksandr Vorobiov <38080528+alec-v@users.noreply.github.com>
Date: Tue, 29 Jan 2019 23:33:40 +0200
Subject: [PATCH] Allow metrcs-server to start in hostNetwork mode (#10967)

Signed-off-by: Oleksandr Vorobiov <ovor@softserveinc.com>
---
 stable/metrics-server/Chart.yaml                          | 2 +-
 stable/metrics-server/README.md                           | 1 +
 .../templates/metrics-server-deployment.yaml              | 3 +++
 stable/metrics-server/values.yaml                         | 8 ++++++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/stable/metrics-server/Chart.yaml b/stable/metrics-server/Chart.yaml
index 0acd061b88..8c917bdbc9 100755
--- a/stable/metrics-server/Chart.yaml
+++ b/stable/metrics-server/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 0.3.1
 description: Metrics Server is a cluster-wide aggregator of resource usage data.
 name: metrics-server
-version: 2.1.1
+version: 2.2.0
 keywords:
 - metrics-server
 home: https://github.com/kubernetes-incubator/metrics-server
diff --git a/stable/metrics-server/README.md b/stable/metrics-server/README.md
index 724d7a1b83..b8c664830c 100644
--- a/stable/metrics-server/README.md
+++ b/stable/metrics-server/README.md
@@ -10,6 +10,7 @@ Parameter | Description | Default
 `serviceAccount.create` | If `true`, create a new service account | `true`
 `serviceAccount.name` | Service account to be used. If not set and `serviceAccount.create` is `true`, a name is generated using the fullname template | ``
 `apiService.create` | Create the v1beta1.metrics.k8s.io API service | `true`
+`hostNetwork.enable` | Enable hostNetwork mode | `false`
 `image.repository` | Image repository | `gcr.io/google_containers/metrics-server-amd64`
 `image.tag` | Image tag | `v0.3.1`
 `image.pullPolicy` | Image pull policy | `IfNotPresent`
diff --git a/stable/metrics-server/templates/metrics-server-deployment.yaml b/stable/metrics-server/templates/metrics-server-deployment.yaml
index 1261353d7b..65a6955ff2 100644
--- a/stable/metrics-server/templates/metrics-server-deployment.yaml
+++ b/stable/metrics-server/templates/metrics-server-deployment.yaml
@@ -20,6 +20,9 @@ spec:
         release: {{ .Release.Name }}
     spec:
       serviceAccountName: {{ template "metrics-server.serviceAccountName" . }}
+{{ if .Values.hostNetwork.enabled }}
+      hostNetwork: true
+{{ end }}
       containers:
         - name: metrics-server
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
diff --git a/stable/metrics-server/values.yaml b/stable/metrics-server/values.yaml
index d246735935..c05332e98d 100644
--- a/stable/metrics-server/values.yaml
+++ b/stable/metrics-server/values.yaml
@@ -17,6 +17,14 @@ apiService:
   # work with this release.
   create: true
 
+hostNetwork:
+  # Specifies if metrics-server should be started in hostNetwork mode.
+  #
+  # You would require this enabled if you use alternate overlay networking for pods and
+  # API server unable to communicate with metrics-server. As an example, this is required
+  # if you use Weave netwok on EKS
+  enabled: false
+
 image:
   repository: gcr.io/google_containers/metrics-server-amd64
   tag: v0.3.1