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

[dev-v2.11] rancher-monitoring 106.0.0+up61.3.2 update #5106

Open
wants to merge 3 commits into
base: dev-v2.11
Choose a base branch
from

Conversation

alexandreLamarre
Copy link
Contributor

@alexandreLamarre alexandreLamarre commented Feb 6, 2025

Issue:

  • Charts are not available via the UI for rancher 2.11 due to incorrect annotations
  • During the rebase to upstream 61.3.2 we introduced a regression related to nodeSelectors in prometheus-adapter:

rancher/rancher#48089
#5074 accidentally did not fix the issue, so introducing the fix here

Problem
Solution
Testing
Engineering Testing
Manual Testing
Automated Testing
QA Testing Considerations

Deploy chart with prometheus-adapter enabled
Deploy chart with prometheus-adapter node-selectors defined

Regressions Considerations

Copy link

github-actions bot commented Feb 6, 2025

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.

@alexandreLamarre alexandreLamarre force-pushed the bump-rancher-monitoring-annotation branch from cef308f to 96437de Compare February 6, 2025 15:35
Copy link

github-actions bot commented Feb 6, 2025

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.

@alexandreLamarre alexandreLamarre force-pushed the bump-rancher-monitoring-annotation branch from 96437de to 5ffa6cf Compare February 6, 2025 21:32
Copy link

github-actions bot commented Feb 6, 2025

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.

@alexandreLamarre alexandreLamarre marked this pull request as ready for review February 6, 2025 21:35
@alexandreLamarre alexandreLamarre requested a review from a team as a code owner February 6, 2025 21:35
@@ -14,7 +14,7 @@ annotations:
catalog.cattle.io/namespace: cattle-monitoring-system
catalog.cattle.io/permits-os: linux,windows
catalog.cattle.io/provides-gvr: monitoring.coreos.com.prometheus/v1
catalog.cattle.io/rancher-version: '>= 2.10.0-0 < 2.11.0-0'
catalog.cattle.io/rancher-version: '>= 2.11.0-0 < 2.12.0-0'

Choose a reason for hiding this comment

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

Hello @alexandreLamarre per the review on #5064 I have incorporated the rancher version bumps too in the same commit.
Would it be feasible to eliminate this rancher version bump changes from here, and continue with merging of #5064?
cc @jbiers @mallardduck

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

Successfully merging this pull request may close these issues.

3 participants