Skip to content

Commit 1cdd3b9

Browse files
fix(helm): fixed memcached and provisioner templates to follow the same patter of specifying imagePullSecrets in the same way as the majority of the components have. Otherwise, it's make it impossible to specify image pull secrets in all the components at the same time because they are incompatible.
Previously only components expected to have image pull secrets specified in the way: ```yaml imagePullSecrets: - name: pull-secret ``` but provisioner and memcached expected to have the format: ```yaml imagePullSecrets: - pull-secret ``` Signed-off-by: Vladyslav Diachenko <[email protected]>
1 parent 7683a79 commit 1cdd3b9

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

production/helm/loki/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ Entries should include a reference to the pull request that introduced the chang
1313

1414
[//]: # (<AUTOMATED_UPDATES_LOCATOR> : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.)
1515

16+
## 6.9.0
17+
18+
- [BUGFIX] Fixed how we set imagePullSecrets for the memcached and provisioner.
19+
1620
## 6.8.0
1721

1822
- [BUGFIX] Fixed how we set imagePullSecrets for the admin-api and enterprise-gateway

production/helm/loki/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: loki
33
description: Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
44
type: application
55
appVersion: 3.1.0
6-
version: 6.8.0
6+
version: 6.9.0
77
home: https://grafana.github.io/helm-charts
88
sources:
99
- https://github.com/grafana/loki

production/helm/loki/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# loki
22

3-
![Version: 6.8.0](https://img.shields.io/badge/Version-6.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.0](https://img.shields.io/badge/AppVersion-3.1.0-informational?style=flat-square)
3+
![Version: 6.9.0](https://img.shields.io/badge/Version-6.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.0](https://img.shields.io/badge/AppVersion-3.1.0-informational?style=flat-square)
44

55
Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
66

production/helm/loki/templates/memcached/_memcached-statefulset.tpl

+2-4
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,9 @@ spec:
7070
tolerations:
7171
{{- toYaml .tolerations | nindent 8 }}
7272
terminationGracePeriodSeconds: {{ .terminationGracePeriodSeconds }}
73-
{{- if $.ctx.Values.imagePullSecrets }}
73+
{{- with $.ctx.Values.imagePullSecrets }}
7474
imagePullSecrets:
75-
{{- range $.ctx.Values.imagePullSecrets }}
76-
- name: {{ . }}
77-
{{- end }}
75+
{{- toYaml . | nindent 8 }}
7876
{{- end }}
7977
{{- if .extraVolumes }}
8078
volumes:

production/helm/loki/templates/provisioner/job-provisioner.yaml

+2-4
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,9 @@ spec:
3737
{{- end }}
3838
securityContext:
3939
{{- toYaml .Values.enterprise.provisioner.securityContext | nindent 8 }}
40-
{{- if .Values.imagePullSecrets }}
40+
{{- with .Values.imagePullSecrets }}
4141
imagePullSecrets:
42-
{{- range .Values.imagePullSecrets }}
43-
- name: {{ . }}
44-
{{- end }}
42+
{{- toYaml . | nindent 8 }}
4543
{{- end }}
4644
initContainers:
4745
- name: provisioner

0 commit comments

Comments
 (0)