From e69ac901cee94bc1bd1a940e151673a7d5bb441a Mon Sep 17 00:00:00 2001
From: Loic PORTE <loicp@heetch.com>
Date: Wed, 21 Oct 2020 13:50:19 +0200
Subject: [PATCH] Allow to define the ingress service port

---
 production/helm/loki-stack/Chart.yaml                | 2 +-
 production/helm/loki/Chart.yaml                      | 2 +-
 production/helm/loki/templates/service-headless.yaml | 2 +-
 production/helm/loki/templates/service.yaml          | 2 +-
 production/helm/loki/values.yaml                     | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/production/helm/loki-stack/Chart.yaml b/production/helm/loki-stack/Chart.yaml
index 188e23e234c06..579a34c7722c1 100644
--- a/production/helm/loki-stack/Chart.yaml
+++ b/production/helm/loki-stack/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: "v1"
 name: loki-stack
-version: 0.41.2
+version: 0.41.3
 appVersion: v1.6.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
index 024f4fe375e98..185caeb479ab1 100644
--- a/production/helm/loki/Chart.yaml
+++ b/production/helm/loki/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: "v1"
 name: loki
-version: 0.31.1
+version: 0.31.2
 appVersion: v1.6.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
index 644f527625490..1efdde60fd0cc 100644
--- 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
index 2eb419c02f0ca..d6ee92d974b86 100644
--- 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
index 3b6806eaedaaf..14282ca7592d4 100644
--- a/production/helm/loki/values.yaml
+++ b/production/helm/loki/values.yaml
@@ -173,6 +173,7 @@ service:
   port: 3100
   annotations: {}
   labels: {}
+  targetPort: http-metrics
 
 serviceAccount:
   create: true