fixed template issues with k3s (#567)

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

@@ -1,10 +1,11 @@
-{{- if .Values.additionalLoggingSources.k3s-openrc.enabled }}
+{{- if and .Values.additionalLoggingSources.k3s.enabled (eq .Values.additionalLoggingSources.k3s.container_engine "openrc")}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Logging
 metadata:
-  name: {{ .Release.Name }}-k3s-openrc
+  name: {{ .Release.Name }}-k3s
   namespace: {{ .Release.Namespace }}
-  labels: {{ include "logging-operator.labels" . | indent 4 }}
+  labels:
+{{ include "logging-operator.labels" . | indent 4 }}
 spec:
   controlNamespace: {{ .Release.Namespace }}
   fluentbit:

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

@@ -1,10 +1,11 @@
-{{- if .Values.additionalLoggingSources.k3s-systemd.enabled }}
+{{- if and .Values.additionalLoggingSources.k3s.enabled (eq .Values.additionalLoggingSources.k3s.container_engine "systemd")}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Logging
 metadata:
-  name: {{ .Release.Name }}-k3s-systemd
+  name: {{ .Release.Name }}-k3s
   namespace: {{ .Release.Namespace }}
-  labels: {{ include "logging-operator.labels" . | indent 4 }}
+  labels:
+{{ include "logging-operator.labels" . | indent 4 }}
 spec:
   controlNamespace: {{ .Release.Namespace }}
   fluentbit:

packages/rancher-logging/rancher-logging.patch

@@ -46,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,97 @@
+@@ -76,4 +76,96 @@
  monitoring:
    # Create a Prometheus Operator ServiceMonitor object
    serviceMonitor:
@@ -125,10 +125,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/values
 +additionalLoggingSources:
 +  rke1:
 +    enabled: false
-+  k3s-systemd:
-+    enabled: false
-+  k3s-openrc:
++  k3s:
 +    enabled: false
++    container_engine: "systemd"
 +
 +images:
 +  config_reloader: