[promtail helm chart] - Expand promtail syslog svc to support values (g…

…rafana#1731) * Expand promtail syslog svc to support values The promtail helm chart syslog service configuration in the values.yaml supports elements not accounted-for in the actual syslog service template. This change modifys the promtail syslog service to account for those missing elements. Signed-off-by: Jeff Billimek <jeff@billimek.com> * Simplifying service typer selection process Signed-off-by: Jeff Billimek <jeffrey_k_billimek@homedepot.com>
mraboosk · Feb 26, 2020 · 94685e2 · 94685e2
1 parent 1183304
commit 94685e2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 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: 0.32.0
+version: 0.32.1
 appVersion: v1.3.0
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."

diff --git a/production/helm/promtail/Chart.yaml b/production/helm/promtail/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: "v1"
 name: promtail
-version: 0.19.1
+version: 0.19.2
 appVersion: v1.3.0
 kubeVersion: "^1.10.0-0"
 description: "Responsible for gathering logs and sending them to Loki"

diff --git a/production/helm/promtail/templates/service-syslog.yaml b/production/helm/promtail/templates/service-syslog.yaml
@@ -16,15 +16,19 @@ metadata:
     {{- toYaml .Values.syslogService.annotations | nindent 4 }}
 spec:
   type: {{ .Values.syslogService.type }}
-{{- if (and (eq .Values.syslogService.type "ClusterIP") (not (empty .Values.syslogService.clusterIP))) }}
+  {{- if .Values.syslogService.clusterIP }}
   clusterIP: {{ .Values.syslogService.clusterIP }}
-{{- end }}
-{{- if .Values.syslogService.loadBalancerSourceRanges }}
+  {{end}}
+  {{- if .Values.syslogService.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.syslogService.loadBalancerIP }}
+  {{- end }}
+  {{- if .Values.syslogService.loadBalancerSourceRanges }}
   loadBalancerSourceRanges:
-  {{- range $cidr := .Values.syslogService.loadBalancerSourceRanges }}
-    - {{ $cidr }}
+{{ toYaml .Values.syslogService.loadBalancerSourceRanges | indent 4 }}
+  {{- end -}}
+  {{- if .Values.syslogService.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ .Values.syslogService.externalTrafficPolicy }}
   {{- end }}
-{{- end }}
   ports:
     - port: {{ .Values.syslogService.port }}
       protocol: TCP