Bump rancher-monitoring to 103.1.1+up45.1.1, bump logging to 103.1.0+…

…up4.4.0 Signed-off-by: Jian Wang <[email protected]>
harvester · Jul 26, 2024 · 73f24af · 73f24af
1 parent 24a8e73
commit 73f24af
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 125 deletions.
diff --git a/...config/templates/patch/rancher-logging/103.0.0+up3.17.10/patch-vaues-fluentbit-image.diff b/...config/templates/patch/rancher-logging/103.0.0+up3.17.10/patch-vaues-fluentbit-image.diff
diff --git a/...-logging/103.0.0+up3.17.10/configmap.yaml → ...er-logging/103.1.0+up4.4.0/configmap.yaml b/...-logging/103.0.0+up3.17.10/configmap.yaml → ...er-logging/103.1.0+up4.4.0/configmap.yaml
diff --git a/...-logging/103.0.0+up3.17.10/daemonset.yaml → ...er-logging/103.1.0+up4.4.0/daemonset.yaml b/...-logging/103.0.0+up3.17.10/daemonset.yaml → ...er-logging/103.1.0+up4.4.0/daemonset.yaml
diff --git a/...ogging/103.0.0+up3.17.10/eventtailer.yaml → ...-logging/103.1.0+up4.4.0/eventtailer.yaml b/...ogging/103.0.0+up3.17.10/eventtailer.yaml → ...-logging/103.1.0+up4.4.0/eventtailer.yaml
diff --git a/pkg/config/templates/patch/rancher-monitoring-crd/103.0.3+up45.31.1/rbac.yaml b/pkg/config/templates/patch/rancher-monitoring-crd/103.0.3+up45.31.1/rbac.yaml
diff --git a/...up45.31.1/patch-values-shell-version.diff → ...up45.31.1/patch-values-shell-version.diff b/...up45.31.1/patch-values-shell-version.diff → ...up45.31.1/patch-values-shell-version.diff
@@ -4,8 +4,8 @@
 
  image:
    repository: rancher/shell
--  tag: v0.1.18
-+  tag: v0.1.22
+-  tag: v0.1.25
++  tag: v0.1.26
 
  nodeSelector: {}
 
diff --git a/...oring/103.0.3+up45.31.1/nginx-config.yaml → ...oring/103.1.1+up45.31.1/nginx-config.yaml b/...oring/103.0.3+up45.31.1/nginx-config.yaml → ...oring/103.1.1+up45.31.1/nginx-config.yaml
diff --git a/...up45.31.1/patch-values-shell-version.diff → ...up45.31.1/patch-values-shell-version.diff b/...up45.31.1/patch-values-shell-version.diff → ...up45.31.1/patch-values-shell-version.diff
@@ -4,8 +4,8 @@
    ## Image to use to run the scripts
    image:
      repository: rancher/shell
--    tag: v0.1.19
-+    tag: v0.1.22
+-    tag: v0.1.25
++    tag: v0.1.26
 
  ## Rancher Monitoring
  ##
diff --git a/scripts/hack/patch-rancher-monitoring-crd b/scripts/hack/patch-rancher-monitoring-crd
@@ -15,24 +15,6 @@ patch_rancher_monitoring_crd_chart()
   cd ${chart_dir}
   tar zxf rancher-monitoring-crd-${monitoring_version}.tgz --warning=no-timestamp
 
-  local origfile="./rancher-monitoring-crd/templates/rbac.yaml"
-  local newfile="${pkg_monitoring_crd_path}/${monitoring_version}/rbac.yaml"
-  echo "patch original file $origfile"
-  if [ -f "$origfile" ]; then
-    ls -alth "$origfile"
-    echo "diff"
-    # when files are different, `diff` will return 1
-    diff "$origfile" "$newfile" || true
-    rm -f "$origfile"
-  else
-    echo "original file $origfile is not found"
-  fi
-
-  # replace with new file
-  cp -f "$newfile" "$origfile"
-  echo "patched file"
-  ls -alth "$origfile"
-
   # replace shell image version; yq can also work, but it strips all blank lines; use patch instead
   #  yq -e e '(.image | select(.repository == "rancher/shell") | .tag) = "v0.1.22"' -i ran-mon-crd-values.yaml
   local valuesfile="./rancher-monitoring-crd/values.yaml"

diff --git a/scripts/images/harvester-additional-images.txt b/scripts/images/harvester-additional-images.txt
@@ -1,2 +1,2 @@
 registry.suse.com/suse/vmdp/vmdp:2.5.4.2
-rancher/harvester-eventrouter:v0.2.0
+rancher/harvester-eventrouter:v0.3.1
diff --git a/scripts/images/rancher-images.txt b/scripts/images/rancher-images.txt
@@ -6,23 +6,23 @@ docker.io/rancher/kubectl:v1.21.5
 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-kiwigrid-k8s-sidecar:1.24.6
-docker.io/rancher/mirrored-kube-state-metrics-kube-state-metrics:v2.6.0
+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.42.0
-docker.io/rancher/mirrored-prometheus-alertmanager:v0.25.0
+docker.io/rancher/mirrored-prometheus-prometheus:v2.45.0
+docker.io/rancher/mirrored-prometheus-alertmanager:v0.26.0
 docker.io/rancher/rancher-webhook:v0.4.3
 docker.io/rancher/rancher:v2.8.3
-docker.io/rancher/shell:v0.1.22
+docker.io/rancher/shell:v0.1.26
 docker.io/rancher/shell:v0.1.23
 docker.io/rancher/system-agent:v0.3.6-suc
 docker.io/rancher/system-upgrade-controller:v0.13.1
 docker.io/rancher/mirrored-banzaicloud-fluentd:v1.14.6-alpine-5
-docker.io/rancher/mirrored-banzaicloud-logging-operator:3.17.10
+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-cluster-api-controller:v1.4.4
diff --git a/scripts/version-logging b/scripts/version-logging
@@ -1 +1 @@
-LOGGING_VERSION=103.0.0+up3.17.10
+LOGGING_VERSION=103.1.0+up4.4.0
diff --git a/scripts/version-monitoring b/scripts/version-monitoring
@@ -1 +1 @@
-MONITORING_VERSION=103.0.3+up45.31.1
+MONITORING_VERSION=103.1.1+up45.31.1
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		LOGGING_VERSION=103.0.0+up3.17.10
		LOGGING_VERSION=103.1.0+up4.4.0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		MONITORING_VERSION=103.0.3+up45.31.1
		MONITORING_VERSION=103.1.1+up45.31.1