From 89b13385c753bbf21d9d77b1a95814e6e8bc1311 Mon Sep 17 00:00:00 2001
From: Bismarck Paliz <bismarck.paliz@jet.com>
Date: Sun, 4 Oct 2020 23:35:07 -0400
Subject: [PATCH] [kube-prometheus-stack] Replacing hyperkube image with
 kubectl image from bitnami (#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>
---
 charts/kube-prometheus-stack/Chart.yaml                   | 2 +-
 .../templates/prometheus-operator/cleanup-crds.yaml       | 8 ++++----
 charts/kube-prometheus-stack/values.yaml                  | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
index f13fa4f87f3d..55c19603a4c9 100644
--- 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
index 4fd21e7730f6..4b30ab644de7 100644
--- 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
index e0ef831ce8e0..bcfb0035fca5 100644
--- 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