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.

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

Conversation

w13915984028
Copy link
Member

@w13915984028 w13915984028 commented Jan 5, 2024

Bump rancher-monitoring to 102.0.2+up40.1.2
Bump rancher-logging 102.0.1+up3.17.10
Bump harvester-eventrouter to v0.1.2

Problem:

Harvester v1.3.0 is using Rancher newer version v2.7.9, the related rancher-monitoring and rancher-logging charts are required to be bumped.

Solution:

Bump charts accordingly.

Note: PR #628 is included in this PR.

Related Issue:

harvester/harvester#4940
harvester/harvester#4941

Test plan:

(1) Install cluster from v1.3.0 new version
(2) Enable rancher-monitoring and rancher-logging addons, if they are disabled
(3) Check the addons are enabled/deployed successfully
(4) Check monitoring and logging related features are working correctly
(5) Check harvester-eventrouter is using new image version v0.1.2

@@ -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.0+up3.17.10/templates/loggings/rke2/configmap.yaml
Copy link
Member

Choose a reason for hiding this comment

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

Do we still need to keep old version patch files?

@bk201
Copy link
Member

bk201 commented Jan 8, 2024

Missing images in the air-gapped env

  • Pod cattle-monitoring-system/prometheus-rancher-monitoring-prometheus-0 -> rancher/mirrored-library-nginx:1.24.0-alpine
  • Pod rancher-monitoring-grafana-8cc69646c-bvfx2 -> rancher/mirrored-library-nginx:1.24.0-alpine

I also get Page not found in the GUI: URL link is :https://192.168.2.106:30443/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/d/rancher-cluster-nodes-1/rancher-cluster-nodes?orgId=1&from=now-5m&to=now&refresh=30s&theme=light, seems missing k8s/clusters/local/ ?
Not sure if this is caused by the change in 03ad687

截圖 2024-01-08 下午1 18 07

@w13915984028 w13915984028 reopened this Jan 8, 2024
@w13915984028
Copy link
Member Author

@bk201

rancher-monitoring has changes in this file, it removes the /k8s/cluster/local prefix for local cluster, I will figure out the proper patch for Harvester's case. (acting as both local cluster and rancher-managed-multi-cluster)

charts\rancher-monitoring\102.0.2+up40.1.2\charts\grafana\templates\nginx-config.yaml
image

@@ -19,7 +19,7 @@ docker.io/rancher/mirrored-prometheus-alertmanager:v0.24.0
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

Bump rancher-monitoring to 102.0.2+up40.1.2
Bump rancher-logging 102.0.1+up3.17.10
Bump harvester-eventrouter to v0.1.2
Copy link
Contributor

@Vicente-Cheng Vicente-Cheng left a comment

Choose a reason for hiding this comment

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

LGTM, verified with following

cattle-monitoring-system         rancher-monitoring         1        deployed  rancher-monitoring-102.0.2+up40.1.2        0.59.1
cattle-logging-system            rancher-logging            2        deployed  rancher-logging-102.0.1+up3.17.10          3.17.10
event-tailer  ●  rancher/harvester-eventrouter:v0.1.2  true  Running

Copy link
Member

@bk201 bk201 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@bk201 bk201 merged commit 521a11e into harvester:master Jan 11, 2024
5 checks passed
@bk201
Copy link
Member

bk201 commented Mar 7, 2024

@w13915984028 is this in the upgrade path? It seems only valid for the new deployment.

@w13915984028
Copy link
Member Author

@bk201

The monitoring and logging addons (from v1.2.1) are processed as below, the addon will be set with new chart version packed in v1.3.0 ISO, it should work as expected, unless the configmap is not updated during the underlayer helm upgrade or some other bugs.

https://github.com/harvester/harvester/blob/53a1eaa6cf1da355205ab5c272ecd74bba8545fe/package/upgrade/upgrade_manifests.sh#L1203

@bk201
Copy link
Member

bk201 commented Mar 7, 2024

@w13915984028 Thanks. Then we are all good. Is it OK to remove logging_addon.yaml and monitoring_addon.yaml?

@w13915984028
Copy link
Member Author

The related files under package/upgrade/addons looks to be redundant. Should be removed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants