From ec07086e179fb64726ad2c3e2a181e090065d0be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Fr=C3=B6mbgen?=
 <23717573+mfroembgen@users.noreply.github.com>
Date: Mon, 29 Jun 2026 10:47:30 +0200
Subject: [PATCH] fix: align otel collector image tag

---
 .changeset/align-otel-collector-tag.md   | 5 +++++
 .github/workflows/update-app-version.yml | 7 ++++++-
 charts/clickstack/values.yaml            | 3 +--
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/align-otel-collector-tag.md

diff --git a/.changeset/align-otel-collector-tag.md b/.changeset/align-otel-collector-tag.md
new file mode 100644
index 0000000..6509c78
--- /dev/null
+++ b/.changeset/align-otel-collector-tag.md
@@ -0,0 +1,5 @@
+---
+"helm-charts": patch
+---
+
+fix: align otel-collector image tag with chart appVersion
diff --git a/.github/workflows/update-app-version.yml b/.github/workflows/update-app-version.yml
index f93994f..591e077 100644
--- a/.github/workflows/update-app-version.yml
+++ b/.github/workflows/update-app-version.yml
@@ -25,6 +25,10 @@ jobs:
         run: |
           sed -i "s/^appVersion: .*/appVersion: ${{ github.event.inputs.tag }}/" charts/clickstack/Chart.yaml
 
+      - name: Update otel-collector image tag in values.yaml
+        run: |
+          sed -i '/clickstack-otel-collector/{n;s/tag: "[^"]*"/tag: "${{ github.event.inputs.tag }}"/}' charts/clickstack/values.yaml
+
       - name: Create changeset
         run: |
           mkdir -p .changeset
@@ -43,8 +47,9 @@ jobs:
           commit-message: "chore: Update appVersion to ${{ github.event.inputs.tag }}"
           title: "Update appVersion to ${{ github.event.inputs.tag }}"
           body: |
-            This PR updates the appVersion in Chart.yaml to `${{ github.event.inputs.tag }}`.
+            This PR updates the appVersion in Chart.yaml to `${{ github.event.inputs.tag }}` and aligns the otel-collector image tag in values.yaml.
             
             - Updated `charts/clickstack/Chart.yaml`
+            - Updated `otel-collector.image.tag` in `charts/clickstack/values.yaml`
           branch: update-app-version-${{ github.event.inputs.tag }}
           delete-branch: true
diff --git a/charts/clickstack/values.yaml b/charts/clickstack/values.yaml
index 4b68915..edd375c 100644
--- a/charts/clickstack/values.yaml
+++ b/charts/clickstack/values.yaml
@@ -371,7 +371,7 @@ otel-collector:
   mode: deployment
   image:
     repository: docker.clickhouse.com/clickhouse/clickstack-otel-collector
-    tag: "2.19.0"
+    tag: "2.28.0"
   extraEnvsFrom:
     - configMapRef:
         name: clickstack-config
@@ -412,4 +412,3 @@ otel-collector:
       enabled: false
     zipkin:
       enabled: false
-