Bump monitoring, logging version per Rancher v2.7

Bump rancher-monitoring to 102.0.2+up40.1.2
Bump rancher-logging 102.0.1+up3.17.10
Bump harvester-eventrouter to v0.1.2

pkg/config/templates/patch/rancher-logging/100.1.3+up3.17.7/configmap.yaml → pkg/config/templates/patch/rancher-logging/102.0.1+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 102.0.1+up3.17.10/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/102.0.1+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 102.0.1+up3.17.10/templates/loggings/rke2/configmap.yaml
 # when harvester-installer makes ISO, the original file is replaced
 apiVersion: apps/v1
 kind: DaemonSet

pkg/config/templates/patch/rancher-logging/102.0.0+up3.17.10/eventtailer.yaml → pkg/config/templates/patch/rancher-logging/102.0.1+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 102.0.1+up3.17.10/templates/eventtailer.yaml
 # harvester-patch to import the event tailer feature
 apiVersion: logging-extensions.banzaicloud.io/v1alpha1
 kind: EventTailer

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

@@ -95,7 +95,7 @@ data:
         ~.*/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":"/k8s/clusters/local/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/rancherd-22-addons.yaml

@@ -42,7 +42,7 @@ resources:
       namespace: cattle-logging-system
     spec:
       repo: http://harvester-cluster-repo.cattle-system.svc/charts
-      version: "102.0.0+up3.17.10"
+      version: "102.0.1+up3.17.10"
       chart: rancher-logging
       {{- if and .Addons .Addons.rancher_logging }}
       enabled: {{ .Addons.rancher_logging.Enabled }}
@@ -96,7 +96,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 +112,7 @@ resources:
       namespace: cattle-monitoring-system
     spec:
       repo: http://harvester-cluster-repo.cattle-system.svc/charts
-      version: "102.0.0+up40.1.2"
+      version: "102.0.2+up40.1.2"
       chart: rancher-monitoring
       {{- if and .Addons .Addons.rancher_monitoring }}
       enabled: {{ .Addons.rancher_monitoring.Enabled }}

scripts/images/harvester-additional-images.txt

@@ -1,2 +1,2 @@
 registry.suse.com/suse/vmdp/vmdp:2.5.4.2
-rancher/harvester-eventrouter:v0.1.1
+rancher/harvester-eventrouter:v0.1.2

scripts/images/rancher-images.txt

@@ -9,7 +9,7 @@ docker.io/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.3.0
 docker.io/rancher/mirrored-kiwigrid-k8s-sidecar:1.19.2
 docker.io/rancher/mirrored-kube-state-metrics-kube-state-metrics:v2.6.0
 docker.io/rancher/mirrored-library-busybox:1.31.1
-docker.io/rancher/mirrored-library-nginx:1.21.1-alpine
+docker.io/rancher/mirrored-library-nginx:1.24.0-alpine
 docker.io/rancher/mirrored-prometheus-adapter-prometheus-adapter:v0.10.0
 docker.io/rancher/mirrored-prometheus-node-exporter:v1.3.1
 docker.io/rancher/mirrored-prometheus-operator-prometheus-config-reloader:v0.59.1
@@ -20,6 +20,7 @@ docker.io/rancher/rancher-webhook:v0.3.6
 docker.io/rancher/rancher:v2.7.9
 docker.io/rancher/shell:v0.1.21
 docker.io/rancher/shell:v0.1.18
+docker.io/rancher/shell:v0.1.19
 docker.io/rancher/system-agent:v0.3.3-suc
 docker.io/rancher/system-upgrade-controller:v0.11.0
 docker.io/rancher/mirrored-banzaicloud-fluentd:v1.14.6-alpine-5

scripts/version-logging

@@ -1 +1 @@
-LOGGING_VERSION=102.0.0+up3.17.10
+LOGGING_VERSION=102.0.1+up3.17.10

scripts/version-monitoring

@@ -1 +1 @@
-MONITORING_VERSION=102.0.0+up40.1.2
+MONITORING_VERSION=102.0.2+up40.1.2