Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

newer traefik requires h2c #7556

Merged
merged 1 commit into from
Dec 17, 2024
Merged

newer traefik requires h2c #7556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/thanos/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 7 additions & 1 deletion common/thanos/templates/thanos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
3 changes: 3 additions & 0 deletions common/thanos/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
authTLSVerifyDepth: 3

# Enables verification of client certificates.
authTLSVerifyClient: on

Check warning on line 267 in common/thanos/values.yaml

View workflow job for this annotation

GitHub Actions / helm-lint 

267:28 [truthy] truthy value should be one of [false, true]

# Additional annotations for the ingress.
annotations:
Expand Down Expand Up @@ -304,7 +304,7 @@
authTLSVerifyDepth: 3

# Enables verification of client certificates.
authTLSVerifyClient: on

Check warning on line 307 in common/thanos/values.yaml

View workflow job for this annotation

GitHub Actions / helm-lint 

307:28 [truthy] truthy value should be one of [false, true]

# Additional annotations for the ingress.
annotations:
Expand Down Expand Up @@ -334,7 +334,7 @@
authTLSVerifyDepth: 3

# Enables verification of client certificates.
authTLSVerifyClient: on

Check warning on line 337 in common/thanos/values.yaml

View workflow job for this annotation

GitHub Actions / helm-lint 

337:28 [truthy] truthy value should be one of [false, true]

grpc:
backendProtocol: GRPC
Expand Down Expand Up @@ -372,3 +372,6 @@
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
Loading