added image overrides (#554)

packages/rancher-logging/overlay/templates/logging-rke1.yaml

@@ -8,6 +8,9 @@ metadata:
 spec:
   controlNamespace: {{ .Release.Namespace }}
   fluentbit:
+    image:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}
+      tag: {{ .Values.images.fluentbit.tag }}
     inputTail:
       Tag: "rke"
       Path: "/rke/*.log"
@@ -16,5 +19,11 @@ spec:
         destination: "/rke"
         readOnly: true
   fluentd:
+    image:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }}
+      tag: {{ .Values.images.fluentd.tag }}
+    configReloaderImage:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.config_reloader.repository }}
+      tag: {{ .Values.images.config_reloader.tag }}
     disablePvc: {{ .Values.disablePvc }}
 {{- end }}

packages/rancher-logging/overlay/templates/logging.yaml

@@ -7,6 +7,15 @@ metadata:
 {{ include "logging-operator.labels" . | indent 4 }}
 spec:
   controlNamespace: {{ .Release.Namespace }}
-  fluentbit: {}
+  fluentbit:
+    image:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}
+      tag: {{ .Values.images.fluentbit.tag }}
   fluentd:
+    image:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }}
+      tag: {{ .Values.images.fluentd.tag }}
+    configReloaderImage:
+      repository: {{ template "system_default_registry" . }}{{ .Values.images.config_reloader.repository }}
+      tag: {{ .Values.images.config_reloader.tag }}
     disablePvc: {{ .Values.disablePvc }}

packages/rancher-logging/overlay/templates/outputs/syslog/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: fluentbit
-        image: paynejacob/fluent-bit-out-syslog:latest
+        image: "{{ template "system_default_registry" . }}{{ .Values.images.syslog_forwarder.repository }}:{{ .Values.images.syslog_forwarder.tag }}"
         ports:
           - containerPort: 24224
         volumeMounts:

packages/rancher-logging/rancher-logging.patch

@@ -19,6 +19,21 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/Chart.
 +  catalog.cattle.io/requires-gvr: logging.banzaicloud.io/v1beta1
 +  catalog.cattle.io/auto-install-gvr: logging.banzaicloud.io/v1beta1
 +  catalog.cattle.io/provides-gvr: logging.banzaicloud.io/v1beta1
+diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/templates/_helpers.tpl packages/rancher-logging/charts/templates/_helpers.tpl
+--- packages/rancher-logging/charts-original/templates/_helpers.tpl
++++ packages/rancher-logging/charts/templates/_helpers.tpl
+@@ -56,3 +56,11 @@
+ {{- end }}
+ app.kubernetes.io/managed-by: {{ .Release.Service }}
+ {{- end -}}
++
++{{- define "system_default_registry" -}}
++{{- if .Values.global.systemDefaultRegistry -}}
++{{- printf "%s/" .Values.global.systemDefaultRegistry -}}
++{{- else -}}
++{{- "" -}}
++{{- end -}}
++{{- end -}}
 diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/values.yaml packages/rancher-logging/charts/values.yaml
 --- packages/rancher-logging/charts-original/values.yaml
 +++ packages/rancher-logging/charts/values.yaml
@@ -31,7 +46,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/values
  
  resources: {}
    # We usually recommend not to specify default resources and to leave this as a conscious
-@@ -76,4 +76,70 @@
+@@ -76,4 +76,93 @@
  monitoring:
    # Create a Prometheus Operator ServiceMonitor object
    serviceMonitor:
@@ -105,8 +120,26 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/values
 +  cluster: true
 +  root_ca: ""
 +
++disablePvc: true
++
 +additionalLoggingSources:
 +  rke1:
 +    enabled: false
 +
-+disablePvc: true
++images:
++  config_reloader:
++    repository: rancher/jimmidyson-configmap-reload
++    tag: v0.2.2
++  fluentbit:
++    repository: rancher/fluent-fluent-bit
++    tag: 1.5.0
++  fluentd:
++    repository: rancher/banzaicloud-fluentd
++    tag: v1.10.4-alpine-2
++  syslog_forwarder:
++    repository: rancher/fluent-bit-out-syslog
++    tag: 0.1.0
++
++global:
++  systemDefaultRegistry: ""
+\ No newline at end of file