From 99590295609b4d46390b3d465fb995dbc896638c Mon Sep 17 00:00:00 2001
From: Pat Riehecky <riehecky@fnal.gov>
Date: Tue, 18 Apr 2023 13:29:11 -0500
Subject: [PATCH] Explicitly list the container registry by default

Signed-off-by: Pat Riehecky <riehecky@fnal.gov>
---
 deploy/chart/local-path-provisioner/templates/configmap.yaml  | 2 +-
 deploy/chart/local-path-provisioner/templates/deployment.yaml | 4 ++--
 deploy/chart/local-path-provisioner/values.yaml               | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/deploy/chart/local-path-provisioner/templates/configmap.yaml b/deploy/chart/local-path-provisioner/templates/configmap.yaml
index 0d05c2aa..5cf5030d 100644
--- a/deploy/chart/local-path-provisioner/templates/configmap.yaml
+++ b/deploy/chart/local-path-provisioner/templates/configmap.yaml
@@ -29,6 +29,6 @@ data:
           {{- if .Values.privateRegistry.registryUrl }}
           image: {{ .Values.privateRegistry.registryUrl }}/{{ .Values.helperImage.repository }}:{{ .Values.helperImage.tag }}
           {{- else }}
-          image: {{ .Values.helperImage.repository }}:{{ .Values.helperImage.tag }}
+          image: {{ .Values.helperImage.defaultRegistry}}/{{ .Values.helperImage.repository }}:{{ .Values.helperImage.tag }}
           {{- end }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
diff --git a/deploy/chart/local-path-provisioner/templates/deployment.yaml b/deploy/chart/local-path-provisioner/templates/deployment.yaml
index 070781ea..588dcea8 100644
--- a/deploy/chart/local-path-provisioner/templates/deployment.yaml
+++ b/deploy/chart/local-path-provisioner/templates/deployment.yaml
@@ -26,7 +26,7 @@ spec:
         {{- if .Values.privateRegistry.registryUrl }}
           image: "{{ .Values.privateRegistry.registryUrl }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         {{- else }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.defaultRegistry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         {{- end }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
@@ -43,7 +43,7 @@ spec:
           {{- if .Values.privateRegistry.registryUrl }}
             - "{{ .Values.privateRegistry.registryUrl }}/{{ .Values.helperImage.repository }}:{{ .Values.helperImage.tag }}"
           {{- else }}
-            - "{{ .Values.helperImage.repository }}:{{ .Values.helperImage.tag }}"
+            - "{{ .Values.helperImage.defaultRegistry }}/{{ .Values.helperImage.repository }}:{{ .Values.helperImage.tag }}"
           {{- end }}
             - --configmap-name
             - {{ .Values.configmap.name }}
diff --git a/deploy/chart/local-path-provisioner/values.yaml b/deploy/chart/local-path-provisioner/values.yaml
index 95b70a62..08945521 100644
--- a/deploy/chart/local-path-provisioner/values.yaml
+++ b/deploy/chart/local-path-provisioner/values.yaml
@@ -3,12 +3,14 @@
 replicaCount: 1
 
 image:
+  defaultRegistry: docker.io
   repository: rancher/local-path-provisioner
   tag: master-head
   pullPolicy: IfNotPresent
 
 helperImage:
-  repository: busybox
+  defaultRegistry: docker.io
+  repository: library/busybox
   tag: latest
 
 defaultSettings: