CHG: merge helper-image setting into one place for helm charts

Signed-off-by: tgfree <tgfree7@gmail.com> (cherry picked from commit 7a55712)
rancher · Oct 25, 2022 · ac68e0a · ac68e0a
1 parent 4768915
commit ac68e0a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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