Added dashboard-metrics-scraper support to chart per recommended depl…

…oyment

This amends work done on #4502 per request from bskim45 and as needed to support my own needs. Functionality works with a simple deployment of the metrics-server (successor to heapster):

helm install metrics-server -n kube-system stable/metrics-server

aio/deploy/helm-chart/kubernetes-dashboard/templates/metrics-scraper/_helpers.tpl

@@ -0,0 +1,35 @@
+# Copyright 2017 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Common labels
+*/}}
+{{- define "dashboard-metrics-scraper.labels" -}}
+app.kubernetes.io/name: {{ .Values.metricsScraper.name }}
+helm.sh/chart: {{ include "kubernetes-dashboard.chart" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Common label selectors
+*/}}
+{{- define "dashboard-metrics-scraper.matchLabels" -}}
+app.kubernetes.io/name: {{ .Values.metricsScraper.name }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}

aio/deploy/helm-chart/kubernetes-dashboard/templates/metrics-scraper/deployment.yaml

@@ -0,0 +1,95 @@
+# Copyright 2017 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{ if .Values.metricsScraper.enabled -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Values.metricsScraper.name }}
+{{- with .Values.metricsScraper.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+  labels:
+{{ include "dashboard-metrics-scraper.labels" . | indent 4 }}
+{{- if .Values.metricsScraper.labels }}
+{{ toYaml .Values.metricsScraper.labels | indent 4 }}
+{{- end }}
+spec:
+  replicas: {{ .Values.metricsScraper.replicaCount }}
+  revisionHistoryLimit: {{ .Values.metricsScraper.revisionHistoryLimit }}
+  selector:
+    matchLabels:
+{{ include "dashboard-metrics-scraper.matchLabels" . | indent 6 }}
+  template:
+    metadata:
+{{- with .Values.metricsScraper.podAnnotations }}
+      annotations:
+{{ toYaml . | indent 8 }}
+{{- end }}
+      labels:
+{{ include "dashboard-metrics-scraper.labels" . | indent 8 }}
+    spec:
+      {{- if .Values.securityContext }}
+      securityContext:
+{{ toYaml .Values.securityContext | indent 8 }}
+      {{- end }}
+      serviceAccountName: {{ template "kubernetes-dashboard.serviceAccountName" . }}
+      containers:
+      - name: {{ .Values.metricsScraper.name }}
+        image: "{{ .Values.metricsScraper.image.repository }}:{{ .Values.metricsScraper.image.tag }}"
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        ports:
+          - containerPort: 8000
+            protocol: TCP
+        livenessProbe:
+          httpGet:
+            scheme: HTTP
+            path: /
+            port: 8000
+          initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+          timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+        volumeMounts:
+        - mountPath: /tmp
+          name: tmp-volume
+{{- if .Values.metricsScraperContainerSecurityContext }}
+        securityContext:
+{{ toYaml .Values.metricsScraperContainerSecurityContext | indent 10 }}
+{{- end }}
+{{- with .Values.metricsScraper.resources }}
+        resources:
+{{ toYaml . | indent 10 }}
+{{- end }}
+{{- with .Values.image.pullSecrets }}
+      imagePullSecrets:
+{{- range . }}
+        - name: {{ . }}
+{{- end }}
+{{- end }}
+{{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+{{- end }}
+{{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+{{- end }}
+{{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+{{- end }}
+      volumes:
+        - name: tmp-volume
+          emptyDir: {}
+{{- end }}

aio/deploy/helm-chart/kubernetes-dashboard/templates/metrics-scraper/service.yaml

@@ -0,0 +1,31 @@
+# Copyright 2017 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{ if .Values.metricsScraper.enabled -}}
+kind: Service
+apiVersion: v1
+metadata:
+  name: {{ .Values.metricsScraper.name }}
+  labels:
+{{ include "dashboard-metrics-scraper.labels" . | indent 4 }}
+{{- if .Values.metricsScraper.labels }}
+{{ toYaml .Values.metricsScraper.labels | indent 4 }}
+{{- end }}
+spec:
+  ports:
+    - port: 8000
+      targetPort: 8000
+  selector:
+{{ include "dashboard-metrics-scraper.matchLabels" . | indent 4 }}
+{{- end }}

aio/deploy/helm-chart/kubernetes-dashboard/values.yaml

@@ -92,6 +92,21 @@ resources:
     cpu: 2
     memory: 200Mi
 
+metricsScraper:
+  enabled: true
+  name: dashboard-metrics-scraper
+  annotations: {}
+  labels: {}
+  revisionHistoryLimit: 10
+  podAnnotations:
+    seccomp.security.alpha.kubernetes.io/pod: 'runtime/default'
+  image:
+    repository: kubernetesui/metrics-scraper
+    tag: v1.0.1
+  resources:
+    requests: {}
+    limits: {}
+
 ingress:
   ## If true, Kubernetes Dashboard Ingress will be created.
   ##
@@ -187,5 +202,12 @@ dashboardContainerSecurityContext:
   runAsUser: 1001
   runAsGroup: 2001
 
+## SecurityContext for the dashboard metrics scraper container
+metricsScraperContainerSecurityContext:
+  allowPrivilegeEscalation: false
+  readOnlyRootFilesystem: true
+  runAsUser: 1001
+  runAsGroup: 2001
+
 networkPolicy:
   enabled: false