[dev-v2.10] rancher-monitoring 105.1.3-rc.1 update #5051

jmeza-xyz · 2025-01-29T15:42:26Z

Checkpoints for Chart Bumps

release.yaml:

Each chart version in release.yaml DOES NOT modify an already released chart. If so, stop and modify the versions so that it releases a net-new chart.
Each chart version in release.yaml IS exactly 1 more patch or minor version than the last released chart version. If not, stop and modify the versions so that it releases a net-new chart.

Chart.yaml and index.yaml:

The index.yaml file has an entry for your new chart version.
The index.yaml entries for each chart matches the Chart.yaml for each chart.
Each chart has ALL required annotations
- kube-version annotation
- rancher-version annotation
- permits-os annotation (indicates Windows and/or Linux)

Issue: rancher/rancher#48877

Users are not able to install rancher-monitoring chart if global.cattle.systemDefaultRegistry and grafana.imageRenderer.enabled=true is set because the $registry variable include statement is missing an argument from the image-renderer-deployment.yaml template file. Verified the error in rancher v2.10.1 installing chart version 105.1.2+up61.3.2 and confirmed it was introduced in 105.0.0+up57.0.3.

Error from install with setting from image above:

Error: template: rancher-monitoring/charts/grafana/templates/image-renderer-deployment.yaml:68:27: executing "rancher-monitoring/charts/grafana/templates/image-renderer-deployment.yaml" at <include>: wrong number of args for include: want 2 got 1

Solution

This PR changes:

- {{- $registry := include "system_default_registry" | default .Values.imageRenderer.image.registry -}}
+ {{- $registry := include "system_default_registry" . | default .Values.imageRenderer.image.registry -}}

QA Testing Considerations

github-actions · 2025-01-29T15:42:38Z

Validation steps

Ensure all container images have repository and tag on the same level to ensure that all container images are included in rancher-images.txt which are used by airgap customers.

  Ex:-
    longhorn-controller:
      repository: rancher/hardened-sriov-cni
      tag: v2.6.3-build20230913

Add a 👍 (thumbs up) reaction to this comment once done. CI won't pass without this reaction to the github-action bot's latest validation comment.
Approve the PR to run the CI check.

github-actions · 2025-01-29T16:06:28Z

Validation steps

Ensure all container images have repository and tag on the same level to ensure that all container images are included in rancher-images.txt which are used by airgap customers.

  Ex:-
    longhorn-controller:
      repository: rancher/hardened-sriov-cni
      tag: v2.6.3-build20230913

Add a 👍 (thumbs up) reaction to this comment once done. CI won't pass without this reaction to the github-action bot's latest validation comment.
Approve the PR to run the CI check.

github-actions · 2025-01-29T16:07:31Z

Validation steps

Ensure all container images have repository and tag on the same level to ensure that all container images are included in rancher-images.txt which are used by airgap customers.

  Ex:-
    longhorn-controller:
      repository: rancher/hardened-sriov-cni
      tag: v2.6.3-build20230913

Add a 👍 (thumbs up) reaction to this comment once done. CI won't pass without this reaction to the github-action bot's latest validation comment.
Approve the PR to run the CI check.

packages/rancher-monitoring/rancher-monitoring/package.yaml

...nitoring/rancher-monitoring/generated-changes/overlay/crds/crds/crd-alertmanagerconfigs.yaml

mallardduck · 2025-01-31T15:36:38Z

@jmeza-xyz - We're past freeze now and there's a short window for the next release. Please let us know when you update this ASAP, that way it can be properly QAd before the window closes. The bug complete date is Feb 7th.

Signed-off-by: Meza <[email protected]>

…rer-Deployment Signed-off-by: Meza <[email protected]>

Signed-off-by: Meza <[email protected]>

github-actions · 2025-02-04T05:40:46Z

Validation steps

Ensure all container images have repository and tag on the same level to ensure that all container images are included in rancher-images.txt which are used by airgap customers.

  Ex:-
    longhorn-controller:
      repository: rancher/hardened-sriov-cni
      tag: v2.6.3-build20230913

Add a 👍 (thumbs up) reaction to this comment once done. CI won't pass without this reaction to the github-action bot's latest validation comment.
Approve the PR to run the CI check.

jmeza-xyz · 2025-02-04T05:45:31Z

Apologies for the delay in fixing the items pointed out in conversation. I've made the corrections as requested. Commit is ready for review @mallardduck @alexandreLamarre , thanks in advance for your time.

github-actions · 2025-02-05T13:27:57Z

Validation steps

Ensure all container images have repository and tag on the same level to ensure that all container images are included in rancher-images.txt which are used by airgap customers.

  Ex:-
    longhorn-controller:
      repository: rancher/hardened-sriov-cni
      tag: v2.6.3-build20230913

Add a 👍 (thumbs up) reaction to this comment once done. CI won't pass without this reaction to the github-action bot's latest validation comment.
Approve the PR to run the CI check.

github-actions · 2025-02-06T03:55:09Z

Validation steps

Ensure all container images have repository and tag on the same level to ensure that all container images are included in rancher-images.txt which are used by airgap customers.

  Ex:-
    longhorn-controller:
      repository: rancher/hardened-sriov-cni
      tag: v2.6.3-build20230913

Add a 👍 (thumbs up) reaction to this comment once done. CI won't pass without this reaction to the github-action bot's latest validation comment.
Approve the PR to run the CI check.

github-actions · 2025-02-06T19:06:08Z

Validation steps

Ensure all container images have repository and tag on the same level to ensure that all container images are included in rancher-images.txt which are used by airgap customers.

  Ex:-
    longhorn-controller:
      repository: rancher/hardened-sriov-cni
      tag: v2.6.3-build20230913

Add a 👍 (thumbs up) reaction to this comment once done. CI won't pass without this reaction to the github-action bot's latest validation comment.
Approve the PR to run the CI check.

mallardduck · 2025-02-06T19:20:44Z

@jmeza-xyz - looks like errors with some files. try make validate locally to see what's going on.

release.yaml not following yq style
make: *** [Makefile:14: check-release-yaml] Error 1

github-actions · 2025-02-06T21:57:53Z

Validation steps

Ensure all container images have repository and tag on the same level to ensure that all container images are included in rancher-images.txt which are used by airgap customers.

  Ex:-
    longhorn-controller:
      repository: rancher/hardened-sriov-cni
      tag: v2.6.3-build20230913

Add a 👍 (thumbs up) reaction to this comment once done. CI won't pass without this reaction to the github-action bot's latest validation comment.
Approve the PR to run the CI check.

Signed-off-by: Meza <[email protected]>

jmeza-xyz · 2025-02-06T22:11:14Z

@mallardduck apologies, it seems a PR was merged and I didn't rebase. I just pushed a rebase and make validate is successful.

Git diff

++<<<<<<< HEAD
 +rancher-webhook:
 +  - 105.0.3+up0.6.4-rc.1
++=======
+ rancher-monitoring:
+   - 105.1.3-rc.1+up61.3.2
+ rancher-monitoring-crd:
+   - 105.1.3-rc.1+up61.3.2
++>>>>>>> d0cbc556a (Update release.yaml)

After rebase, make validate.

meza@the-edge charts % make validate && date
...
INFO[0066] Unarchiving assets/ui-plugin-operator-crd/ui-plugin-operator-crd-103.0.3+up0.2.2.tgz
INFO[0066] Generated chart: charts/ui-plugin-operator-crd/103.0.3+up0.2.2
INFO[0067] index.yaml is up-to-date
INFO[0067] Doing a final check to ensure Git is clean
INFO[0070] Successfully validated current repository!
Thu Feb  6 17:09:54 EST 2025
meza@the-edge charts %

github-actions · 2025-02-06T22:15:32Z

Validation steps

Ensure all container images have repository and tag on the same level to ensure that all container images are included in rancher-images.txt which are used by airgap customers.

  Ex:-
    longhorn-controller:
      repository: rancher/hardened-sriov-cni
      tag: v2.6.3-build20230913

Add a 👍 (thumbs up) reaction to this comment once done. CI won't pass without this reaction to the github-action bot's latest validation comment.
Approve the PR to run the CI check.

github-actions · 2025-02-07T16:44:54Z

Validation steps

Ensure all container images have repository and tag on the same level to ensure that all container images are included in rancher-images.txt which are used by airgap customers.

  Ex:-
    longhorn-controller:
      repository: rancher/hardened-sriov-cni
      tag: v2.6.3-build20230913

Add a 👍 (thumbs up) reaction to this comment once done. CI won't pass without this reaction to the github-action bot's latest validation comment.
Approve the PR to run the CI check.

release.yaml

Signed-off-by: Meza <[email protected]>

github-actions · 2025-02-07T17:10:39Z

Validation steps

Ensure all container images have repository and tag on the same level to ensure that all container images are included in rancher-images.txt which are used by airgap customers.

  Ex:-
    longhorn-controller:
      repository: rancher/hardened-sriov-cni
      tag: v2.6.3-build20230913

Add a 👍 (thumbs up) reaction to this comment once done. CI won't pass without this reaction to the github-action bot's latest validation comment.
Approve the PR to run the CI check.

jmeza-xyz requested a review from a team as a code owner January 29, 2025 15:42

alexandreLamarre reviewed Jan 29, 2025

View reviewed changes

packages/rancher-monitoring/rancher-monitoring/package.yaml Outdated Show resolved Hide resolved

alexandreLamarre reviewed Jan 29, 2025

View reviewed changes

...nitoring/rancher-monitoring/generated-changes/overlay/crds/crds/crd-alertmanagerconfigs.yaml Outdated Show resolved Hide resolved

jmeza-xyz added 4 commits February 4, 2025 00:15

Bump rancher-monitoring version to 105.1.3-rc.1

0f4bd53

Signed-off-by: Meza <[email protected]>

Added missing 2nd argument to variable include in Grafana Image-Rende…

27979a8

…rer-Deployment Signed-off-by: Meza <[email protected]>

PACKAGE=rancher-monitring/rancher-monitoring make charts

f8cd1e6

Signed-off-by: Meza <[email protected]>

Update release.yaml

d0cbc55

Signed-off-by: Meza <[email protected]>

jmeza-xyz force-pushed the rancher-48877 branch from feaedc4 to d0cbc55 Compare February 4, 2025 05:40

Merge branch 'dev-v2.10' into rancher-48877

e06af62

jmeza-xyz changed the title ~~[dev-v2.10] rancher-monitoring 105.1.3+up61.3.2 update~~ [dev-v2.10] rancher-monitoring 105.1.3-rc.1 update Feb 5, 2025

Merge branch 'dev-v2.10' into rancher-48877

314368d

Merge branch 'dev-v2.10' into rancher-48877

7595228

mallardduck requested a review from alexandreLamarre February 6, 2025 19:17

Rebase release.yaml

10313d2

Signed-off-by: Meza <[email protected]>

jmeza-xyz force-pushed the rancher-48877 branch from 0fd5da7 to 10313d2 Compare February 6, 2025 22:15

Merge branch 'dev-v2.10' into rancher-48877

9e128f4

alexandreLamarre reviewed Feb 7, 2025

View reviewed changes

release.yaml Outdated Show resolved Hide resolved

Remove duplicate rancher-monitoring declarations

425d98c

Signed-off-by: Meza <[email protected]>

alexandreLamarre approved these changes Feb 7, 2025

View reviewed changes

alexandreLamarre merged commit 0c70ea0 into rancher:dev-v2.10 Feb 7, 2025
3 of 4 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[dev-v2.10] rancher-monitoring 105.1.3-rc.1 update #5051

[dev-v2.10] rancher-monitoring 105.1.3-rc.1 update #5051

jmeza-xyz commented Jan 29, 2025 •

edited

Loading

github-actions bot commented Jan 29, 2025

github-actions bot commented Jan 29, 2025

github-actions bot commented Jan 29, 2025

mallardduck commented Jan 31, 2025

github-actions bot commented Feb 4, 2025

jmeza-xyz commented Feb 4, 2025

github-actions bot commented Feb 5, 2025

github-actions bot commented Feb 6, 2025

github-actions bot commented Feb 6, 2025

mallardduck commented Feb 6, 2025

github-actions bot commented Feb 6, 2025

jmeza-xyz commented Feb 6, 2025

github-actions bot commented Feb 6, 2025

github-actions bot commented Feb 7, 2025

github-actions bot commented Feb 7, 2025

[dev-v2.10] rancher-monitoring 105.1.3-rc.1 update #5051

[dev-v2.10] rancher-monitoring 105.1.3-rc.1 update #5051

Conversation

jmeza-xyz commented Jan 29, 2025 • edited Loading

Checkpoints for Chart Bumps

Issue: rancher/rancher#48877

Solution

QA Testing Considerations

github-actions bot commented Jan 29, 2025

Validation steps

github-actions bot commented Jan 29, 2025

Validation steps

github-actions bot commented Jan 29, 2025

Validation steps

mallardduck commented Jan 31, 2025

github-actions bot commented Feb 4, 2025

Validation steps

jmeza-xyz commented Feb 4, 2025

github-actions bot commented Feb 5, 2025

Validation steps

github-actions bot commented Feb 6, 2025

Validation steps

github-actions bot commented Feb 6, 2025

Validation steps

mallardduck commented Feb 6, 2025

github-actions bot commented Feb 6, 2025

Validation steps

jmeza-xyz commented Feb 6, 2025

github-actions bot commented Feb 6, 2025

Validation steps

github-actions bot commented Feb 7, 2025

Validation steps

github-actions bot commented Feb 7, 2025

Validation steps

jmeza-xyz commented Jan 29, 2025 •

edited

Loading