Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump rancher-monitoring to 103.1.1+up45.1.1 rancher-logging to 103.1.0+up4.4.0 #766

Merged
merged 1 commit into from
Jul 26, 2024
Merged

bump rancher-monitoring to 103.1.1+up45.1.1 rancher-logging to 103.1.0+up4.4.0 #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions ...config/templates/patch/rancher-logging/103.0.0+up3.17.10/patch-vaues-fluentbit-image.diff
View file
Open in desktop

This file was deleted.

0 ...-logging/103.0.0+up3.17.10/configmap.yaml → ...er-logging/103.1.0+up4.4.0/configmap.yaml
View file
Open in desktop
File renamed without changes.
0 ...-logging/103.0.0+up3.17.10/daemonset.yaml → ...er-logging/103.1.0+up4.4.0/daemonset.yaml
View file
Open in desktop
File renamed without changes.
0 ...ogging/103.0.0+up3.17.10/eventtailer.yaml → ...-logging/103.1.0+up4.4.0/eventtailer.yaml
View file
Open in desktop
File renamed without changes.
76 changes: 0 additions & 76 deletions pkg/config/templates/patch/rancher-monitoring-crd/103.0.3+up45.31.1/rbac.yaml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...up45.31.1/patch-values-shell-version.diff → ...up45.31.1/patch-values-shell-version.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}

0 ...oring/103.0.3+up45.31.1/nginx-config.yaml → ...oring/103.1.1+up45.31.1/nginx-config.yaml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...up45.31.1/patch-values-shell-version.diff → ...up45.31.1/patch-values-shell-version.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
##
18 changes: 0 additions & 18 deletions scripts/hack/patch-rancher-monitoring-crd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion scripts/images/harvester-additional-images.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
10 changes: 5 additions & 5 deletions scripts/images/rancher-images.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion scripts/version-logging
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion scripts/version-monitoring
View file
Open in desktop
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
Loading