Skip to content

Commit

Permalink
fix(helm): fixed memcached and provisioner templates to follow the sa…
Browse files Browse the repository at this point in the history
…me 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 <vlad.diachenko@grafana.com>
  • Loading branch information
vlad-diachenko committed Aug 7, 2024
1 parent 7683a79 commit 1cdd3b9
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 4 additions & 0 deletions production/helm/loki/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ Entries should include a reference to the pull request that introduced the chang

[//]: # (<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.)

## 6.9.0

- [BUGFIX] Fixed how we set imagePullSecrets for the memcached and provisioner.

## 6.8.0

- [BUGFIX] Fixed how we set imagePullSecrets for the admin-api and enterprise-gateway
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: loki
description: Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
type: application
appVersion: 3.1.0
version: 6.8.0
version: 6.9.0
home: https://grafana.github.io/helm-charts
sources:
- https://github.com/grafana/loki
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# loki

![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)
![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)

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,9 @@ spec:
tolerations:
{{- toYaml .tolerations | nindent 8 }}
terminationGracePeriodSeconds: {{ .terminationGracePeriodSeconds }}
{{- if $.ctx.Values.imagePullSecrets }}
{{- with $.ctx.Values.imagePullSecrets }}
imagePullSecrets:
{{- range $.ctx.Values.imagePullSecrets }}
- name: {{ . }}
{{- end }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .extraVolumes }}
volumes:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,9 @@ spec:
{{- end }}
securityContext:
{{- toYaml .Values.enterprise.provisioner.securityContext | nindent 8 }}
{{- if .Values.imagePullSecrets }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- range .Values.imagePullSecrets }}
- name: {{ . }}
{{- end }}
{{- toYaml . | nindent 8 }}
{{- end }}
initContainers:
- name: provisioner
Expand Down

0 comments on commit 1cdd3b9

Please sign in to comment.