Merge pull request #1116 from kinvolk/imran/update-metrics-server-to-…

…2.11.2 metrics-server: update metrics server to 2.11.2
kinvolk · Oct 28, 2020 · ac9f39d · ac9f39d
2 parents 579f999 + a66f3fb
commit ac9f39d
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 16 deletions.
diff --git a/assets/charts/components/metrics-server/Chart.yaml b/assets/charts/components/metrics-server/Chart.yaml
@@ -12,4 +12,4 @@ maintainers:
 name: metrics-server
 sources:
 - https://github.com/kubernetes-incubator/metrics-server
-version: 2.11.1
+version: 2.11.2
diff --git a/assets/charts/components/metrics-server/README.md b/assets/charts/components/metrics-server/README.md
@@ -37,3 +37,6 @@ Parameter | Description | Default
 `podDisruptionBudget.minAvailable` | Minimum available instances; ignored if there is no PodDisruptionBudget |
 `podDisruptionBudget.maxUnavailable` | Maximum unavailable instances; ignored if there is no PodDisruptionBudget |
 `extraContainers`   | Add additional containers  | `[]`
+`testImage.repository` | Image repository and name for test pod.  See also `imagePullSecrets` | `busybox`
+`testImage.tag` | Image tag for test pod | `latest`
+`testImage.pullPolicy` | Image pull policy for test pod | `IfNotPresent`
diff --git a/assets/charts/components/metrics-server/templates/role-binding.yaml b/assets/charts/components/metrics-server/templates/role-binding.yaml
@@ -4,15 +4,11 @@ kind: RoleBinding
 metadata:
   name: {{ template "metrics-server.fullname" .  }}-auth-reader
   namespace: kube-system
-  annotations:
-    meta.helm.sh/release-name: {{ .Release.Name }}
-    meta.helm.sh/release-namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "metrics-server.name" . }}
     chart: {{ template "metrics-server.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-    app.kubernetes.io/managed-by: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

diff --git a/assets/charts/components/metrics-server/templates/tests/test-version.yaml b/assets/charts/components/metrics-server/templates/tests/test-version.yaml
@@ -12,10 +12,16 @@ metadata:
 spec:
   containers:
   - name: wget
-    image: busybox
+    image: "{{ .Values.testImage.repository }}:{{ .Values.testImage.tag }}"
+    imagePullPolicy: {{ .Values.testImage.pullPolicy }}
     command: ['/bin/sh']
     args:
     - -c
     - 'wget -qO- https://{{ include "metrics-server.fullname" . }}:{{ .Values.service.port }}/version | grep -F {{ .Values.image.tag }}'
+{{- if .Values.imagePullSecrets }}
+  imagePullSecrets:
+  {{- range .Values.imagePullSecrets }}
+    - name: {{ . }}
+  {{- end }}
+{{- end }}
   restartPolicy: Never
-
diff --git a/assets/charts/components/metrics-server/values.yaml b/assets/charts/components/metrics-server/values.yaml
@@ -107,3 +107,8 @@ podDisruptionBudget:
   enabled: false
   minAvailable:
   maxUnavailable:
+
+testImage:
+  repository: busybox
+  tag: latest
+  pullPolicy: IfNotPresent
diff --git a/pkg/assets/generated_assets.go b/pkg/assets/generated_assets.go