Allow to define the ingress service port (grafana#2789)

Co-authored-by: Cyril Tovena <[email protected]>
mraboosk · Nov 5, 2020 · 8311be2 · 8311be2
1 parent 6e7f36e
commit 8311be2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/production/helm/loki-stack/Chart.yaml b/production/helm/loki-stack/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: "v1"
 name: loki-stack
-version: 2.0.1
+version: 2.0.2
 appVersion: v2.0.0
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."

diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: "v1"
 name: loki
-version: 2.0.1
+version: 2.0.2
 appVersion: v2.0.0
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."

diff --git a/production/helm/loki/templates/service-headless.yaml b/production/helm/loki/templates/service-headless.yaml
@@ -15,7 +15,7 @@ spec:
     - port: {{ .Values.service.port }}
       protocol: TCP
       name: http-metrics
-      targetPort: http-metrics
+      targetPort: {{ .Values.service.targetPort }}
 {{- if .Values.extraPorts }}
 {{ toYaml .Values.extraPorts | indent 4}}
 {{- end }}

diff --git a/production/helm/loki/templates/service.yaml b/production/helm/loki/templates/service.yaml
@@ -31,7 +31,7 @@ spec:
     - port: {{ .Values.service.port }}
       protocol: TCP
       name: http-metrics
-      targetPort: http-metrics
+      targetPort: {{ .Values.service.targetPort }}
 {{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}
       nodePort: {{ .Values.service.nodePort }}
 {{- end }}

diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
@@ -179,6 +179,7 @@ service:
   port: 3100
   annotations: {}
   labels: {}
+  targetPort: http-metrics
 
 serviceAccount:
   create: true