Skip to content

Commit

Permalink
Helm: fix ciliumNetworkPolicy template in the chart (#11963)
Browse files Browse the repository at this point in the history
Signed-off-by: QuantumEnigmaa <[email protected]>
  • Loading branch information
QuantumEnigmaa authored Feb 15, 2024
1 parent c328a4f commit a955ba9
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 14 deletions.
4 changes: 4 additions & 0 deletions production/helm/loki/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,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.43.1

- [BUGFIX] Fix `toPorts` fields in the `ciliumnetworkpolicy` template

## 5.43.0

- [ENHANCEMENT] Allow the definition of resources for GrafanaAgent pods
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.4
version: 5.43.0
version: 5.43.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.43.0](https://img.shields.io/badge/Version-5.43.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.4](https://img.shields.io/badge/AppVersion-2.9.4-informational?style=flat-square)
![Version: 5.43.1](https://img.shields.io/badge/Version-5.43.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.4](https://img.shields.io/badge/AppVersion-2.9.4-informational?style=flat-square)

Helm chart for Grafana Loki in simple, scalable mode

Expand Down
29 changes: 17 additions & 12 deletions production/helm/loki/templates/ciliumnetworkpolicy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ spec:
{{- include "loki.selectorLabels" . | nindent 6 }}
ingress:
- toPorts:
- port: http
protocol: TCP
- ports:
- port: http
protocol: TCP
{{- if .Values.networkPolicy.ingress.namespaceSelector }}
fromEndpoints:
- matchLabels:
Expand All @@ -85,8 +86,9 @@ spec:
{{- include "loki.selectorLabels" . | nindent 6 }}
ingress:
- toPorts:
- port: http-metrics
protocol: TCP
- ports:
- port: http-metrics
protocol: TCP
{{- if .Values.networkPolicy.metrics.cidrs }}
{{- range $cidr := .Values.networkPolicy.metrics.cidrs }}
toCIDR:
Expand Down Expand Up @@ -116,8 +118,9 @@ spec:
{{- include "loki.backendSelectorLabels" . | nindent 6 }}
egress:
- toPorts:
- port: {{ .Values.networkPolicy.alertmanager.port }}
protocol: TCP
- ports:
- port: "{{ .Values.networkPolicy.alertmanager.port }}"
protocol: TCP
{{- if .Values.networkPolicy.alertmanager.namespaceSelector }}
toEndpoints:
- matchLabels:
Expand All @@ -142,10 +145,11 @@ spec:
{{- include "loki.selectorLabels" . | nindent 6 }}
egress:
- toPorts:
{{- range $port := .Values.networkPolicy.externalStorage.ports }}
- port: {{ $port }}
protocol: TCP
{{- end }}
- ports:
{{- range $port := .Values.networkPolicy.externalStorage.ports }}
- port: "{{ $port }}"
protocol: TCP
{{- end }}à
{{- if .Values.networkPolicy.externalStorage.cidrs }}
{{- range $cidr := .Values.networkPolicy.externalStorage.cidrs }}
toCIDR:
Expand All @@ -171,8 +175,9 @@ spec:
{{- include "loki.selectorLabels" . | nindent 6 }}
egress:
- toPorts:
- port: {{ .Values.networkPolicy.discovery.port }}
protocol: TCP
- ports:
- port: "{{ .Values.networkPolicy.discovery.port }}"
protocol: TCP
{{- if .Values.networkPolicy.discovery.namespaceSelector }}
toEndpoints:
- matchLabels:
Expand Down

0 comments on commit a955ba9

Please sign in to comment.