[bitnami/mysql]: Remove duplicated ports in the network policies (#28136)

* [bitnami/mysql]: Remove duplicated ports in the network policies

Signed-off-by: Marcel Araujo <marcel.araujo@riskified.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

---------

Signed-off-by: Marcel Araujo <marcel.araujo@riskified.com>
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
Co-authored-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Marcel Araujo
2024-07-22 12:14:48 +01:00
committed by GitHub
parent 69ced0b8f4
commit 99db50f529
3 changed files with 50 additions and 41 deletions

View File

@@ -1,8 +1,12 @@
# Changelog
## 11.1.10 (2024-07-16)
## 11.1.11 (2024-07-19)
* [bitnami/mysql] Global StorageClass as default value ([#28066](https://github.com/bitnami/charts/pull/28066))
* [bitnami/mysql]: Remove duplicated ports in the network policies ([#28136](https://github.com/bitnami/charts/pull/28136))
## <small>11.1.10 (2024-07-18)</small>
* [bitnami/mysql] Global StorageClass as default value (#28066) ([e92ae97](https://github.com/bitnami/charts/commit/e92ae976e916f66ce59736df3468f2e97d56b036)), closes [#28066](https://github.com/bitnami/charts/issues/28066)
## <small>11.1.9 (2024-07-09)</small>

View File

@@ -34,4 +34,4 @@ maintainers:
name: mysql
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/mysql
version: 11.1.10
version: 11.1.11

View File

@@ -31,15 +31,17 @@ spec:
- port: 53
protocol: TCP
# Allow connection to other cluster pods
{{- $containerEgressPorts := list .Values.primary.containerPorts.mysql .Values.secondary.containerPorts.mysql }}
{{- if .Values.primary.enableMySQLX }}
{{- $containerEgressPorts = append $containerEgressPorts .Values.primary.containerPorts.mysqlx }}
{{- end }}
{{- if .Values.secondary.enableMySQLX }}
{{- $containerEgressPorts = append $containerEgressPorts .Values.secondary.containerPorts.mysqlx }}
{{- end }}
- ports:
- port: {{ .Values.primary.containerPorts.mysql }}
- port: {{ .Values.secondary.containerPorts.mysql }}
{{- if .Values.primary.enableMySQLX }}
- port: {{ .Values.primary.containerPorts.mysqlx }}
{{- end }}
{{- if .Values.secondary.enableMySQLX }}
- port: {{ .Values.secondary.containerPorts.mysql }}
{{- end }}
{{- range $value := (compact $containerEgressPorts | uniq ) }}
- port: {{ $value }}
{{- end }}
to:
- podSelector:
matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 14 }}
@@ -48,38 +50,41 @@ spec:
{{- end }}
{{- end }}
ingress:
# Allow connection from other cluster pods
{{- $containerIngressPorts := list .Values.primary.containerPorts.mysql .Values.secondary.containerPorts.mysql }}
{{- if .Values.primary.enableMySQLX }}
{{- $containerIngressPorts = append $containerIngressPorts .Values.primary.containerPorts.mysqlx }}
{{- end }}
{{- if .Values.secondary.enableMySQLX }}
{{- $containerIngressPorts = append $containerIngressPorts .Values.secondary.containerPorts.mysqlx }}
{{- end }}
{{- if .Values.metrics.enabled }}
{{- $containerIngressPorts = append $containerIngressPorts .Values.metrics.containerPorts.http }}
{{- end }}
{{- if .Values.primary.extraPorts }}
{{- range $value := .Values.primary.extraPorts }}
{{- $containerIngressPorts = append $containerIngressPorts $value.containerPort }}
{{- end }}
{{- end }}
{{- if .Values.primary.service.extraPorts }}
{{- range $value := .Values.primary.service.extraPorts }}
{{- $containerIngressPorts = append $containerIngressPorts $value.port }}
{{- end }}
{{- end }}
{{- if .Values.secondary.extraPorts }}
{{- range $value := .Values.secondary.extraPorts }}
{{- $containerIngressPorts = append $containerIngressPorts $value.containerPort }}
{{- end }}
{{- end }}
{{- if .Values.secondary.service.extraPorts }}
{{- range $value := .Values.secondary.service.extraPorts }}
{{- $containerIngressPorts = append $containerIngressPorts $value.port }}
{{- end }}
{{- end }}
- ports:
- port: {{ .Values.primary.containerPorts.mysql }}
- port: {{ .Values.secondary.containerPorts.mysql }}
{{- if .Values.primary.enableMySQLX }}
- port: {{ .Values.primary.containerPorts.mysqlx }}
{{- end }}
{{- if .Values.secondary.enableMySQLX }}
- port: {{ .Values.secondary.containerPorts.mysql }}
{{- end }}
{{- if .Values.metrics.enabled }}
- port: {{ .Values.metrics.containerPorts.http }}
{{- end }}
{{- if .Values.primary.extraPorts }}
{{- range $value := .Values.primary.extraPorts }}
- port: {{ $value.containerPort }}
{{- range $value := (compact $containerIngressPorts | uniq ) }}
- port: {{ $value }}
{{- end }}
{{- end }}
{{- if .Values.primary.service.extraPorts }}
{{- range $value := .Values.primary.service.extraPorts }}
- port: {{ $value.port }}
{{- end }}
{{- end }}
{{- if .Values.secondary.extraPorts }}
{{- range $value := .Values.secondary.extraPorts }}
- port: {{ $value.containerPort }}
{{- end }}
{{- end }}
{{- if .Values.secondary.service.extraPorts }}
{{- range $value := .Values.secondary.service.extraPorts }}
- port: {{ $value.port }}
{{- end }}
{{- end }}
{{- if not .Values.networkPolicy.allowExternal }}
from:
- podSelector: