Skip to content

Conversation

@cwrau
Copy link
Member

@cwrau cwrau commented Dec 4, 2025

Summary by CodeRabbit

  • Chores
    • Reorganized monitoring configuration by relocating the image renderer settings within the Grafana template.
    • Adjusted how the renderer image registry is resolved by changing the default resolution method — may affect which image registry is used when no explicit registry is provided.

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

Copilot AI review requested due to automatic review settings December 4, 2025 11:04
@cwrau cwrau enabled auto-merge December 4, 2025 11:04
@coderabbitai
Copy link

coderabbitai bot commented Dec 4, 2025

Note

Other AI code review bot(s) detected

CodeRabbit has detected other AI code review bot(s) in this pull request and will avoid duplicating their findings in the review comments. This may lead to a less comprehensive review.

Walkthrough

Relocated the imageRenderer configuration block within the Grafana template from an earlier position to under defaultDashboardsEnabled and changed its image registry default to use .registry directly; nested fields (repository, tag, automountServiceAccountToken, securityContext) were preserved.

Changes

Cohort / File(s) Summary
Grafana configuration template
charts/base-cluster/templates/monitoring/kube-prometheus-stack/_grafana-config.yaml
Moved the imageRenderer block from the top of the template to a later section (under defaultDashboardsEnabled) and adjusted the block's registry default to use .registry directly; preserved nested fields (repository, tag, automountServiceAccountToken, securityContext).

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

  • Single-file change with a small configuration relocation and a registry-default tweak.
  • Check YAML indentation and structure after move.
  • Verify the registry default behavior in template rendering (ensure no unintended nil/empty resolution).

Possibly related PRs

Suggested reviewers

  • tasches
  • teutonet-bot

Poem

🐰 I hopped a config block down the hill,
Same tags, same repo, same gentle will.
A tiny registry tweak, neat and spry,
Now Grafana paints with a clearer sky. 🎨🥕

Pre-merge checks and finishing touches

✅ 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 directly describes the main change: moving imageRenderer configuration to the correct location in the Grafana configuration template.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
✨ Finishing touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch fix/base-cluster/grafana-image-renderer-config

📜 Recent review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 9558435 and 8dcacfe.

📒 Files selected for processing (1)
  • charts/base-cluster/templates/monitoring/kube-prometheus-stack/_grafana-config.yaml (1 hunks)
🧰 Additional context used
🧠 Learnings (1)
📚 Learning: 2025-07-24T09:55:53.655Z
Learnt from: cwrau
Repo: teutonet/teutonet-helm-charts PR: 1601
File: charts/base-cluster/templates/dns/external-dns.yaml:30-32
Timestamp: 2025-07-24T09:55:53.655Z
Learning: In charts/base-cluster/templates/dns/external-dns.yaml, the dns.provider field in values.yaml has always been expected to be a map format (e.g., `{ cloudflare: {} }`), never a string format. The template correctly uses `{{ .Values.dns.provider | keys | first }}` to extract the provider name from the map keys.

Applied to files:

  • 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). (2)
  • GitHub Check: check licenses
  • GitHub Check: lint helm chart (base-cluster)
🔇 Additional comments (1)
charts/base-cluster/templates/monitoring/kube-prometheus-stack/_grafana-config.yaml (1)

63-77: ✓ Registry syntax fix approved.

The previous issue with invalid printf syntax has been correctly resolved. Line 67 now properly uses {{ $.Values.global.imageRegistry | default .registry }} instead of printf .registry.


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 @cwrau, 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 structural issue within the Grafana Helm chart template by relocating the imageRenderer configuration. The change ensures that the image renderer settings are correctly parsed and applied, which is crucial for the proper functioning of Grafana's image rendering capabilities.

Highlights

  • Configuration Relocation: The imageRenderer configuration block for Grafana has been moved to its correct hierarchical position within the _grafana-config.yaml template.
  • Helm Chart Structure Correction: This change corrects the YAML structure within the Helm chart template, ensuring the imageRenderer settings are applied as intended.
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

The pull request successfully moves the imageRenderer configuration block within the _grafana-config.yaml file to its intended location. This refactoring improves the organization and maintainability of the Grafana Helm chart configuration without altering its functionality. The change aligns the configuration with best practices for Helm chart structure, making it easier to understand and manage.

Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR fixes the placement of the imageRenderer configuration block in the Grafana subchart configuration for kube-prometheus-stack. The imageRenderer configuration was incorrectly positioned at the beginning of the template definition and has been moved to its proper location after defaultDashboardsEnabled, ensuring it's placed at the correct level within the Grafana configuration hierarchy.

Key Changes

  • Moved imageRenderer configuration block from the top of the template to after defaultDashboardsEnabled
  • Configuration includes image settings, security context, and service account token settings for the Grafana image renderer

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 82b78e5 and 9558435.

📒 Files selected for processing (1)
  • charts/base-cluster/templates/monitoring/kube-prometheus-stack/_grafana-config.yaml (1 hunks)
⏰ 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: Agent
  • GitHub Check: lint helm chart (base-cluster)

marvinWolff
marvinWolff previously approved these changes Dec 4, 2025
@cwrau cwrau force-pushed the fix/base-cluster/grafana-image-renderer-config branch from 9558435 to 8dcacfe Compare December 4, 2025 12:43
@cwrau cwrau added this pull request to the merge queue Dec 5, 2025
Merged via the queue into main with commit 5e2e9f5 Dec 5, 2025
31 of 32 checks passed
@cwrau cwrau deleted the fix/base-cluster/grafana-image-renderer-config branch December 5, 2025 09:23
github-merge-queue bot pushed a commit that referenced this pull request Dec 5, 2025
🤖 I have created a release *beep* *boop*
---


##
[10.1.2](base-cluster-v10.1.1...base-cluster-v10.1.2)
(2025-12-05)


### Bug Fixes

* **base-cluster/monitoring:** move imageRenderer config to correct
place
([#1860](#1860))
([5e2e9f5](5e2e9f5))
* **base-cluster:** set default value for kube-janitor to own repo
([#1857](#1857))
([82b78e5](82b78e5))


### Miscellaneous Chores

* **base-cluster/dependencies:** update
docker.io/grafana/grafana-image-renderer docker tag to v5
([#1822](#1822))
([b9b16d7](b9b16d7))
* **base-cluster/dependencies:** update helm release alloy to v1.5.0
([#1855](#1855))
([a157f21](a157f21))
* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v79.11.0
([#1850](#1850))
([94e7e00](94e7e00))
* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v79.9.0
([#1842](#1842))
([a834e6d](a834e6d))
* **base-cluster/dependencies:** update helm release reflector to
v9.1.42
([#1854](#1854))
([b9a042a](b9a042a))
* **base-cluster/dependencies:** update helm release tempo-distributed
to v1.57.0
([#1849](#1849))
([c78f7d2](c78f7d2))
* **base-cluster/ingress:** update gateway api
([#1843](#1843))
([96a4b76](96a4b76))

---
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 imageRenderer configuration placement in monitoring
  * Set default value for kube-janitor component

* **Chores**
* Updated multiple component versions: Grafana Image Renderer (v5),
Alloy (v1.5.0), Kube Prometheus Stack (v79.11.0), Reflector (v9.1.42),
and Tempo Distributed (v1.57.0)
  * Updated Gateway API

<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.

4 participants