diff --git a/bitnami/mariadb/Chart.yaml b/bitnami/mariadb/Chart.yaml index 62b43e61ff..4e32ade62e 100644 --- a/bitnami/mariadb/Chart.yaml +++ b/bitnami/mariadb/Chart.yaml @@ -26,4 +26,4 @@ sources: - https://github.com/bitnami/containers/tree/main/bitnami/mariadb - https://github.com/prometheus/mysqld_exporter - https://mariadb.org -version: 11.2.2 +version: 11.3.0 diff --git a/bitnami/mariadb/README.md b/bitnami/mariadb/README.md index 3b6923c266..b8d9c88814 100644 --- a/bitnami/mariadb/README.md +++ b/bitnami/mariadb/README.md @@ -178,7 +178,8 @@ The command removes all the Kubernetes components associated with the chart and | `primary.initContainers` | Add additional init containers for the MariaDB Primary pod(s) | `[]` | | `primary.sidecars` | Add additional sidecar containers for the MariaDB Primary pod(s) | `[]` | | `primary.service.type` | MariaDB Primary Kubernetes service type | `ClusterIP` | -| `primary.service.ports.mysql` | MariaDB Primary Kubernetes service port | `3306` | +| `primary.service.ports.mysql` | MariaDB Primary Kubernetes service port for MariaDB | `3306` | +| `primary.service.ports.metrics` | MariaDB Primary Kubernetes service port for metrics | `9104` | | `primary.service.nodePorts.mysql` | MariaDB Primary Kubernetes service node port | `""` | | `primary.service.clusterIP` | MariaDB Primary Kubernetes service clusterIP IP | `""` | | `primary.service.loadBalancerIP` | MariaDB Primary loadBalancerIP if service type is `LoadBalancer` | `""` | @@ -267,7 +268,8 @@ The command removes all the Kubernetes components associated with the chart and | `secondary.initContainers` | Add additional init containers for the MariaDB secondary pod(s) | `[]` | | `secondary.sidecars` | Add additional sidecar containers for the MariaDB secondary pod(s) | `[]` | | `secondary.service.type` | MariaDB secondary Kubernetes service type | `ClusterIP` | -| `secondary.service.ports.mysql` | MariaDB secondary Kubernetes service port | `3306` | +| `secondary.service.ports.mysql` | MariaDB secondary Kubernetes service port for MariaDB | `3306` | +| `secondary.service.ports.metrics` | MariaDB secondary Kubernetes service port for metrics | `9104` | | `secondary.service.nodePorts.mysql` | MariaDB secondary Kubernetes service node port | `""` | | `secondary.service.clusterIP` | MariaDB secondary Kubernetes service clusterIP IP | `""` | | `secondary.service.loadBalancerIP` | MariaDB secondary loadBalancerIP if service type is `LoadBalancer` | `""` | diff --git a/bitnami/mariadb/templates/primary/svc.yaml b/bitnami/mariadb/templates/primary/svc.yaml index 3d59535dbc..85d31562ea 100644 --- a/bitnami/mariadb/templates/primary/svc.yaml +++ b/bitnami/mariadb/templates/primary/svc.yaml @@ -48,9 +48,9 @@ spec: {{- else if eq .Values.primary.service.type "ClusterIP" }} nodePort: null {{- end }} - {{- if .Values.metrics.enabled }} + {{- if and .Values.metrics.enabled (gt (.Values.primary.service.ports.metrics | int) 0) }} - name: metrics - port: 9104 + port: {{ .Values.primary.service.ports.metrics }} protocol: TCP targetPort: metrics {{- end }} diff --git a/bitnami/mariadb/templates/secondary/svc.yaml b/bitnami/mariadb/templates/secondary/svc.yaml index 66552847f7..3d72171b3d 100644 --- a/bitnami/mariadb/templates/secondary/svc.yaml +++ b/bitnami/mariadb/templates/secondary/svc.yaml @@ -49,9 +49,9 @@ spec: {{- else if eq .Values.secondary.service.type "ClusterIP" }} nodePort: null {{- end }} - {{- if .Values.metrics.enabled }} + {{- if and .Values.metrics.enabled (gt (.Values.secondary.service.ports.metrics | int) 0) }} - name: metrics - port: 9104 + port: {{ .Values.secondary.service.ports.metrics }} protocol: TCP targetPort: metrics {{- end }} diff --git a/bitnami/mariadb/values.yaml b/bitnami/mariadb/values.yaml index 4fc1d50b76..b47ec1806e 100644 --- a/bitnami/mariadb/values.yaml +++ b/bitnami/mariadb/values.yaml @@ -474,10 +474,13 @@ primary: ## @param primary.service.type MariaDB Primary Kubernetes service type ## type: ClusterIP - ## @param primary.service.ports.mysql MariaDB Primary Kubernetes service port - ## ports: + ## @param primary.service.ports.mysql MariaDB Primary Kubernetes service port for MariaDB + ## mysql: 3306 + ## @param primary.service.ports.metrics MariaDB Primary Kubernetes service port for metrics + ## + metrics: 9104 ## @param primary.service.nodePorts.mysql MariaDB Primary Kubernetes service node port ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport ## @@ -852,10 +855,13 @@ secondary: ## @param secondary.service.type MariaDB secondary Kubernetes service type ## type: ClusterIP - ## @param secondary.service.ports.mysql MariaDB secondary Kubernetes service port - ## ports: + ## @param secondary.service.ports.mysql MariaDB secondary Kubernetes service port for MariaDB + ## mysql: 3306 + ## @param secondary.service.ports.metrics MariaDB secondary Kubernetes service port for metrics + ## + metrics: 9104 ## @param secondary.service.nodePorts.mysql MariaDB secondary Kubernetes service node port ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport ##