From ac68e0a6e8e1602e92b5726acae91fdfa07dd079 Mon Sep 17 00:00:00 2001
From: tgfree <tgfree7@gmail.com>
Date: Mon, 13 Jun 2022 14:09:51 +0800
Subject: [PATCH] CHG: merge helper-image setting into one place for helm
 charts

Signed-off-by: tgfree <tgfree7@gmail.com>
(cherry picked from commit 7a557125c7bf523d51fc55510fc5478268607fcc)
---
 .../templates/configmap.yaml                      | 15 +++++++++++++--
 deploy/chart/local-path-provisioner/values.yaml   | 11 -----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/deploy/chart/local-path-provisioner/templates/configmap.yaml b/deploy/chart/local-path-provisioner/templates/configmap.yaml
index b02505387..7d5744ea2 100644
--- a/deploy/chart/local-path-provisioner/templates/configmap.yaml
+++ b/deploy/chart/local-path-provisioner/templates/configmap.yaml
@@ -14,5 +14,16 @@ data:
   teardown: |-
     {{ .Values.configmap.teardown | nindent 4 }}
   helperPod.yaml: |-
-    {{ .Values.configmap.helperPod | nindent 4 }}
-
+    apiVersion: v1
+    kind: Pod
+    metadata:
+      name: helper-pod
+    spec:
+      containers:
+        - name: helper-pod
+          {{- if .Values.privateRegistry.registryUrl }}
+          image: {{ .Values.privateRegistry.registryUrl }}/{{ .Values.helperImage.repository }}:{{ .Values.helperImage.tag }}
+          {{- else }}
+          image: {{ .Values.helperImage.repository }}:{{ .Values.helperImage.tag }}
+          {{- end }}
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
diff --git a/deploy/chart/local-path-provisioner/values.yaml b/deploy/chart/local-path-provisioner/values.yaml
index ce0ac0d9b..76e4d688f 100644
--- a/deploy/chart/local-path-provisioner/values.yaml
+++ b/deploy/chart/local-path-provisioner/values.yaml
@@ -99,17 +99,6 @@ configmap:
     #!/bin/sh
     set -eu
     rm -rf "$VOL_DIR"
-  # specify the custom helper pod yaml
-  helperPod: |-
-    apiVersion: v1
-    kind: Pod
-    metadata:
-      name: helper-pod
-    spec:
-      containers:
-      - name: helper-pod
-        image: busybox
-        imagePullPolicy: IfNotPresent
 
 # Number of provisioner worker threads to call provision/delete simultaneously.
 # workerThreads: 4