Add ability to use private image registry when deploying logging tools

charts/rancher-logging/0.0.1/charts/fluentd-tester/templates/deployment.yaml

@@ -37,7 +37,7 @@ spec:
       serviceAccountName: {{ template "fluentd-tester.fullname" . }}
       containers:
       - name: "dry-run"
-        image:  "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
         imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
         {{- if .Values.command }}
         command: {{ .Values.command }}

charts/rancher-logging/0.0.1/charts/fluentd/templates/daemonset.yaml

@@ -37,7 +37,7 @@ spec:
       serviceAccountName: {{ template "fluentd.fullname" . }}
       containers:
       - name: {{ template "fluentd.fullname" . }}
-        image:  "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        image:  {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
         imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
         {{- if .Values.command }}
         command: {{ .Values.command }}
@@ -123,7 +123,7 @@ spec:
               fi;
 {{- end }}
       - name: {{ template "fluentd.fullname" . }}-{{ .Values.configmapReload.name }}
-        image: "{{ .Values.configmapReload.image.repository }}:{{ .Values.configmapReload.image.tag }}"
+        image: {{ template "system_default_registry" . }}{{ .Values.configmapReload.image.repository }}:{{ .Values.configmapReload.image.tag }}
         imagePullPolicy: "{{ .Values.configmapReload.image.pullPolicy }}"
         args:
           - --volume-dir=/fluentd/etc/config/custom

charts/rancher-logging/0.0.1/charts/log-aggregator/templates/log-aggregator.yaml

@@ -30,7 +30,7 @@ spec:
       serviceAccountName: {{ template "log-aggregator.fullname" . }}
       containers:
       - name: log-aggregator
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
         imagePullPolicy: "{{ .Values.image.pullPolicy }}"
         securityContext:
           privileged: true
@@ -55,4 +55,4 @@ spec:
       volumes:
       - name: flexvolume-driver
         hostPath:
-          path: {{ .Values.flexVolumeDir }}
+          path: {{ .Values.flexVolumeDir }}
\ No newline at end of file

charts/rancher-logging/0.0.1/templates/_helpers.tpl

@@ -33,3 +33,12 @@
 {{- "rbac.authorization.k8s.io/v1alpha1" -}}
 {{- end -}}
 {{- end -}}
+
+
+{{- define "system_default_registry" -}}
+{{- if .Values.global.systemDefaultRegistry -}}
+{{- printf "%s/" .Values.global.systemDefaultRegistry -}}
+{{- else -}}
+{{- "" -}}
+{{- end -}}
+{{- end -}}

charts/rancher-logging/0.0.1/values.yaml

@@ -4,4 +4,6 @@ fluentd-tester:
   enabled: false
 log-aggregator:
   enabled: false
-  flexVolumeDir: /usr/libexec/kubernetes/kubelet-plugins/volume/exec
+  flexVolumeDir: /usr/libexec/kubernetes/kubelet-plugins/volume/exec
\ No newline at end of file
+global:
+  systemDefaultRegistry: ""