Skip to content

fix(base-cluster/monitoring): downgrade sidecar version to fix race condition#1883

Merged
marvinWolff merged 1 commit intomainfrom
fix/base-cluster/grafana_sidecar_version_downgrade
Jan 7, 2026
Merged

fix(base-cluster/monitoring): downgrade sidecar version to fix race condition#1883
marvinWolff merged 1 commit intomainfrom
fix/base-cluster/grafana_sidecar_version_downgrade

Conversation

@marvinWolff
Copy link
Collaborator

@marvinWolff marvinWolff commented Jan 7, 2026

Summary by CodeRabbit

  • Chores
    • Updated Grafana sidecar image to version 2.0.3 in the monitoring stack configuration, adding an explicit image tag for the Grafana dashboard sidecar.

✏️ Tip: You can customize this high-level summary in your review settings.

@coderabbitai
Copy link

coderabbitai bot commented Jan 7, 2026

📝 Walkthrough

Walkthrough

A single Helm template file was modified to add an explicit Grafana sidecar image tag (2.0.3) in the dashboardProviders sidecar configuration; no other changes to sidecar fields or dashboards were introduced.

Changes

Cohort / File(s) Summary
Grafana sidecar configuration
charts/base-cluster/templates/monitoring/kube-prometheus-stack/_grafana-config.yaml
Added explicit image block with tag 2.0.3 under the Grafana sidecardashboardProviders configuration; comments referencing an open issue and a TODO were included.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

Suggested reviewers

  • tasches
  • cwrau
  • teutonet-bot

🐰 A little tag I hopped to place,
A tidy line to fix its space,
2.0.3 snug and neat,
Dashboards safe and sweet,
Hooray — the sidecar’s found its place! 🎉

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly describes the main change: downgrading a Grafana sidecar version to resolve a race condition issue.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


📜 Recent review details

Configuration used: defaults

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between cbb4cae and f334357.

📒 Files selected for processing (1)
  • charts/base-cluster/templates/monitoring/kube-prometheus-stack/_grafana-config.yaml
🚧 Files skipped from review as they are similar to previous changes (1)
  • charts/base-cluster/templates/monitoring/kube-prometheus-stack/_grafana-config.yaml
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (3)
  • GitHub Check: check licenses
  • GitHub Check: lint helm chart (base-cluster)
  • GitHub Check: wait-for-checks

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@gemini-code-assist
Copy link

Summary of Changes

Hello @marvinWolff, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a critical race condition within the monitoring setup by reverting the grafana-sidecar image to a known stable version. This ensures the reliability and stability of the Grafana dashboards and their associated data collection, preventing potential issues caused by the newer version.

Highlights

  • Sidecar Version Downgrade: The grafana-sidecar image tag has been explicitly set to 2.0.3 within the _grafana-config.yaml to address a reported race condition.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request downgrades the Grafana sidecar image version to 2.0.3 to address a race condition. The change is straightforward and appears correct. The suggestion to include an inline comment explaining the version pinning has been kept as it improves long-term maintainability and does not conflict with any existing rules.

@marvinWolff marvinWolff force-pushed the fix/base-cluster/grafana_sidecar_version_downgrade branch from cbb4cae to f334357 Compare January 7, 2026 10:12
@marvinWolff marvinWolff enabled auto-merge January 7, 2026 10:16
@marvinWolff marvinWolff added this pull request to the merge queue Jan 7, 2026
Merged via the queue into main with commit 3044ba9 Jan 7, 2026
31 of 32 checks passed
@marvinWolff marvinWolff deleted the fix/base-cluster/grafana_sidecar_version_downgrade branch January 7, 2026 10:52
github-merge-queue bot pushed a commit that referenced this pull request Jan 8, 2026
🤖 I have created a release *beep* *boop*
---


##
[11.0.1](base-cluster-v11.0.0...base-cluster-v11.0.1)
(2026-01-08)


### Bug Fixes

* **base-cluster/monitoring:** downgrade sidecar version to fix race
condition
([#1883](#1883))
([3044ba9](3044ba9))
* **base-cluster/monitoring:** use correct grafana-tempo url
([#1881](#1881))
([e644bd2](e644bd2))


### Miscellaneous Chores

* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v80
([#1868](#1868))
([1801d12](1801d12))
* **base-cluster/dependencies:** update helm release oauth2-proxy to
v9.0.1
([#1869](#1869))
([e6f2b7e](e6f2b7e))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

* **Bug Fixes**
  * Fixed race condition in sidecar component
  * Corrected Grafana Tempo URL configuration

* **Chores**
  * Updated kube-prometheus-stack to v80
  * Updated oauth2-proxy to v9.0.1

<sub>✏️ Tip: You can customize this high-level summary in your review
settings.</sub>

<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
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