Bump monitoring and logging

  Monitoring from 103.1.1+up45.31.1 to 105.1.2+up61.3.2
  Logging from 103.1.0+up4.4.0 to 105.2.0+up4.10.0

Signed-off-by: Jian Wang <jian.wang@suse.com>

pkg/config/templates/patch/rancher-logging/105.2.0+up4.10.0/eventtailer.yaml

@@ -0,0 +1,44 @@
+{{- with $.Values.logging.eventTailer }}
+# patch to ./templates/logging/eventtailer.yaml
+# harvester-patch to customize the event tailer feature
+{{- if and $.Values.logging.enabled .enabled }}
+apiVersion: logging-extensions.banzaicloud.io/v1alpha1
+kind: EventTailer
+metadata:
+  name: {{ .name | default "harvester-default-event-tailer" }}
+  namespace: {{ .namespace | default "cattle-logging-system" }}
+spec:
+  controlNamespace: {{ $.Values.logging.controlNamespace | default $.Release.Namespace }}
+  {{- with .image }}
+  image:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .pvc }}
+  {{- if .enabled }}
+  positionVolume:
+    pvc:
+      spec:
+        accessModes: {{ .accessModes }}
+        resources:
+          requests:
+            storage: {{ .storage }}
+        volumeMode: {{ .volumeMode }}
+        {{- with .storageClassName }}
+        storageClassName: {{ . }}
+        {{- end }}
+  {{- end }}{{/* end if enabled */}}
+  {{- end }}{{/* end with pvc */}}
+  {{- with .workloadMetaOverrides }}
+  workloadMetaOverrides:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .workloadOverrides }}
+  workloadOverrides:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .containerOverrides }}
+  containerOverrides:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}{{/* end if enabled */}}
+{{- end }}{{/* end with event-tailer */}}

scripts/hack/patch-rancher-logging

@@ -22,22 +22,8 @@ patch_rancher_logging_chart()
   grep "harvester-patch" ./rancher-logging/templates/loggings/rke2/daemonset.yaml || true
 
   echo "patch rancher logging eventtailer"
-  cp -f ${pkg_logging_path}/${logging_version}/eventtailer.yaml ./rancher-logging/templates/eventtailer.yaml
-  grep "harvester-patch" ./rancher-logging/templates/eventtailer.yaml || true
-
-  # replace fluentbit image version; yq can also work, but it strips all blank lines; use patch instead
-  local valuesfile="./rancher-logging/values.yaml"
-  local difffile="${pkg_logging_path}/${logging_version}/patch-vaues-fluentbit-image.diff"
-  echo "patch fluentbit image version"
-  echo "the current values.yaml has following fluentbit image version"
-  grep "rancher/mirrored-fluent-fluent-bit" $valuesfile -1 || true
-  if [ -f "$difffile" ]; then
-    patch $valuesfile $difffile
-  else
-    echo "diff file $difffile is not found"
-  fi
-  echo "the patched values.yaml has following fluentbit image version"
-  grep "rancher/mirrored-fluent-fluent-bit" $valuesfile -1 || true
+  cp -f ${pkg_logging_path}/${logging_version}/eventtailer.yaml ./rancher-logging/templates/logging/eventtailer.yaml
+  grep "harvester-patch" ./rancher-logging/templates/logging/eventtailer.yaml || true
 
   # remove existing chart
   rm ${chart_dir}/rancher-logging-${logging_version}.tgz

scripts/images/rancher-images.txt

@@ -1,31 +1,30 @@
 docker.io/rancher/fleet-agent:v0.11.2
 docker.io/rancher/fleet:v0.11.2
 docker.io/rancher/gitjob:v0.9.8
-docker.io/rancher/kubectl:v1.20.2
 docker.io/rancher/kubectl:v1.21.5
 docker.io/rancher/kubectl:v1.29.2
 docker.io/rancher/mirrored-grafana-grafana:9.1.5
-docker.io/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v20221220-controller-v1.5.1-58-g787ea74b6
+docker.io/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.4.3
 docker.io/rancher/mirrored-kiwigrid-k8s-sidecar:1.24.6
 docker.io/rancher/mirrored-kube-state-metrics-kube-state-metrics:v2.10.1
 docker.io/rancher/mirrored-library-busybox:1.31.1
 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.65.1
-docker.io/rancher/mirrored-prometheus-operator-prometheus-operator:v0.65.1
-docker.io/rancher/mirrored-prometheus-prometheus:v2.45.0
-docker.io/rancher/mirrored-prometheus-alertmanager:v0.26.0
+docker.io/rancher/mirrored-prometheus-operator-prometheus-config-reloader:v0.75.1
+docker.io/rancher/mirrored-prometheus-operator-prometheus-operator:v0.75.1
+docker.io/rancher/mirrored-prometheus-operator-admission-webhook: v0.75.1
+docker.io/rancher/mirrored-prometheus-prometheus:v2.53.1
+docker.io/rancher/mirrored-prometheus-alertmanager:v0.27.0
 docker.io/rancher/rancher-webhook:v0.6.2
 docker.io/rancher/rancher:v2.10.1
 docker.io/rancher/rancher-agent:v2.10.1
-docker.io/rancher/shell:v0.1.26
-docker.io/rancher/shell:v0.1.24
+docker.io/rancher/shell:v0.2.1
 docker.io/rancher/shell:v0.3.0
 docker.io/rancher/system-agent:v0.3.11-suc
 docker.io/rancher/system-upgrade-controller:v0.14.2
-docker.io/rancher/mirrored-banzaicloud-fluentd:v1.14.6-alpine-5
-docker.io/rancher/mirrored-kube-logging-logging-operator:4.4.0
-docker.io/rancher/mirrored-fluent-fluent-bit:2.2.0
-docker.io/rancher/mirrored-jimmidyson-configmap-reload:v0.4.0
+docker.io/rancher/mirrored-kube-logging-fluentd:v1.16-4.10-full
+docker.io/rancher/mirrored-kube-logging-logging-operator:4.10.0
+docker.io/rancher/mirrored-fluent-fluent-bit:3.1.8
+docker.io/rancher/mirrored-kube-logging-config-reloader:v0.0.6
 docker.io/rancher/mirrored-cluster-api-controller:v1.8.3

scripts/version-logging

@@ -1 +1 @@
-LOGGING_VERSION=103.1.0+up4.4.0
+LOGGING_VERSION=105.2.0+up4.10.0

scripts/version-monitoring

@@ -1 +1 @@
-MONITORING_VERSION=103.1.1+up45.31.1
+MONITORING_VERSION=105.1.2+up61.3.2