(dev-v2.6-archive) fixed template issues with k3s (#567)

(partially cherry picked from commit 7e14b4ee14)

packages/rancher-istio/charts/templates/istio-install-job.yaml

@@ -17,6 +17,10 @@ spec:
           env:
           - name: RELEASE_NAME
             value: {{ .Release.Name }}
+          {{- if .Values.revision }}
+          - name: CANARY_REVISION
+            value: {{ .Values.revision }}
+          {{- end }}
           - name: ISTIO_NAMESPACE
             value: {{ template "istio.namespace" . }}
           - name: FORCE_INSTALL

packages/rancher-istio/charts/values.yaml

@@ -1,6 +1,7 @@
+revision: "" # leave blank for no canary deployment, or set to given revision, eg: "1-7-2"
 overlayFile: ""
-tag: 1.6.7
-installerVersion: 1.6.7-rancher1
+tag: 1.6.8
+installerVersion: 0.1.6
 forceInstall: false
 
 istiocoredns:
@@ -18,7 +19,7 @@ base:
 cni:
     enabled: false
     repository: rancher/istio-install-cni
-    tag: 1.6.7
+    tag: 1.6.8
 
 egressGateways:
     enabled: false
@@ -34,17 +35,17 @@ istiodRemote:
 pilot:
     enabled: true
     repository: rancher/istio-pilot
-    tag: 1.6.7
+    tag: 1.6.8
 
 policy:
     enabled: true
     repository: rancher/istio-mixer
-    tag: 1.6.7
+    tag: 1.6.8
 
 telemetry:
     enabled: true
     repository: rancher/istio-mixer
-    tag: 1.6.7
+    tag: 1.6.8
 
 sidecarInjectorWebhook:
   enableNamespacesByDefault: false
@@ -57,10 +58,10 @@ global:
   systemDefaultRegistry: ""
   proxy:
     repository: rancher/istio-proxyv2
-    tag: 1.6.7
+    tag: 1.6.8
   proxy_init:
     repository: rancher/istio-proxyv2
-    tag: 1.6.7
+    tag: 1.6.8
 
 # this can be removed in 1.7 as it is default
 meshConfig:

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: