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

Bump monitoring, logging version per Rancher v2.7 #629

Merged
merged 1 commit into from
Jan 11, 2024
Merged

Bump monitoring, logging version per Rancher v2.7 #629

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
124 changes: 0 additions & 124 deletions pkg/config/templates/patch/rancher-logging/100.1.3+up3.17.7/daemonset.yaml
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions pkg/config/templates/patch/rancher-logging/100.1.3+up3.17.7/eventtailer.yaml
View file
Open in desktop

This file was deleted.

82 changes: 0 additions & 82 deletions pkg/config/templates/patch/rancher-logging/102.0.0+up3.17.10/configmap.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...r-logging/100.1.3+up3.17.7/configmap.yaml → ...-logging/102.0.1+up3.17.10/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...-logging/102.0.0+up3.17.10/daemonset.yaml → ...-logging/102.0.1+up3.17.10/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ogging/102.0.0+up3.17.10/eventtailer.yaml → ...ogging/102.0.1+up3.17.10/eventtailer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 ...monitoring-crd/102.0.0+up40.1.2/rbac.yaml → ...monitoring-crd/102.0.2+up40.1.2/rbac.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...toring/102.0.0+up40.1.2/nginx-config.yaml → ...toring/102.0.2+up40.1.2/nginx-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"';
}

}
6 changes: 3 additions & 3 deletions pkg/config/templates/rancherd-22-addons.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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:
Expand All @@ -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 }}
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.1.1
rancher/harvester-eventrouter:v0.1.2
3 changes: 2 additions & 1 deletion scripts/images/rancher-images.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 1.18, 1.19, 1.21 are all in the running cluster, need to keep 1.18

# crictl image ls | grep shell
docker.io/rancher/shell                                                     v0.1.18                                    2dca1f9139423       117MB
docker.io/rancher/shell                                                     v0.1.19                                    0d3d2da4b3086       352MB
docker.io/rancher/shell                                                     v0.1.21                                    4cf698201012e       399MB

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
Expand Down
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=102.0.0+up3.17.10
LOGGING_VERSION=102.0.1+up3.17.10
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=102.0.0+up40.1.2
MONITORING_VERSION=102.0.2+up40.1.2