Skip to content

fix(base-cluster/monitoring): only roll out alloy tracing ports if enabled#2005

Merged
cwrau merged 1 commit intomainfrom
fix/base-cluster/alloy-tracing-ports
Mar 11, 2026
Merged

fix(base-cluster/monitoring): only roll out alloy tracing ports if enabled#2005
cwrau merged 1 commit intomainfrom
fix/base-cluster/alloy-tracing-ports

Conversation

@cwrau
Copy link
Copy Markdown
Member

@cwrau cwrau commented Feb 25, 2026

Otherwise the auto-checks if tracing is enabled always trigger

Summary by CodeRabbit

Release Notes

  • Chores
    • Optimized metrics port configuration in the monitoring collector setup and adjusted conditional logic to ensure proper configuration when tracing is enabled.

…abled

Otherwise the auto-checks if tracing is enabled always trigger
Copilot AI review requested due to automatic review settings February 25, 2026 10:45
@cwrau cwrau enabled auto-merge February 25, 2026 10:45
@gemini-code-assist
Copy link
Copy Markdown

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 refines the Alloy collector's port configuration within the Helm chart to prevent unnecessary auto-checks from triggering when distributed tracing is not enabled. By making tracing-specific ports conditional on the monitoring.tracing.enabled flag, it ensures that only relevant ports are exposed, thereby improving the efficiency and accuracy of monitoring deployments.

Highlights

  • Conditional Tracing Ports: The Jaeger (compact, gRPC, HTTP) and Zipkin tracing ports for the Alloy collector are now conditionally included in the Kubernetes service definition. These ports will only be rolled out if monitoring.tracing.enabled is set to true in the Helm values.
  • Unconditional Metrics Port: The metrics port (8888) for the Alloy collector has been moved outside the tracing conditional block, ensuring it is always exposed regardless of whether tracing is enabled or disabled.
Changelog
  • charts/base-cluster/templates/monitoring/alloy-collector.yaml
    • Wrapped Jaeger and Zipkin tracing ports within a conditional block, ensuring they are only exposed when monitoring.tracing.enabled is true.
    • Relocated the metrics port definition to be outside the tracing conditional block, making it always available.
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
Copy Markdown

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

Updates the telemetry-collector Alloy HelmRelease template so tracing-related service ports are only exposed when tracing is enabled, preventing “tracing-enabled” auto-checks from being triggered by always-present ports.

Changes:

  • Wrap Jaeger/OTLP/Zipkin extraPorts entries behind {{- if .Values.monitoring.tracing.enabled }}.
  • Keep the metrics port (8888/TCP) always exposed to support scraping regardless of tracing.

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

Copy link
Copy Markdown

@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 aims to make the tracing-related ports for the Alloy collector conditional based on whether tracing is enabled. The logic is sound, but there is a critical indentation error in the Helm template that will cause YAML rendering to fail if tracing is enabled. I've provided a specific comment with a code suggestion to correct the indentation and ensure the template renders correctly.

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Feb 25, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

Configuration used: defaults

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between cd4d995 and 0efba07.

📒 Files selected for processing (1)
  • charts/base-cluster/templates/monitoring/alloy-collector.yaml

📝 Walkthrough

Walkthrough

Modified the Alloy collector Helm chart template to reorganize port definitions. Relocated the metrics port (8888) entry from within the jaeger section to the top-level extraPorts and adjusted conditional block boundaries to properly wrap extraPorts within the tracing-enabled conditional structure.

Changes

Cohort / File(s) Summary
Alloy Collector Port Configuration
charts/base-cluster/templates/monitoring/alloy-collector.yaml
Relocated metrics port definition from jaeger-adjacent block to top-level extraPorts section; reorganized conditional block placement to wrap extraPorts within tracing-enabled conditional logic.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Suggested reviewers

  • tasches
  • marvinWolff
  • teutonet-bot

Poem

🐰 A port finds new home, from jaeger's side,
To metrics' place where configs reside,
The braces align with conditional care,
Eight-eighty-eight flows without a despair! 📊

🚥 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 accurately describes the main change: conditionally including alloy tracing ports only when tracing is enabled, which matches the modifications made to the YAML configuration.
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.

✨ 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/alloy-tracing-ports

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.

@cwrau cwrau added this pull request to the merge queue Mar 11, 2026
Merged via the queue into main with commit ea44c4d Mar 11, 2026
37 checks passed
@cwrau cwrau deleted the fix/base-cluster/alloy-tracing-ports branch March 11, 2026 07:41
github-merge-queue Bot pushed a commit that referenced this pull request Mar 17, 2026
🤖 I have created a release *beep* *boop*
---


##
[11.1.0](base-cluster-v11.0.1...base-cluster-v11.1.0)
(2026-03-16)


### Features

* **base-cluster/ingress:** add auto detection of need for proxy
protocol
([#1951](#1951))
([a94de1a](a94de1a))
* **base-cluster/ingress:** allow external ingress controller
([#1859](#1859))
([1442431](1442431))
* **base-cluster/kyverno:** allow setting kyverno resources
([#1986](#1986))
([71b9db4](71b9db4))
* **base-cluster/monitoring:** add alert about base-cluster updates
([#1937](#1937))
([a3c63a7](a3c63a7))
* **base-cluster/monitoring:** add alert about deprecated APIs
([#2021](#2021))
([cb334dd](cb334dd))


### Bug Fixes

* **base-cluster/deadMansSwitch:** fix alertmanager healthchecks URL
([#2019](#2019))
([d874a56](d874a56))
* **base-cluster/ingress:** disable traefik apiCheck
([#1902](#1902))
([d45bd69](d45bd69))
* **base-cluster/ingress:** they now have the redirections nested under
http
([#1952](#1952))
([dca2502](dca2502))
* **base-cluster/monitoring:** adjust for short-lived certificates
([#1921](#1921))
([41062b2](41062b2))
* **base-cluster/monitoring:** only roll out alloy tracing ports if
enabled
([#2005](#2005))
([ea44c4d](ea44c4d))
* **base-cluster:** Revert "chore(base-cluster/dependencies): update
helm release traefik to v39
([#1936](#1936))"
([#1954](#1954))
([5d2ae36](5d2ae36))


### Miscellaneous Chores

* **base-cluster/dependencies:** update common docker tag to v1.8.0
([#1939](#1939))
([38b1c7e](38b1c7e))
* **base-cluster/dependencies:** update docker.io/curlimages/curl docker
tag to v8.18.0
([#1896](#1896))
([f046977](f046977))
* **base-cluster/dependencies:** update
docker.io/grafana/grafana-image-renderer docker tag to v5.0.13
([#1885](#1885))
([474e903](474e903))
* **base-cluster/dependencies:** update
docker.io/grafana/grafana-image-renderer docker tag to v5.2.3
([#1897](#1897))
([84b647b](84b647b))
* **base-cluster/dependencies:** update
docker.io/grafana/grafana-image-renderer docker tag to v5.3.0
([#1922](#1922))
([ef6f80f](ef6f80f))
* **base-cluster/dependencies:** update
docker.io/grafana/grafana-image-renderer docker tag to v5.4.0
([#1931](#1931))
([50171d8](50171d8))
* **base-cluster/dependencies:** update
docker.io/grafana/grafana-image-renderer docker tag to v5.5.0
([#1968](#1968))
([ee276e2](ee276e2))
* **base-cluster/dependencies:** update
docker.io/grafana/grafana-image-renderer docker tag to v5.5.1
([#1988](#1988))
([f765f5e](f765f5e))
* **base-cluster/dependencies:** update docker.io/vladgh/gpg docker tag
to v1.3.7
([#1886](#1886))
([4b2c33b](4b2c33b))
* **base-cluster/dependencies:** update helm release alloy to v1.5.2
([#1891](#1891))
([41b25e9](41b25e9))
* **base-cluster/dependencies:** update helm release alloy to v1.5.3
([#1949](#1949))
([d8bda90](d8bda90))
* **base-cluster/dependencies:** update helm release alloy to v1.6.0
([#1975](#1975))
([76632e4](76632e4))
* **base-cluster/dependencies:** update helm release external-dns to
v1.20.0
([#1905](#1905))
([ff53477](ff53477))
* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v80.13.3
([#1892](#1892))
([9775868](9775868))
* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v80.14.4
([#1906](#1906))
([f62458d](f62458d))
* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v81
([#1923](#1923))
([9e9915d](9e9915d))
* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v81.2.1
([#1934](#1934))
([30fa0dd](30fa0dd))
* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v81.3.2
([#1950](#1950))
([95a9398](95a9398))
* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v81.5.0
([#1962](#1962))
([1a9bab8](1a9bab8))
* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v81.5.2
([#1982](#1982))
([07c2249](07c2249))
* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v81.6.6
([#1989](#1989))
([2bf4f3c](2bf4f3c))
* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v82
([#1995](#1995))
([45ef213](45ef213))
* **base-cluster/dependencies:** update helm release loki to v6.49.0
([#1908](#1908))
([f36dd6d](f36dd6d))
* **base-cluster/dependencies:** update helm release loki to v6.51.0
([#1928](#1928))
([6ac27d6](6ac27d6))
* **base-cluster/dependencies:** update helm release loki to v6.53.0
([#1974](#1974))
([0bc6e68](0bc6e68))
* **base-cluster/dependencies:** update helm release oauth2-proxy to v10
([#1913](#1913))
([7e551b5](7e551b5))
* **base-cluster/dependencies:** update helm release oauth2-proxy to
v10.1.1
([#1944](#1944))
([3f97108](3f97108))
* **base-cluster/dependencies:** update helm release oauth2-proxy to
v10.1.2
([#1961](#1961))
([c0bc91d](c0bc91d))
* **base-cluster/dependencies:** update helm release oauth2-proxy to
v10.1.3
([#1979](#1979))
([9b95c4b](9b95c4b))
* **base-cluster/dependencies:** update helm release oauth2-proxy to
v10.1.4
([#2001](#2001))
([8ffa211](8ffa211))
* **base-cluster/dependencies:** update helm release reflector to v10
([#1924](#1924))
([0051c34](0051c34))
* **base-cluster/dependencies:** update helm release reflector to
v10.0.19
([#1999](#1999))
([a2b5189](a2b5189))
* **base-cluster/dependencies:** update helm release reflector to
v10.0.2
([#1935](#1935))
([333393e](333393e))
* **base-cluster/dependencies:** update helm release reflector to
v10.0.4
([#1956](#1956))
([3eef9a0](3eef9a0))
* **base-cluster/dependencies:** update helm release reflector to
v10.0.8
([#1978](#1978))
([b2f97f9](b2f97f9))
* **base-cluster/dependencies:** update helm release reflector to
v9.1.45
([#1893](#1893))
([ff100d9](ff100d9))
* **base-cluster/dependencies:** update helm release tempo to v1.24.3
([#1904](#1904))
([99099bf](99099bf))
* **base-cluster/dependencies:** update helm release tempo to v1.24.4
([#1957](#1957))
([7d67bf3](7d67bf3))
* **base-cluster/dependencies:** update helm release tempo to v1.26.1
([#1976](#1976))
([517da93](517da93))
* **base-cluster/dependencies:** update helm release tempo to v1.26.7
([#2000](#2000))
([6cabd54](6cabd54))
* **base-cluster/dependencies:** update helm release traefik to v38
([#1914](#1914))
([106c7cf](106c7cf))
* **base-cluster/dependencies:** update helm release traefik to v39
([#1936](#1936))
([5b39257](5b39257))
* **base-cluster/dependencies:** update helm release traefik to v39
([#1959](#1959))
([6efe111](6efe111))
* **base-cluster/dependencies:** update helm release traefik to v39.0.1
([#1992](#1992))
([27d7316](27d7316))
* **base-cluster/monitoring:** migrate helm repo to new URL
([#1955](#1955))
([9263d6a](9263d6a))
* **base-cluster/tetragon:** update flux apiVersion
([#1900](#1900))
([ff93afb](ff93afb))
* **base-cluster:** update kyverno
([#1918](#1918))
([a503ef6](a503ef6))
* migrate kyverno config
([71b9db4](71b9db4))

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

---------

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