From 60cd2fe6e7fd0f1e2a1f20a9a58e8156c40d7f7d Mon Sep 17 00:00:00 2001
From: d066607 <tommy.sauer@sap.com>
Date: Mon, 16 Dec 2024 16:45:25 +0100
Subject: [PATCH] newer traefik requires h2c

without this option, requests which are coming in from outside the cluster will have a malformed header in their reply.
---
 common/thanos/Chart.yaml            | 2 +-
 common/thanos/templates/thanos.yaml | 8 +++++++-
 common/thanos/values.yaml           | 3 +++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/common/thanos/Chart.yaml b/common/thanos/Chart.yaml
index 73680169372..c20bb597126 100644
--- a/common/thanos/Chart.yaml
+++ b/common/thanos/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: thanos
 description: Deploy Thanos via operator
 type: application
-version: 1.1.0
+version: 1.1.1
 appVersion: v0.36.1
 maintainers:
   - name: Tommy Sauer (viennaa)
diff --git a/common/thanos/templates/thanos.yaml b/common/thanos/templates/thanos.yaml
index cc854ad2428..db9c8dbabc6 100644
--- a/common/thanos/templates/thanos.yaml
+++ b/common/thanos/templates/thanos.yaml
@@ -25,10 +25,16 @@ spec:
       metadata:
         labels:
           thanos: {{ include "thanos.name" (list $name $root) }}
-        {{- if and $.Values.global.linkerd_enabled $.Values.global.linkerd_requested }}
+        {{- if or (and $.Values.global.linkerd_enabled $.Values.global.linkerd_requested)
+                  (and $.Values.traefik.enabled $.Values.traefik.annotations) }}
         annotations:
+        {{- end }}
+        {{- if and $.Values.global.linkerd_enabled $.Values.global.linkerd_requested }}
           linkerd.io/inject: enabled
         {{- end }}
+        {{- if and $.Values.traefik.enabled $.Values.traefik.annotations }}
+          {{ toYaml $.Values.traefik.annotations | indent 10 }}
+        {{- end }}
     deploymentOverrides:
       spec:
         replicas: {{ $.Values.query.replicas }}
diff --git a/common/thanos/values.yaml b/common/thanos/values.yaml
index 386f7d21654..2f197fc395d 100644
--- a/common/thanos/values.yaml
+++ b/common/thanos/values.yaml
@@ -372,3 +372,6 @@ traefik:
     enabled: false
     # service the route should point to. Needs to match Thanos Query.
     serviceName: thanos-kubernetes-query
+
+  annotations:
+    traefik.ingress.kubernetes.io/service.serversscheme: h2c