From e45e1a7a5fb8ef7a655223d5802f312281e87665 Mon Sep 17 00:00:00 2001 From: Jian Wang Date: Fri, 12 Jul 2024 10:55:58 +0200 Subject: [PATCH] Bump rancher-monitoring to 103.1.1+up45.1.1, bump logging to 103.1.0+up4.4.0 Signed-off-by: Jian Wang --- .../patch-vaues-fluentbit-image.diff | 19 ----- .../configmap.yaml | 0 .../daemonset.yaml | 0 .../eventtailer.yaml | 0 .../103.0.3+up45.31.1/rbac.yaml | 76 ------------------- .../patch-values-shell-version.diff | 4 +- .../nginx-config.yaml | 0 .../patch-values-shell-version.diff | 4 +- scripts/hack/patch-rancher-monitoring-crd | 18 ----- .../images/harvester-additional-images.txt | 2 +- scripts/images/rancher-images.txt | 10 +-- scripts/version-logging | 2 +- scripts/version-monitoring | 2 +- 13 files changed, 12 insertions(+), 125 deletions(-) delete mode 100644 pkg/config/templates/patch/rancher-logging/103.0.0+up3.17.10/patch-vaues-fluentbit-image.diff rename pkg/config/templates/patch/rancher-logging/{103.0.0+up3.17.10 => 103.1.0+up4.4.0}/configmap.yaml (100%) rename pkg/config/templates/patch/rancher-logging/{103.0.0+up3.17.10 => 103.1.0+up4.4.0}/daemonset.yaml (100%) rename pkg/config/templates/patch/rancher-logging/{103.0.0+up3.17.10 => 103.1.0+up4.4.0}/eventtailer.yaml (100%) delete mode 100644 pkg/config/templates/patch/rancher-monitoring-crd/103.0.3+up45.31.1/rbac.yaml rename pkg/config/templates/patch/rancher-monitoring-crd/{103.0.3+up45.31.1 => 103.1.1+up45.31.1}/patch-values-shell-version.diff (78%) rename pkg/config/templates/patch/rancher-monitoring/{103.0.3+up45.31.1 => 103.1.1+up45.31.1}/nginx-config.yaml (100%) rename pkg/config/templates/patch/rancher-monitoring/{103.0.3+up45.31.1 => 103.1.1+up45.31.1}/patch-values-shell-version.diff (82%) diff --git a/pkg/config/templates/patch/rancher-logging/103.0.0+up3.17.10/patch-vaues-fluentbit-image.diff b/pkg/config/templates/patch/rancher-logging/103.0.0+up3.17.10/patch-vaues-fluentbit-image.diff deleted file mode 100644 index 7673347e6..000000000 --- a/pkg/config/templates/patch/rancher-logging/103.0.0+up3.17.10/patch-vaues-fluentbit-image.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 diff --git a/pkg/config/templates/patch/rancher-logging/103.0.0+up3.17.10/configmap.yaml b/pkg/config/templates/patch/rancher-logging/103.1.0+up4.4.0/configmap.yaml similarity index 100% rename from pkg/config/templates/patch/rancher-logging/103.0.0+up3.17.10/configmap.yaml rename to pkg/config/templates/patch/rancher-logging/103.1.0+up4.4.0/configmap.yaml diff --git a/pkg/config/templates/patch/rancher-logging/103.0.0+up3.17.10/daemonset.yaml b/pkg/config/templates/patch/rancher-logging/103.1.0+up4.4.0/daemonset.yaml similarity index 100% rename from pkg/config/templates/patch/rancher-logging/103.0.0+up3.17.10/daemonset.yaml rename to pkg/config/templates/patch/rancher-logging/103.1.0+up4.4.0/daemonset.yaml diff --git a/pkg/config/templates/patch/rancher-logging/103.0.0+up3.17.10/eventtailer.yaml b/pkg/config/templates/patch/rancher-logging/103.1.0+up4.4.0/eventtailer.yaml similarity index 100% rename from pkg/config/templates/patch/rancher-logging/103.0.0+up3.17.10/eventtailer.yaml rename to pkg/config/templates/patch/rancher-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 deleted file mode 100644 index e0811d35a..000000000 --- a/pkg/config/templates/patch/rancher-monitoring-crd/103.0.3+up45.31.1/rbac.yaml +++ /dev/null @@ -1,76 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: {{ .Chart.Name }}-manager - labels: - app: {{ .Chart.Name }}-manager -rules: -- apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: ['create', 'get', 'patch', 'delete', 'update'] -{{- if .Values.global.cattle.psp.enabled }} -- apiGroups: ['policy'] - resources: ['podsecuritypolicies'] - verbs: ['use'] - resourceNames: - - {{ .Chart.Name }}-manager -{{- end }} ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ .Chart.Name }}-manager - labels: - app: {{ .Chart.Name }}-manager -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ .Chart.Name }}-manager -subjects: -- kind: ServiceAccount - name: {{ .Chart.Name }}-manager - namespace: {{ .Release.Namespace }} ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ .Chart.Name }}-manager - namespace: {{ .Release.Namespace }} - labels: - app: {{ .Chart.Name }}-manager ---- -{{- if .Values.global.cattle.psp.enabled }} -apiVersion: policy/v1beta1 -kind: PodSecurityPolicy -metadata: - name: {{ .Chart.Name }}-manager - namespace: {{ .Release.Namespace }} - labels: - app: {{ .Chart.Name }}-manager -spec: - privileged: false - allowPrivilegeEscalation: false - hostNetwork: false - hostIPC: false - hostPID: false - runAsUser: - rule: 'RunAsAny' - seLinux: - rule: 'RunAsAny' - supplementalGroups: - rule: 'MustRunAs' - ranges: - - min: 1 - max: 65535 - fsGroup: - rule: 'MustRunAs' - ranges: - - min: 1 - max: 65535 - readOnlyRootFilesystem: false - volumes: - - 'configMap' - - 'secret' -{{- end }} diff --git a/pkg/config/templates/patch/rancher-monitoring-crd/103.0.3+up45.31.1/patch-values-shell-version.diff b/pkg/config/templates/patch/rancher-monitoring-crd/103.1.1+up45.31.1/patch-values-shell-version.diff similarity index 78% rename from pkg/config/templates/patch/rancher-monitoring-crd/103.0.3+up45.31.1/patch-values-shell-version.diff rename to pkg/config/templates/patch/rancher-monitoring-crd/103.1.1+up45.31.1/patch-values-shell-version.diff index fba7c14c9..4b3f7b4f1 100644 --- a/pkg/config/templates/patch/rancher-monitoring-crd/103.0.3+up45.31.1/patch-values-shell-version.diff +++ b/pkg/config/templates/patch/rancher-monitoring-crd/103.1.1+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/pkg/config/templates/patch/rancher-monitoring/103.0.3+up45.31.1/nginx-config.yaml b/pkg/config/templates/patch/rancher-monitoring/103.1.1+up45.31.1/nginx-config.yaml similarity index 100% rename from pkg/config/templates/patch/rancher-monitoring/103.0.3+up45.31.1/nginx-config.yaml rename to pkg/config/templates/patch/rancher-monitoring/103.1.1+up45.31.1/nginx-config.yaml diff --git a/pkg/config/templates/patch/rancher-monitoring/103.0.3+up45.31.1/patch-values-shell-version.diff b/pkg/config/templates/patch/rancher-monitoring/103.1.1+up45.31.1/patch-values-shell-version.diff similarity index 82% rename from pkg/config/templates/patch/rancher-monitoring/103.0.3+up45.31.1/patch-values-shell-version.diff rename to pkg/config/templates/patch/rancher-monitoring/103.1.1+up45.31.1/patch-values-shell-version.diff index 87ee8fa02..500eeb079 100644 --- a/pkg/config/templates/patch/rancher-monitoring/103.0.3+up45.31.1/patch-values-shell-version.diff +++ b/pkg/config/templates/patch/rancher-monitoring/103.1.1+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 index 17ee3d133..12f32fee0 100755 --- 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 index 72cf15700..c1a24fa88 100644 --- 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 index cd7bf79c2..d9e6564dc 100644 --- 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 index 95bf2e437..ce55ff0b9 100644 --- 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 index f20124b68..4c1cf2638 100644 --- 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