From 5184f8d8349df3433dd1f5927a99aa134c49918e Mon Sep 17 00:00:00 2001 From: lukipro Date: Tue, 4 Feb 2020 21:48:06 +0100 Subject: [PATCH 1/2] Added support for imagePullSecrets in Loki Helm chart --- production/helm/loki/Chart.yaml | 2 +- production/helm/loki/templates/statefulset.yaml | 6 ++++++ production/helm/loki/values.yaml | 7 +++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 85d50cff644a6..1d0f0ea285eff 100644 --- a/production/helm/loki/Chart.yaml +++ b/production/helm/loki/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: "v1" name: loki -version: 0.25.0 +version: 0.26.0 appVersion: v1.3.0 kubeVersion: "^1.10.0-0" description: "Loki: like Prometheus, but for logs." diff --git a/production/helm/loki/templates/statefulset.yaml b/production/helm/loki/templates/statefulset.yaml index 1ca90b7362fd5..0b22337125115 100644 --- a/production/helm/loki/templates/statefulset.yaml +++ b/production/helm/loki/templates/statefulset.yaml @@ -43,6 +43,12 @@ spec: {{- toYaml .Values.securityContext | nindent 8 }} initContainers: {{- toYaml .Values.initContainers | nindent 8 }} + {{- if .Values.image.pullSecrets }} + imagePullSecrets: + {{- range .Values.image.pullSecrets }} + - name: {{ . }} + {{- end}} + {{- end }} containers: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index 8ed562db11a7e..5079a872fe631 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -3,6 +3,13 @@ image: tag: v1.3.0 pullPolicy: IfNotPresent + ## Optionally specify an array of imagePullSecrets. + ## Secrets must be manually created in the namespace. + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ + ## + # pullSecrets: + # - myRegistrKeySecretName + ingress: enabled: false annotations: {} From 6d9b68203ab853a63f638e129386e63b40582467 Mon Sep 17 00:00:00 2001 From: Luki Date: Tue, 4 Feb 2020 22:22:06 +0100 Subject: [PATCH 2/2] Updating only path version for loki charts --- production/helm/loki-stack/Chart.yaml | 2 +- production/helm/loki/Chart.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/production/helm/loki-stack/Chart.yaml b/production/helm/loki-stack/Chart.yaml index 20f43f1aacdb8..2bde7dc500ff1 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.31.0 +version: 0.31.1 appVersion: v1.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 index 1d0f0ea285eff..0cca46682cae0 100644 --- a/production/helm/loki/Chart.yaml +++ b/production/helm/loki/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: "v1" name: loki -version: 0.26.0 +version: 0.25.1 appVersion: v1.3.0 kubeVersion: "^1.10.0-0" description: "Loki: like Prometheus, but for logs."