Skip to content

Commit

Permalink
Helm: remove ruler.enabled condition in networkpolicies which lead to…
Browse files Browse the repository at this point in the history
… linting errors (#11305)

**What this PR does / why we need it**:

This PR removes the `if .Values.ruler.enabled` condition from the
`loki-egress-alertmanager` networkpolicy as this was causing linting
issues (i.e nil pointer) whenever enabling the networkpolicies since the
`ruler` field is not present in the values.

From what I know, the ruler is now part of the backend, thus I also
replaced the `rulerSelectorLabels` by the `backendSelectorLabels`.

**Special notes for your reviewer**:

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [ ] Tests updated
- [x] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [x] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)

---------

Signed-off-by: QuantumEnigmaa <thibaud@giantswarm.io>
Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
  • Loading branch information
QuantumEnigmaa and MichelHollands authored Dec 8, 2023
1 parent 62a2217 commit ee008cf
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 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.)

## 5.40.1

- [BUGFIX] Remove ruler enabled condition in networkpolicies.

## 5.40.0

- [CHANGE] Add extraContainers parameter for the write pod
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 in simple, scalable mode
type: application
appVersion: 2.9.2
version: 5.40.0
version: 5.40.1
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: 5.40.0](https://img.shields.io/badge/Version-5.40.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.2](https://img.shields.io/badge/AppVersion-2.9.2-informational?style=flat-square)
![Version: 5.40.1](https://img.shields.io/badge/Version-5.40.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.2](https://img.shields.io/badge/AppVersion-2.9.2-informational?style=flat-square)

Helm chart for Grafana Loki in simple, scalable mode

Expand Down
4 changes: 1 addition & 3 deletions production/helm/loki/templates/networkpolicy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ spec:
{{- end }}
{{- end }}

{{- if .Values.ruler.enabled }}
---
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
Expand All @@ -126,7 +125,7 @@ spec:
- Egress
podSelector:
matchLabels:
{{- include "loki.rulerSelectorLabels" . | nindent 6 }}
{{- include "loki.backendSelectorLabels" . | nindent 6 }}
egress:
- ports:
- port: {{ .Values.networkPolicy.alertmanager.port }}
Expand All @@ -140,7 +139,6 @@ spec:
{{- toYaml .Values.networkPolicy.alertmanager.podSelector | nindent 12 }}
{{- end }}
{{- end }}
{{- end }}

{{- if .Values.networkPolicy.externalStorage.ports }}
---
Expand Down

0 comments on commit ee008cf

Please sign in to comment.