[kube-prometheus-stack] fix reloader-web's app protocol (prometheus-c…

…ommunity#3762) * [kube-prometheus-stack] fix reloader-web's app protocol Signed-off-by: Andre Baptista Aguas <[email protected]> * guard appProtocol with target kubernetes version check Signed-off-by: Andre Baptista Aguas <[email protected]> * Move kubeTargetVersion to top of file Signed-off-by: André Águas <[email protected]> * Move kubeTargetVersion to top of file Signed-off-by: André Águas <[email protected]> --------- Signed-off-by: Andre Baptista Aguas <[email protected]> Signed-off-by: André Águas <[email protected]>
giffgaff · Mar 20, 2024 · 5b41cea · 5b41cea
1 parent 6a1cb33
commit 5b41cea
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
@@ -21,7 +21,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 51.0.1
+version: 51.0.2
 appVersion: v0.68.0
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

diff --git a/charts/kube-prometheus-stack/templates/alertmanager/service.yaml b/charts/kube-prometheus-stack/templates/alertmanager/service.yaml
@@ -1,3 +1,4 @@
+{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }}
 {{- if .Values.alertmanager.enabled }}
 apiVersion: v1
 kind: Service
@@ -44,6 +45,9 @@ spec:
     targetPort: {{ .Values.alertmanager.service.targetPort }}
     protocol: TCP
   - name: reloader-web
+    {{- if semverCompare ">=1.20.0-0" $kubeTargetVersion }}
+    appProtocol: http
+    {{- end }}
     port: 8080
     targetPort: reloader-web
 {{- if .Values.alertmanager.service.additionalPorts }}

diff --git a/charts/kube-prometheus-stack/templates/prometheus/service.yaml b/charts/kube-prometheus-stack/templates/prometheus/service.yaml
@@ -1,3 +1,4 @@
+{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }}
 {{- if .Values.prometheus.enabled }}
 apiVersion: v1
 kind: Service
@@ -43,6 +44,9 @@ spec:
     port: {{ .Values.prometheus.service.port }}
     targetPort: {{ .Values.prometheus.service.targetPort }}
   - name: reloader-web
+    {{- if semverCompare "> 1.20.0-0" $kubeTargetVersion }}
+    appProtocol: http
+    {{- end }}
     port: 8080
     targetPort: reloader-web
   {{- if .Values.prometheus.thanosIngress.enabled }}