[kube-prometheus-stack] Replacing hyperkube image with kubectl image …

…from bitnami (prometheus-community#160) * Replacing hyperkube image with kubectl image from bitnami Signed-off-by: Bismarck Paliz <bismarck.paliz@jet.com> * Bumping version Signed-off-by: Bismarck Paliz <bismarck.paliz@jet.com>
ryanprobus · Oct 5, 2020 · 89b1338 · 89b1338
1 parent c3a0c0d
commit 89b1338
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
@@ -17,7 +17,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 9.4.6
+version: 9.4.7
 appVersion: 0.38.1
 tillerVersion: ">=2.12.0"
 home: https://github.com/prometheus-operator/kube-prometheus

diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/cleanup-crds.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/cleanup-crds.yaml
@@ -24,12 +24,12 @@ spec:
     {{- end }}
       containers:
         - name: kubectl
-          {{- if .Values.prometheusOperator.hyperkubeImage.sha }}
-          image: {{ .Values.prometheusOperator.hyperkubeImage.repository }}:{{ .Values.prometheusOperator.hyperkubeImage.tag }}@sha256:{{ .Values.prometheusOperator.hyperkubeImage.sha }}
+          {{- if .Values.prometheusOperator.kubectlImage.sha }}
+          image: "{{ .Values.prometheusOperator.kubectlImage.repository }}:{{ .Values.prometheusOperator.kubectlImage.tag }}@sha256:{{ .Values.prometheusOperator.kubectlImage.sha }}"
           {{- else }}
-          image: "{{ .Values.prometheusOperator.hyperkubeImage.repository }}:{{ .Values.prometheusOperator.hyperkubeImage.tag }}"
+          image: "{{ .Values.prometheusOperator.kubectlImage.repository }}:{{ .Values.prometheusOperator.kubectlImage.tag }}"
           {{- end }}
-          imagePullPolicy: "{{ .Values.prometheusOperator.hyperkubeImage.pullPolicy }}"
+          imagePullPolicy: "{{ .Values.prometheusOperator.kubectlImage.pullPolicy }}"
           command:
           - /bin/sh
           - -c

diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml
@@ -1385,11 +1385,11 @@ prometheusOperator:
   ##
   secretFieldSelector: ""
 
-  ## Hyperkube image to use when cleaning up
+  ## kubectl image to use when cleaning up
   ##
-  hyperkubeImage:
-    repository: k8s.gcr.io/hyperkube
-    tag: v1.16.12
+  kubectlImage:
+    repository: docker.io/bitnami/kubectl
+    tag: 1.16.15
     sha: ""
     pullPolicy: IfNotPresent