Helm: Fix the reference error of loki/loki helm chart (grafana#1056)

* fix a reference error of loki/loki helm chart add new valuable "client.name" instead of "promtail.name" * bump loki-stack chart * Add missing chart version Co-authored-by: cyriltovena <cyril.tovena@gmail.com>
mraboosk · Oct 24, 2019 · 23a86d0 · 23a86d0
1 parent e586ced
commit 23a86d0
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 3 deletions.
diff --git a/production/helm/fluent-bit/Chart.yaml b/production/helm/fluent-bit/Chart.yaml
@@ -1,3 +1,4 @@
+apiVersion: "v1"
 name: fluent-bit
 version: 0.0.2
 appVersion: v0.0.1

diff --git a/production/helm/loki-stack/Chart.yaml b/production/helm/loki-stack/Chart.yaml
@@ -1,5 +1,6 @@
+apiVersion: "v1"
 name: loki-stack
-version: 0.17.3
+version: 0.17.4
 appVersion: v0.3.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,5 +1,6 @@
+apiVersion: "v1"
 name: loki
-version: 0.16.0
+version: 0.16.1
 appVersion: v0.3.0
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."

diff --git a/production/helm/loki/templates/_helpers.tpl b/production/helm/loki/templates/_helpers.tpl
@@ -41,3 +41,21 @@ Create the name of the service account
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Create the app name of loki clients. Defaults to the same logic as "loki.fullname", and default client expects "promtail".
+*/}}
+{{- define "client.name" -}}
+{{- if .Values.client.name -}}
+{{- .Values.client.name -}}
+{{- else if .Values.client.fullnameOverride -}}
+{{- .Values.client.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default "promtail" .Values.client.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/production/helm/loki/templates/networkpolicy.yaml b/production/helm/loki/templates/networkpolicy.yaml
@@ -19,7 +19,7 @@ spec:
     - from:
       - podSelector:
           matchLabels:
-            app: {{ template "promtail.name" . }}
+            app: {{ template "client.name" . }}
             release: {{ .Release.Name }}
     - ports:
       - port: {{ .Values.service.port }}

diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
@@ -84,6 +84,10 @@ livenessProbe:
 networkPolicy:
   enabled: false
 
+## The app name of loki clients
+client: {}
+  # name:
+
 ## ref: https://kubernetes.io/docs/user-guide/node-selection/
 nodeSelector: {}
 

diff --git a/production/helm/promtail/Chart.yaml b/production/helm/promtail/Chart.yaml
@@ -1,3 +1,4 @@
+apiVersion: "v1"
 name: promtail
 version: 0.12.3
 appVersion: v0.3.0