[v1.2]Bump rancher-logging and rancher-monitoring

Dockerfile.dapper

@@ -17,7 +17,7 @@ ENV ARCH $DAPPER_HOST_ARCH
 
 # mtools and dosfstools are requirements for luet-makeiso >= 0.4.0 to build hybrid ISO.
 RUN zypper -n rm container-suseconnect && \
-    zypper -n install git curl docker gzip tar wget zstd squashfs xorriso awk jq mtools dosfstools unzip rsync
+    zypper -n install git curl docker gzip tar wget zstd squashfs xorriso awk jq mtools dosfstools unzip rsync patch
 RUN curl -sfL https://github.com/mikefarah/yq/releases/download/v4.21.1/yq_linux_${ARCH} -o /usr/bin/yq && chmod +x /usr/bin/yq
 RUN if [ "${ARCH}" == "amd64" ]; then \
     curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.55.2; \

pkg/config/templates/patch/rancher-logging/100.1.3+up3.17.7/configmap.yaml → pkg/config/templates/patch/rancher-logging/103.0.0+up3.17.10/configmap.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.additionalLoggingSources.rke2.enabled }}
-# patch to 100.1.3+up3.17.7/templates/loggings/rke2/configmap.yaml
+# patch to ./templates/loggings/rke2/configmap.yaml
 # when harvester-installer makes ISO, the original file is replaced
 # harvester-patch to configmap fluent-bit.conf
 apiVersion: v1

pkg/config/templates/patch/rancher-logging/102.0.0+up3.17.10/daemonset.yaml → pkg/config/templates/patch/rancher-logging/103.0.0+up3.17.10/daemonset.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.additionalLoggingSources.rke2.enabled }}
-# patch to 100.1.3+up3.17.7/templates/loggings/rke2/configmap.yaml
+# patch to ./templates/loggings/rke2/configmap.yaml
 # when harvester-installer makes ISO, the original file is replaced
 apiVersion: apps/v1
 kind: DaemonSet
@@ -33,7 +33,7 @@ spec:
             - mountPath: {{ .Values.systemdLogPath | default "/var/log/journal" }}
               name: journal
               readOnly: true
-            - mountPath: "/var/lib/rancher/rke2/agent/logs/kubelet.log"
+            - mountPath: "/var/lib/rancher/rke2/agent/logs"
               name: kubelet
               readOnly: true
             - mountPath: /etc/machine-id
@@ -58,7 +58,7 @@ spec:
             path: {{ .Values.systemdLogPath | default "/var/log/journal" }}
         - name: kubelet
           hostPath:
-            path: "/var/lib/rancher/rke2/agent/logs/kubelet.log"
+            path: "/var/lib/rancher/rke2/agent/logs"
         - name: machine-id
           hostPath:
             path: /etc/machine-id

pkg/config/templates/patch/rancher-logging/102.0.0+up3.17.10/eventtailer.yaml → pkg/config/templates/patch/rancher-logging/103.0.0+up3.17.10/eventtailer.yaml

@@ -1,5 +1,5 @@
 {{- with $.Values.eventTailer }}
-# patch to 100.1.3+up3.17.7/templates/eventtailer.yaml
+# patch to ./templates/eventtailer.yaml
 # harvester-patch to import the event tailer feature
 apiVersion: logging-extensions.banzaicloud.io/v1alpha1
 kind: EventTailer

pkg/config/templates/patch/rancher-logging/103.0.0+up3.17.10/patch-values-fluentbit-image.diff

@@ -0,0 +1,19 @@
+--- values.yaml
++++ values-new.yaml
+@@ -146,14 +146,14 @@
+     tag: v0.4.0
+   fluentbit:
+     repository: rancher/mirrored-fluent-fluent-bit
+-    tag: 1.9.5
++    tag: 2.2.0
+   nodeagent_fluentbit:
+     os: "windows"
+     repository: rancher/fluent-bit
+     tag: 1.8.9
+   fluentbit_debug:
+     repository: rancher/mirrored-fluent-fluent-bit
+-    tag: 1.9.5-debug
++    tag: 2.2.0-debug
+   fluentd:
+     repository: rancher/mirrored-banzaicloud-fluentd
+     tag: v1.14.6-alpine-5

pkg/config/templates/patch/rancher-monitoring-crd/103.0.3+up45.31.1/patch-values-shell-version.diff

@@ -0,0 +1,11 @@
+--- values.yaml
++++ values-new.yaml
+@@ -10,7 +10,7 @@
+
+ image:
+   repository: rancher/shell
+-  tag: v0.1.18
++  tag: v0.1.22
+
+ nodeSelector: {}
+

pkg/config/templates/patch/rancher-monitoring/102.0.0+up40.1.2/nginx-config.yaml → pkg/config/templates/patch/rancher-monitoring/103.0.3+up45.31.1/nginx-config.yaml

@@ -91,13 +91,13 @@ data:
       }
 
       map $http_referer $final_appSubUrl {
-        ~.*/k8s/clusters/(c-m-.+)/api/v1/namespaces/cattle-monitoring-system/.*    '"appSubUrl":"/k8s/clusters/$1/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"';
-        ~.*/dashboard/harvester/c/(c-m-.+)/kubevirt.io.virtualmachine/.*/.*    '"appSubUrl":"/k8s/clusters/$1/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"';
-        ~.*/dashboard/harvester/c/(c-m-.+)/harvesterhci.io.addon/cattle-monitoring-system/.*    '"appSubUrl":"/k8s/clusters/$1/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"';
-        ~.*/dashboard/harvester/c/(c-m-.+)/.*      '"appSubUrl":"/k8s/clusters/$1/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"';
+        ~.*/k8s/clusters/(c-m-.+)/api/v1/namespaces/cattle-monitoring-system/.*      '"appSubUrl":"/k8s/clusters/$1/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"';
         ~.*/dashboard/c/(c-m-.+)/.*     '"appSubUrl":"/k8s/clusters/$1/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"';
-        ~.*/api/v1/namespaces/cattle-monitoring-system/services/.*    '"appSubUrl":"/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"';
-        default    '"appSubUrl":"/k8s/clusters/local/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"';
+        ~.*/dashboard/harvester/c/(c-m-.+)/harvesterhci.io.addon/cattle-monitoring-system/.* '"appSubUrl":"/k8s/clusters/$1/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"';
+        ~.*/dashboard/harvester/c/(c-m-.+)/kubevirt.io.virtualmachine/.*/.* '"appSubUrl":"/k8s/clusters/$1/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"';
+        ~.*/dashboard/harvester/c/(c-m-.+)/.*      '"appSubUrl":"/k8s/clusters/$1/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"';
+        ~.*/api/v1/namespaces/cattle-monitoring-system/.*    '"appSubUrl":"/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"';
+        default '"appSubUrl":"/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy"';
       }
 
     }

pkg/config/templates/patch/rancher-monitoring/103.0.3+up45.31.1/patch-values-shell-version.diff

@@ -0,0 +1,11 @@
+--- values.yaml
++++ values-new.yaml
+@@ -560,7 +560,7 @@
+   ## Image to use to run the scripts
+   image:
+     repository: rancher/shell
+-    tag: v0.1.19
++    tag: v0.1.22
+
+ ## Rancher Monitoring
+ ##

pkg/config/templates/rancherd-22-addons.yaml

@@ -42,19 +42,14 @@ resources:
       namespace: cattle-logging-system
     spec:
       repo: http://harvester-cluster-repo.cattle-system.svc/charts
-      version: "102.0.0+up3.17.10"
+      version: "103.0.0+up3.17.10"
       chart: rancher-logging
       {{- if and .Addons .Addons.rancher_logging }}
       enabled: {{ .Addons.rancher_logging.Enabled }}
       {{- else }}
       enabled: false
       {{- end }}
       valuesContent: |
-        images:
-          fluentbit:
-            tag: 1.9.5 # replace the default 1.9.3, which has bug in systemd log
-          fluentbit_debug:
-            tag: 1.9.5-debug
         systemdLogPath: /var/log/journal
         disablePvc: true
         additionalLoggingSources:
@@ -96,7 +91,7 @@ resources:
           controlNamespace: cattle-logging-system
           workloadOverrides:
             containers:
-            - image: rancher/harvester-eventrouter:v0.1.1
+            - image: rancher/harvester-eventrouter:v0.1.2
               name: event-tailer
               resources:
                 limits:
@@ -112,7 +107,7 @@ resources:
       namespace: cattle-monitoring-system
     spec:
       repo: http://harvester-cluster-repo.cattle-system.svc/charts
-      version: "102.0.0+up40.1.2"
+      version: "103.0.3+up45.31.1"
       chart: rancher-monitoring
       {{- if and .Addons .Addons.rancher_monitoring }}
       enabled: {{ .Addons.rancher_monitoring.Enabled }}
@@ -218,4 +213,4 @@ resources:
       valuesContent: |
         image:
           tag: v0.1.0
-        fullnameOverride: harvester-seeder
+        fullnameOverride: harvester-seeder