From f88d9fae4eaeba918df2aec7a76efb268e3d0318 Mon Sep 17 00:00:00 2001 From: hosseinghojavand <44209757+hosseinghojavand@users.noreply.github.com> Date: Tue, 7 Sep 2021 14:54:55 +0430 Subject: [PATCH] [bitnami/mariadb] Added topology spread constraints to Mariadb chart. (#7414) * Added topology spread constraints to Mariadb chart. * README.md fixed in Mariadb chart. * chart version fixed. * array change to object for topologySpreadConstraints. * README.md updated. * [bitnami/mariadb] Update components versions Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers --- bitnami/mariadb/Chart.yaml | 2 +- bitnami/mariadb/README.md | 2 ++ .../templates/primary/statefulset.yaml | 3 +++ .../templates/secondary/statefulset.yaml | 3 +++ bitnami/mariadb/values.yaml | 24 ++++++++++++++++--- 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/bitnami/mariadb/Chart.yaml b/bitnami/mariadb/Chart.yaml index 4d8fe99d8..e993c1b10 100644 --- a/bitnami/mariadb/Chart.yaml +++ b/bitnami/mariadb/Chart.yaml @@ -26,4 +26,4 @@ sources: - https://github.com/bitnami/bitnami-docker-mariadb - https://github.com/prometheus/mysqld_exporter - https://mariadb.org -version: 9.4.4 +version: 9.5.0 diff --git a/bitnami/mariadb/README.md b/bitnami/mariadb/README.md index 2256b5d0a..d86ee06a3 100644 --- a/bitnami/mariadb/README.md +++ b/bitnami/mariadb/README.md @@ -117,6 +117,7 @@ The command removes all the Kubernetes components associated with the chart and | `primary.affinity` | Affinity for MariaDB primary pods assignment | `{}` | | `primary.nodeSelector` | Node labels for MariaDB primary pods assignment | `{}` | | `primary.tolerations` | Tolerations for MariaDB primary pods assignment | `[]` | +| `primary.topologySpreadConstraints` | Topology Spread Constraints for MariaDB primary pods assignment | `{}` | | `primary.priorityClassName` | Priority class for MariaDB primary pods assignment | `""` | | `primary.podSecurityContext.enabled` | Enable security context for MariaDB primary pods | `true` | | `primary.podSecurityContext.fsGroup` | Group ID for the mounted volumes' filesystem | `1001` | @@ -189,6 +190,7 @@ The command removes all the Kubernetes components associated with the chart and | `secondary.affinity` | Affinity for MariaDB secondary pods assignment | `{}` | | `secondary.nodeSelector` | Node labels for MariaDB secondary pods assignment | `{}` | | `secondary.tolerations` | Tolerations for MariaDB secondary pods assignment | `[]` | +| `secondary.topologySpreadConstraints` | Topology Spread Constraints for MariaDB secondary pods assignment | `{}` | | `secondary.priorityClassName` | Priority class for MariaDB secondary pods assignment | `""` | | `secondary.podSecurityContext.enabled` | Enable security context for MariaDB secondary pods | `true` | | `secondary.podSecurityContext.fsGroup` | Group ID for the mounted volumes' filesystem | `1001` | diff --git a/bitnami/mariadb/templates/primary/statefulset.yaml b/bitnami/mariadb/templates/primary/statefulset.yaml index ef14fbdd7..f09991e8f 100644 --- a/bitnami/mariadb/templates/primary/statefulset.yaml +++ b/bitnami/mariadb/templates/primary/statefulset.yaml @@ -63,6 +63,9 @@ spec: {{- if .Values.primary.tolerations }} tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.primary.tolerations "context" $) | nindent 8 }} {{- end }} + {{- if .Values.primary.topologySpreadConstraints }} + topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.primary.topologySpreadConstraints "context" $) | nindent 8 }} + {{- end }} {{- if .Values.primary.priorityClassName }} priorityClassName: {{ .Values.primary.priorityClassName | quote }} {{- else if .Values.priorityClassName }} diff --git a/bitnami/mariadb/templates/secondary/statefulset.yaml b/bitnami/mariadb/templates/secondary/statefulset.yaml index 63f039d98..da9c1fffe 100644 --- a/bitnami/mariadb/templates/secondary/statefulset.yaml +++ b/bitnami/mariadb/templates/secondary/statefulset.yaml @@ -64,6 +64,9 @@ spec: {{- if .Values.secondary.tolerations }} tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.secondary.tolerations "context" $) | nindent 8 }} {{- end }} + {{- if .Values.secondary.topologySpreadConstraints }} + topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.secondary.topologySpreadConstraints "context" $) | nindent 8 }} + {{- end }} {{- if .Values.secondary.priorityClassName }} priorityClassName: {{ .Values.secondary.priorityClassName | quote }} {{- else if .Values.priorityClassName }} diff --git a/bitnami/mariadb/values.yaml b/bitnami/mariadb/values.yaml index bed24baad..425a45a44 100644 --- a/bitnami/mariadb/values.yaml +++ b/bitnami/mariadb/values.yaml @@ -70,7 +70,7 @@ diagnosticMode: image: registry: docker.io repository: bitnami/mariadb - tag: 10.5.12-debian-10-r19 + tag: 10.5.12-debian-10-r32 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -246,6 +246,15 @@ primary: ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ ## tolerations: [] + ## @param primary.topologySpreadConstraints Topology Spread Constraints for for MariaDB primary pods assignment + ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ + ## E.g. + ## topologySpreadConstraints: + ## - maxSkew: 1 + ## topologyKey: topology.kubernetes.io/zone + ## whenUnsatisfiable: DoNotSchedule + ## + topologySpreadConstraints: {} ## @param primary.priorityClassName Priority class for MariaDB primary pods assignment ## Ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/ ## @@ -552,6 +561,15 @@ secondary: ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ ## tolerations: [] + ## @param secondary.topologySpreadConstraints Topology Spread Constraints for for MariaDB secondary pods assignment + ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ + ## E.g. + ## topologySpreadConstraints: + ## - maxSkew: 1 + ## topologyKey: topology.kubernetes.io/zone + ## whenUnsatisfiable: DoNotSchedule + ## + topologySpreadConstraints: {} ## @param secondary.priorityClassName Priority class for MariaDB secondary pods assignment ## Ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/ ## @@ -797,7 +815,7 @@ volumePermissions: image: registry: docker.io repository: bitnami/bitnami-shell - tag: 10-debian-10-r172 + tag: 10-debian-10-r185 pullPolicy: Always ## Optionally specify an array of imagePullSecrets (secrets must be manually created in the namespace) ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ @@ -830,7 +848,7 @@ metrics: image: registry: docker.io repository: bitnami/mysqld-exporter - tag: 0.13.0-debian-10-r75 + tag: 0.13.0-debian-10-r88 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets (secrets must be manually created in the namespace) ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/