diff --git a/bitnami/mariadb/Chart.yaml b/bitnami/mariadb/Chart.yaml index 4e242a390..b5700c9fd 100644 --- a/bitnami/mariadb/Chart.yaml +++ b/bitnami/mariadb/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: mariadb -version: 7.10.4 -appVersion: 10.3.24 +version: 8.0.0 +appVersion: 10.5.5 description: Fast, reliable, scalable, and easy to use open-source relational database system. MariaDB Server is intended for mission-critical, heavy-load production systems as well as for embedding into mass-deployed software. Highly available MariaDB cluster. keywords: - mariadb diff --git a/bitnami/mariadb/README.md b/bitnami/mariadb/README.md index 7d4a8ab15..1bc227078 100644 --- a/bitnami/mariadb/README.md +++ b/bitnami/mariadb/README.md @@ -49,158 +49,201 @@ The command removes all the Kubernetes components associated with the chart and The following table lists the configurable parameters of the MariaDB chart and their default values. -| Parameter | Description | Default | -|----------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------| -| `global.imageRegistry` | Global Docker image registry | `nil` | -| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | -| `global.storageClass` | Global storage class for dynamic provisioning | `nil` | -| `image.registry` | MariaDB image registry | `docker.io` | -| `image.repository` | MariaDB Image name | `bitnami/mariadb` | -| `image.tag` | MariaDB Image tag | `{TAG_NAME}` | -| `image.pullPolicy` | MariaDB image pull policy | `IfNotPresent` | -| `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | -| `image.debug` | Specify if debug logs should be enabled | `false` | -| `nameOverride` | String to partially override mariadb.fullname template with a string (will prepend the release name) | `nil` | -| `fullnameOverride` | String to fully override mariadb.fullname template with a string | `nil` | -| `podLabels` | Additional pod labels | `{}` | -| `volumePermissions.enabled` | Enable init container that changes volume permissions in the data directory (for cases where the default k8s `runAsUser` and `fsUser` values do not work) | `false` | -| `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | -| `volumePermissions.image.repository` | Init container volume-permissions image name | `bitnami/minideb` | -| `volumePermissions.image.tag` | Init container volume-permissions image tag | `buster` | -| `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `Always` | -| `volumePermissions.resources` | Init container resource requests/limit | `nil` | -| `service.type` | Kubernetes service type | `ClusterIP` | -| `service.clusterIp.master` | Specific cluster IP for master when service type is cluster IP. Use None for headless service | `nil` | -| `service.clusterIp.slave` | Specific cluster IP for slave when service type is cluster IP. Use None for headless service | `nil` | -| `service.port` | MySQL service port | `3306` | -| `serviceAccount.create` | Specifies whether a ServiceAccount should be created | `false` | -| `serviceAccount.name` | The name of the ServiceAccount to create | Generated using the mariadb.fullname template | -| `schedulerName` | Name of the k8s scheduler (other than default) | `nil` | -| `rbac.create` | Create and use RBAC resources | `false` | -| `securityContext.enabled` | Enable security context | `true` | -| `securityContext.fsGroup` | Group ID for the container | `1001` | -| `securityContext.runAsUser` | User ID for the container | `1001` | -| `existingSecret` | Use existing secret for password details (`rootUser.password`, `db.password`, `replication.password` will be ignored and picked up from this secret). The secret has to contain the keys `mariadb-root-password`, `mariadb-replication-password` and `mariadb-password`. | `nil` | -| `secret.annotations` | Secret annotations (evaluated as a template) | `{}` | -| `secret.requirePasswords` | Require all passwords at the secret resource | `true` | -| `rootUser.password` | Password for the `root` user. Ignored if existing secret is provided. | _random 10 character alphanumeric string_ | -| `rootUser.forcePassword` | Force users to specify a password | `false` | -| `rootUser.injectSecretsAsVolume` | Mount admin user password as a file instead of using an environment variable | `false` | -| `rootUser.injectSecretsFile` | Path to file used for secrets as volume | `/opt/bitnami/mariadb/secrets/mariadb-root-password` | -| `db.name` | Name for new database to create | `my_database` | -| `db.user` | Username of new user to create | `""` | -| `db.password` | Password for the new user. Ignored if existing secret is provided. | _random 10 character alphanumeric string if `db.user` is defined_ | -| `db.forcePassword` | Force users to specify a password | `false` | -| `db.injectSecretsAsVolume` | Mount user password as a file instead of using an environment variable | `false` | -| `db.injectSecretsFile` | Path to file used for secrets as volume | `/opt/bitnami/mariadb/secrets/mariadb-password` | -| `replication.enabled` | MariaDB replication enabled | `true` | -| `replication.user` | MariaDB replication user | `replicator` | -| `replication.password` | MariaDB replication user password. Ignored if existing secret is provided. | _random 10 character alphanumeric string_ | -| `replication.forcePassword` | Force users to specify a password | `false` | -| `replication.injectSecretsAsVolume` | Mount replication user password as a file instead of using an environment variable | `false` | -| `replication.injectSecretsFile` | Path to file used for secrets as volume | `/opt/bitnami/mariadb/secrets/mariadb-replication-password` | -| `initdbScripts` | Dictionary of initdb scripts | `nil` | -| `initdbScriptsConfigMap` | ConfigMap with the initdb scripts (Note: Overrides `initdbScripts`) | `nil` | -| `master.annotations[].key` | key for the the annotation list item | `nil` | -| `master.annotations[].value` | value for the the annotation list item | `nil` | -| `master.extraFlags` | MariaDB master additional command line flags | `nil` | -| `master.affinity` | Master affinity (in addition to master.antiAffinity when set) | `{}` | -| `master.antiAffinity` | Master pod anti-affinity policy | `soft` | -| `master.nodeSelector` | Master node labels for pod assignment | `{}` | -| `master.tolerations` | List of node taints to tolerate (master) | `[]` | -| `master.updateStrategy` | Master statefulset update strategy policy | `RollingUpdate` | -| `master.persistence.enabled` | Enable persistence using PVC | `true` | -| `master.persistence.existingClaim` | Provide an existing `PersistentVolumeClaim` | `nil` | -| `master.persistence.subPath` | Subdirectory of the volume to mount | `nil` | -| `master.persistence.mountPath` | Path to mount the volume at | `/bitnami/mariadb` | -| `master.persistence.annotations` | Persistent Volume Claim annotations | `{}` | -| `master.persistence.storageClass` | Persistent Volume Storage Class | `` | -| `master.persistence.accessModes` | Persistent Volume Access Modes | `[ReadWriteOnce]` | -| `master.persistence.size` | Persistent Volume Size | `8Gi` | -| `master.persistence.selector` | Selector to match an existing Persistent Volume (this value is evaluated as a template) | `{}` | -| `master.extraInitContainers` | Additional init containers as a string to be passed to the `tpl` function (master) | | -| `master.extraEnvVars` | Array containing extra env vars to configure MariaDB master replicas | `nil` | -| `master.extraEnvVarsCM` | Configmap containing extra env vars to configure MariaDB master replicas | `nil` | -| `master.extraEnvVarsSecret` | Secret containing extra env vars to configure MariaDB master replicas | `nil` | -| `master.config` | Config file for the MariaDB Master server | `_default values in the values.yaml file_` | -| `master.resources` | CPU/Memory resource requests/limits for master node | `{}` | -| `master.livenessProbe.enabled` | Turn on and off liveness probe (master) | `true` | -| `master.livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated (master) | `120` | -| `master.livenessProbe.periodSeconds` | How often to perform the probe (master) | `10` | -| `master.livenessProbe.timeoutSeconds` | When the probe times out (master) | `1` | -| `master.livenessProbe.successThreshold` | Minimum consecutive successes for the probe (master) | `1` | -| `master.livenessProbe.failureThreshold` | Minimum consecutive failures for the probe (master) | `3` | -| `master.readinessProbe.enabled` | Turn on and off readiness probe (master) | `true` | -| `master.readinessProbe.initialDelaySeconds` | Delay before readiness probe is initiated (master) | `30` | -| `master.readinessProbe.periodSeconds` | How often to perform the probe (master) | `10` | -| `master.readinessProbe.timeoutSeconds` | When the probe times out (master) | `1` | -| `master.readinessProbe.successThreshold` | Minimum consecutive successes for the probe (master) | `1` | -| `master.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe (master) | `3` | -| `master.podDisruptionBudget.enabled` | If true, create a pod disruption budget for master pods. | `false` | -| `master.podDisruptionBudget.minAvailable` | Minimum number / percentage of pods that should remain scheduled | `1` | -| `master.podDisruptionBudget.maxUnavailable` | Maximum number / percentage of pods that may be made unavailable | `nil` | -| `master.service.annotations` | Master service annotations | `{}` | -| `slave.replicas` | Desired number of slave replicas | `1` | -| `slave.annotations[].key` | key for the the annotation list item | `nil` | -| `slave.annotations[].value` | value for the the annotation list item | `nil` | -| `slave.extraFlags` | MariaDB slave additional command line flags | `nil` | -| `slave.affinity` | Slave affinity (in addition to slave.antiAffinity when set) | `{}` | -| `slave.antiAffinity` | Slave pod anti-affinity policy | `soft` | -| `slave.nodeSelector` | Slave node labels for pod assignment | `{}` | -| `slave.tolerations` | List of node taints to tolerate for (slave) | `[]` | -| `slave.updateStrategy` | Slave statefulset update strategy policy | `RollingUpdate` | -| `slave.persistence.enabled` | Enable persistence using a `PersistentVolumeClaim` | `true` | -| `slave.persistence.annotations` | Persistent Volume Claim annotations | `{}` | -| `slave.persistence.storageClass` | Persistent Volume Storage Class | `` | -| `slave.persistence.accessModes` | Persistent Volume Access Modes | `[ReadWriteOnce]` | -| `slave.persistence.size` | Persistent Volume Size | `8Gi` | -| `slave.persistence.selector` | Selector to match an existing Persistent Volume (this value is evaluated as a template) | `{}` | -| `slave.extraInitContainers` | Additional init containers as a string to be passed to the `tpl` function (slave) | `nil` | -| `slave.extraEnvVars` | Array containing extra env vars to configure MariaDB slave replicas | `nil` | -| `slave.extraEnvVarsCM` | ConfigMap containing extra env vars to configure MariaDB slave replicas | `nil` | -| `slave.extraEnvVarsSecret` | Secret containing extra env vars to configure MariaDB slave replicas | `nil` | -| `slave.config` | Config file for the MariaDB Slave replicas | `_default values in the values.yaml file_` | -| `slave.resources` | CPU/Memory resource requests/limits for slave node | `{}` | -| `slave.livenessProbe.enabled` | Turn on and off liveness probe (slave) | `true` | -| `slave.livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated (slave) | `120` | -| `slave.livenessProbe.periodSeconds` | How often to perform the probe (slave) | `10` | -| `slave.livenessProbe.timeoutSeconds` | When the probe times out (slave) | `1` | -| `slave.livenessProbe.successThreshold` | Minimum consecutive successes for the probe (slave) | `1` | -| `slave.livenessProbe.failureThreshold` | Minimum consecutive failures for the probe (slave) | `3` | -| `slave.readinessProbe.enabled` | Turn on and off readiness probe (slave) | `true` | -| `slave.readinessProbe.initialDelaySeconds` | Delay before readiness probe is initiated (slave) | `45` | -| `slave.readinessProbe.periodSeconds` | How often to perform the probe (slave) | `10` | -| `slave.readinessProbe.timeoutSeconds` | When the probe times out (slave) | `1` | -| `slave.readinessProbe.successThreshold` | Minimum consecutive successes for the probe (slave) | `1` | -| `slave.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe (slave) | `3` | -| `slave.podDisruptionBudget.enabled` | If true, create a pod disruption budget for slave pods. | `false` | -| `slave.podDisruptionBudget.minAvailable` | Minimum number / percentage of pods that should remain scheduled | `1` | -| `slave.podDisruptionBudget.maxUnavailable` | Maximum number / percentage of pods that may be made unavailable | `nil` | -| `slave.service.annotations` | Slave service annotations | `{}` | -| `metrics.enabled` | Start a side-car prometheus exporter | `false` | -| `metrics.image.registry` | Exporter image registry | `docker.io` | -| `metrics.image.repository` | Exporter image name | `bitnami/mysqld-exporter` | -| `metrics.image.tag` | Exporter image tag | `{TAG_NAME}` | -| `metrics.image.pullPolicy` | Exporter image pull policy | `IfNotPresent` | -| `metrics.resources` | Exporter resource requests/limit | `nil` | -| `metrics.extraArgs.master` | Extra args to be passed to mysqld_exporter | `[]` | -| `metrics.extraArgs.slave` | Extra args to be passed to mysqld_exporter | `[]` | -| `metrics.livenessProbe.enabled` | Turn on and off liveness probe (metrics) | `true` | -| `metrics.livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated (metrics) | `120` | -| `metrics.livenessProbe.periodSeconds` | How often to perform the probe (metrics) | `10` | -| `metrics.livenessProbe.timeoutSeconds` | When the probe times out (metrics) | `1` | -| `metrics.livenessProbe.successThreshold` | Minimum consecutive successes for the probe (metrics) | `1` | -| `metrics.livenessProbe.failureThreshold` | Minimum consecutive failures for the probe (metrics) | `3` | -| `metrics.readinessProbe.enabled` | Turn on and off readiness probe (metrics) | `true` | -| `metrics.readinessProbe.initialDelaySeconds` | Delay before readiness probe is initiated (metrics) | `30` | -| `metrics.readinessProbe.periodSeconds` | How often to perform the probe (metrics) | `10` | -| `metrics.readinessProbe.timeoutSeconds` | When the probe times out (metrics) | `1` | -| `metrics.readinessProbe.successThreshold` | Minimum consecutive successes for the probe (metrics) | `1` | -| `metrics.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe (metrics) | `3` | -| `metrics.serviceMonitor.enabled` | if `true`, creates a Prometheus Operator ServiceMonitor (also requires `metrics.enabled` to be `true`) | `false` | -| `metrics.serviceMonitor.namespace` | Optional namespace which Prometheus is running in | `nil` | -| `metrics.serviceMonitor.interval` | How frequently to scrape metrics (use by default, falling back to Prometheus' default) | `nil` | -| `metrics.serviceMonitor.selector` | Default to kube-prometheus install (CoreOS recommended), but should be set according to Prometheus install | `{ prometheus: kube-prometheus }` | +| Parameter | Description | Default | +|---------------------------------------------|----------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------| +| `global.imageRegistry` | Global Docker Image registry | `nil` | +| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `global.storageClass` | Global storage class for dynamic provisioning | `nil` | + +### Common parameters + +| Parameter | Description | Default | +|---------------------------------------------|----------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------| +| `nameOverride` | String to partially override mariadb.fullname | `nil` | +| `fullnameOverride` | String to fully override mariadb.fullname | `nil` | +| `clusterDomain` | Default Kubernetes cluster domain | `cluster.local` | +| `commonLabels` | Labels to add to all deployed objects | `nil` | +| `commonAnnotations` | Annotations to add to all deployed objects | `[]` | +| `schedulerName` | Name of the scheduler (other than default) to dispatch pods | `nil` | +| `extraDeploy` | Array of extra objects to deploy with the release (evaluated as a template) | `nil` | + +### MariaDB common parameters + +| Parameter | Description | Default | +|---------------------------------------------|----------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------| +| `image.registry` | MariaDB image registry | `docker.io` | +| `image.repository` | MariaDB image name | `bitnami/mariadb` | +| `image.tag` | MariaDB image tag | `{TAG_NAME}` | +| `image.pullPolicy` | MariaDB image pull policy | `IfNotPresent` | +| `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `image.debug` | Specify if debug logs should be enabled | `false` | +| `architecture` | MariaDB architecture (`standalone` or `replication`) | `standalone` | +| `auth.rootPassword` | Password for the `root` user. Ignored if existing secret is provided. | _random 10 character alphanumeric string_ | +| `auth.database` | Name for a custom database to create | `my_database` | +| `auth.username` | Name for a custom user to create | `""` | +| `auth.password` | Password for the new user. Ignored if existing secret is provided | _random 10 character long alphanumeric string_ | +| `auth.replicationUser` | MariaDB replication user | `nil` | +| `auth.replicationPassword` | MariaDB replication user password. Ignored if existing secret is provided | _random 10 character long alphanumeric string_ | +| `auth.forcePassword` | Force users to specify required passwords | `false` | +| `auth.usePasswordFiles` | Mount credentials as a files instead of using an environment variable | `false` | +| `auth.existingSecret` | Use existing secret for password details (`auth.rootPassword`, `auth.password`, `auth.replicationPassword` will be ignored and picked up from this secret). The secret has to contain the keys `mariadb-root-password`, `mariadb-replication-password` and `mariadb-password` | `nil` | +| `initdbScripts` | Dictionary of initdb scripts | `nil` | +| `initdbScriptsConfigMap` | ConfigMap with the initdb scripts (Note: Overrides `initdbScripts`) | `nil` | + +### MariaDB Primary parameters + +| Parameter | Description | Default | +|----------------------------------------------|----------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------| +| `primary.command` | Override default container command on MariaDB Primary container(s) (useful when using custom images) | `nil` | +| `primary.args` | Override default container args on MariaDB Primary container(s) (useful when using custom images) | `nil` | +| `primary.configuration` | MariaDB Primary configuration to be injected as ConfigMap | Check `values.yaml` file | +| `primary.existingConfigmap` | Name of existing ConfigMap with MariaDB Primary configuration | `nil` | +| `primary.updateStrategy` | Update strategy type for the MariaDB primary statefulset | `RollingUpdate` | +| `primary.podAnnotations` | Additional pod annotations for MariaDB primary pods | `{}` (evaluated as a template) | +| `primary.podLabels` | Additional pod labels for MariaDB primary pods | `{}` (evaluated as a template) | +| `primary.podAffinityPreset` | MariaDB primary pod affinity preset. Ignored if `primary.affinity` is set. Allowed values: `soft` or `hard` | `""` | +| `primary.podAntiAffinityPreset` | MariaDB primary pod anti-affinity preset. Ignored if `primary.affinity` is set. Allowed values: `soft` or `hard` | `soft` | +| `primary.nodeAffinityPreset.type` | MariaDB primary node affinity preset type. Ignored if `primary.affinity` is set. Allowed values: `soft` or `hard` | `""` | +| `primary.nodeAffinityPreset.key` | MariaDB primary node label key to match Ignored if `primary.affinity` is set. | `""` | +| `primary.nodeAffinityPreset.values` | MariaDB primary node label values to match. Ignored if `primary.affinity` is set. | `[]` | +| `primary.affinity` | Affinity for MariaDB primary pods assignment | `{}` (evaluated as a template) | +| `primary.nodeSelector` | Node labels for MariaDB primary pods assignment | `{}` (evaluated as a template) | +| `primary.tolerations` | Tolerations for MariaDB primary pods assignment | `[]` (evaluated as a template) | +| `primary.podSecurityContext.enabled` | Enable security context for MariaDB primary pods | `true` | +| `primary.podSecurityContext.fsGroup` | Group ID for the mounted volumes' filesystem | `1001` | +| `primary.containerSecurityContext.enabled` | MariaDB primary container securityContext | `true` | +| `primary.containerSecurityContext.runAsUser` | User ID for the MariaDB primary container | `1001` | +| `primary.livenessProbe` | Liveness probe configuration for MariaDB primary containers | Check `values.yaml` file | +| `primary.readinessProbe` | Readiness probe configuration for MariaDB primary containers | Check `values.yaml` file | +| `primary.customLivenessProbe` | Override default liveness probe for MariaDB primary containers | `nil` | +| `primary.customReadinessProbe` | Override default readiness probe for MariaDB primary containers | `nil` | +| `primary.resources.limits` | The resources limits for MariaDB primary containers | `{}` | +| `primary.resources.requests` | The requested resources for MariaDB primary containers | `{}` | +| `primary.extraEnvVars` | Extra environment variables to be set on MariaDB primary containers | `{}` | +| `primary.extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars for MariaDB primary containers | `nil` | +| `primary.extraEnvVarsSecret` | Name of existing Secret containing extra env vars for MariaDB primary containers | `nil` | +| `primary.extraFlags` | MariaDB primary additional command line flags | `nil` | +| `primary.persistence.enabled` | Enable persistence on MariaDB primary replicas using a `PersistentVolumeClaim` | `true` | +| `primary.persistence.existingClaim` | Name of an existing `PersistentVolumeClaim` for MariaDB primary replicas | `nil` | +| `primary.persistence.annotations` | MariaDB primary persistent volume claim annotations | `{}` (evaluated as a template) | +| `primary.persistence.storageClass` | MariaDB primary persistent volume storage Class | `nil` | +| `primary.persistence.accessModes` | MariaDB primary persistent volume access Modes | `[ReadWriteOnce]` | +| `primary.persistence.size` | MariaDB primary persistent volume size | `8Gi` | +| `primary.persistence.selector` | Selector to match an existing Persistent Volume | `{}` (evaluated as a template) | +| `primary.initContainers` | Add additional init containers for the MariaDB Primary pod(s) | `{}` (evaluated as a template) | +| `primary.sidecars` | Add additional sidecar containers for the MariaDB Primary pod(s) | `{}` (evaluated as a template) | +| `primary.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for the MariaDB Primary container(s) | `{}` | +| `primary.extraVolumes` | Optionally specify extra list of additional volumes to the MariaDB Primary pod(s) | `{}` | +| `primary.service.type` | MariaDB Primary K8s service type | `ClusterIP` | +| `primary.service.clusterIP` | MariaDB Primary K8s service clusterIP IP | `nil` | +| `primary.service.port` | MariaDB Primary K8s service port | `3306` | +| `primary.service.nodePort` | MariaDB Primary K8s service node port | `nil` | +| `primary.service.loadBalancerIP` | MariaDB Primary loadBalancerIP if service type is `LoadBalancer` | `nil` | +| `primary.service.loadBalancerSourceRanges` | Address that are allowed when MariaDB Primary service is LoadBalancer | `[]` | +| `primary.pdb.create` | Enable/disable a Pod Disruption Budget creation for MariaDB primary pods | `false` | +| `primary.pdb.minAvailable` | Minimum number/percentage of MariaDB primary pods that should remain scheduled | `1` | +| `primary.pdb.maxUnavailable` | Maximum number/percentage of MariaDB primary pods that may be made unavailable | `nil` | + +### MariaDB Secondary parameters + +| Parameter | Description | Default | +|------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------| +| `secondary.command` | Override default container command on MariaDB Secondary container(s) (useful when using custom images) | `nil` | +| `secondary.args` | Override default container args on MariaDB Secondary container(s) (useful when using custom images) | `nil` | +| `secondary.configuration` | MariaDB Secondary configuration to be injected as ConfigMap | Check `values.yaml` file | +| `secondary.existingConfigmap` | Name of existing ConfigMap with MariaDB Secondary configuration | `nil` | +| `secondary.replicaCount` | Number of MariaDB secondary replicas | `1` | +| `secondary.updateStrategy` | Update strategy type for the MariaDB secondary statefulset | `RollingUpdate` | +| `secondary.podAnnotations` | Additional pod annotations for MariaDB secondary pods | `{}` (evaluated as a template) | +| `secondary.podLabels` | Additional pod labels for MariaDB secondary pods | `{}` (evaluated as a template) | +| `secondary.podAffinityPreset` | MariaDB secondary pod affinity preset. Ignored if `secondary.affinity` is set. Allowed values: `soft` or `hard` | `""` | +| `secondary.podAntiAffinityPreset` | MariaDB secondary pod anti-affinity preset. Ignored if `secondary.affinity` is set. Allowed values: `soft` or `hard` | `soft` | +| `secondary.nodeAffinityPreset.type` | MariaDB secondary node affinity preset type. Ignored if `secondary.affinity` is set. Allowed values: `soft` or `hard` | `""` | +| `secondary.nodeAffinityPreset.key` | MariaDB secondary node label key to match Ignored if `secondary.affinity` is set. | `""` | +| `secondary.nodeAffinityPreset.values` | MariaDB secondary node label values to match. Ignored if `secondary.affinity` is set. | `[]` | +| `secondary.affinity` | Affinity for MariaDB secondary pods assignment | `{}` (evaluated as a template) | +| `secondary.nodeSelector` | Node labels for MariaDB secondary pods assignment | `{}` (evaluated as a template) | +| `secondary.tolerations` | Tolerations for MariaDB secondary pods assignment | `[]` (evaluated as a template) | +| `secondary.podSecurityContext.enabled` | Enable security context for MariaDB secondary pods | `true` | +| `secondary.podSecurityContext.fsGroup` | Group ID for the mounted volumes' filesystem | `1001` | +| `secondary.containerSecurityContext.enabled` | MariaDB secondary container securityContext | `true` | +| `secondary.containerSecurityContext.runAsUser` | User ID for the MariaDB secondary container | `1001` | +| `secondary.livenessProbe` | Liveness probe configuration for MariaDB secondary containers | Check `values.yaml` file | +| `secondary.readinessProbe` | Readiness probe configuration for MariaDB secondary containers | Check `values.yaml` file | +| `secondary.customLivenessProbe` | Override default liveness probe for MariaDB secondary containers | `nil` | +| `secondary.customReadinessProbe` | Override default readiness probe for MariaDB secondary containers | `nil` | +| `secondary.resources.limits` | The resources limits for MariaDB secondary containers | `{}` | +| `secondary.resources.requests` | The requested resources for MariaDB secondary containers | `{}` | +| `secondary.extraEnvVars` | Extra environment variables to be set on MariaDB secondary containers | `{}` | +| `secondary.extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars for MariaDB secondary containers | `nil` | +| `secondary.extraEnvVarsSecret` | Name of existing Secret containing extra env vars for MariaDB secondary containers | `nil` | +| `secondary.extraFlags` | MariaDB secondary additional command line flags | `nil` | +| `secondary.extraFlags` | MariaDB secondary additional command line flags | `nil` | +| `secondary.persistence.enabled` | Enable persistence on MariaDB secondary replicas using a `PersistentVolumeClaim` | `true` | +| `secondary.persistence.annotations` | MariaDB secondary persistent volume claim annotations | `{}` (evaluated as a template) | +| `secondary.persistence.storageClass` | MariaDB secondary persistent volume storage Class | `nil` | +| `secondary.persistence.accessModes` | MariaDB secondary persistent volume access Modes | `[ReadWriteOnce]` | +| `secondary.persistence.size` | MariaDB secondary persistent volume size | `8Gi` | +| `secondary.persistence.selector` | Selector to match an existing Persistent Volume | `{}` (evaluated as a template) | +| `secondary.initContainers` | Add additional init containers for the MariaDB secondary pod(s) | `{}` (evaluated as a template) | +| `secondary.sidecars` | Add additional sidecar containers for the MariaDB secondary pod(s) | `{}` (evaluated as a template) | +| `secondary.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for the MariaDB secondary container(s) | `{}` | +| `secondary.extraVolumes` | Optionally specify extra list of additional volumes to the MariaDB secondary pod(s) | `{}` | +| `secondary.service.type` | MariaDB secondary K8s service type | `ClusterIP` | +| `secondary.service.clusterIP` | MariaDB secondary K8s service clusterIP IP | `nil` | +| `secondary.service.port` | MariaDB secondary K8s service port | `3306` | +| `secondary.service.nodePort` | MariaDB secondary K8s service node port | `nil` | +| `secondary.service.loadBalancerIP` | MariaDB secondary loadBalancerIP if service type is `LoadBalancer` | `nil` | +| `secondary.service.loadBalancerSourceRanges` | Address that are allowed when MariaDB secondary service is LoadBalancer | `[]` | +| `secondary.pdb.create` | Enable/disable a Pod Disruption Budget creation for MariaDB secondary pods | `false` | +| `secondary.pdb.minAvailable` | Minimum number/percentage of MariaDB secondary pods that should remain scheduled | `1` | +| `secondary.pdb.maxUnavailable` | Maximum number/percentage of MariaDB secondary pods that may be made unavailable | `nil` | + +### RBAC parameters + +| Parameter | Description | Default | +|---------------------------------------------|----------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------| +| `serviceAccount.create` | Enable the creation of a ServiceAccount for MariaDB pods | `true` | +| `serviceAccount.name` | Name of the created ServiceAccount | Generated using the `mariadb.fullname` template | +| `serviceAccount.annotations` | Annotations for MariaDB Service Account | `{}` (evaluated as a template) | +| `rbac.create` | Weather to create & use RBAC resources or not | `false` | + +### Volume Permissions parameters + +| Parameter | Description | Default | +|---------------------------------------------|----------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------| +| `volumePermissions.enabled` | Enable init container that changes the owner and group of the persistent volume(s) mountpoint to `runAsUser:fsGroup` | `false` | +| `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | +| `volumePermissions.image.repository` | Init container volume-permissions image name | `bitnami/minideb` | +| `volumePermissions.image.tag` | Init container volume-permissions image tag | `buster` | +| `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `Always` | +| `volumePermissions.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `volumePermissions.resources.limits` | Init container volume-permissions resource limits | `{}` | +| `volumePermissions.resources.requests` | Init container volume-permissions resource requests | `{}` | + +### Metrics parameters + +| Parameter | Description | Default | +|---------------------------------------------|----------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------| +| `metrics.enabled` | Start a side-car prometheus exporter | `false` | +| `metrics.image.registry` | Exporter image registry | `docker.io` | +| `metrics.image.repository` | Exporter image name | `bitnami/mysqld-exporter` | +| `metrics.image.tag` | Exporter image tag | `{TAG_NAME}` | +| `metrics.image.pullPolicy` | Exporter image pull policy | `IfNotPresent` | +| `metrics.extraArgs.primary` | Extra args to be passed to mysqld_exporter on Primary pods | `[]` | +| `metrics.extraArgs.secondary` | Extra args to be passed to mysqld_exporter on Secondary pods | `[]` | +| `metrics.resources.limits` | The resources limits for MariaDB prometheus exporter containers | `{}` | +| `metrics.resources.requests` | The requested resources for MariaDB prometheus exporter containers | `{}` | +| `metrics.livenessProbe` | Liveness probe configuration for MariaDB prometheus exporter containers | Check `values.yaml` file | +| `metrics.readinessProbe` | Readiness probe configuration for MariaDB prometheus exporter containers | Check `values.yaml` file | +| `metrics.serviceMonitor.enabled` | Create ServiceMonitor Resource for scraping metrics using PrometheusOperator | `false` | +| `metrics.serviceMonitor.namespace` | Namespace which Prometheus is running in | `nil` | +| `metrics.serviceMonitor.interval` | Interval at which metrics should be scraped | `30s` | +| `metrics.serviceMonitor.scrapeTimeout` | Specify the timeout after which the scrape is ended | `nil` | +| `metrics.serviceMonitor.relabellings` | Specify Metric Relabellings to add to the scrape endpoint | `nil` | +| `metrics.serviceMonitor.honorLabels` | honorLabels chooses the metric's labels on collisions with target labels. | `false` | +| `metrics.serviceMonitor.additionalLabels` | Used to pass Labels that are required by the Installed Prometheus Operator | `{}` | +| `metrics.serviceMonitor.release` | Used to pass Labels release that sometimes should be custom for Prometheus Operator | `nil` | The above parameters map to the env variables defined in [bitnami/mariadb](http://github.com/bitnami/bitnami-docker-mariadb). For more information please refer to the [bitnami/mariadb](http://github.com/bitnami/bitnami-docker-mariadb) image documentation. @@ -208,7 +251,7 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm ```bash $ helm install my-release \ - --set rootUser.password=secretpassword,db.user=app_database \ + --set auth.rootPassword=secretpassword,auth.database=app_database \ bitnami/mariadb ``` @@ -237,25 +280,24 @@ This chart includes a `values-production.yaml` file where you can find some para - Force users to specify a password and mount secrets as volumes instead of using environment variables: ```diff -- rootUser.forcePassword: false -- rootUser.injectSecretsAsVolume: false -+ rootUser.forcePassword: true -+ rootUser.injectSecretsAsVolume: true -- db.forcePassword: false -- db.injectSecretsAsVolume: false -+ db.forcePassword: true -+ db.injectSecretsAsVolume: true -- replication.forcePassword: false -- replication.injectSecretsAsVolume: false -+ replication.forcePassword: true -+ replication.injectSecretsAsVolume: true +- auth.forcePassword: false ++ auth.forcePassword: true +- auth.usePasswordFiles: false ++ auth.usePasswordFiles: true ``` -- Desired number of slave replicas: +- Use "replication" architecture: ```diff -- slave.replicas: 1 -+ slave.replicas: 2 +- architecture: standalone ++ architecture: replication +``` + +- Desired number of secondary replicas: + +```diff +- secondary.replicaCount: 1 ++ secondary.replicaCount: 2 ``` - Start a side-car prometheus exporter: @@ -271,26 +313,36 @@ To modify the MariaDB version used in this chart you can specify a [valid image ### Initialize a fresh instance -The [Bitnami MariaDB](https://github.com/bitnami/bitnami-docker-mariadb) image allows you to use your custom scripts to initialize a fresh instance. In order to execute the scripts, they must be located inside the chart folder `files/docker-entrypoint-initdb.d` so they can be consumed as a ConfigMap. +The [Bitnami MariaDB](https://github.com/bitnami/bitnami-docker-mariadb) image allows you to use your custom scripts to initialize a fresh instance. In order to execute the scripts, you can specify custom scripts using the `initdbScripts` parameter as dict. -Alternatively, you can specify custom scripts using the `initdbScripts` parameter as dict. - -In addition to these options, you can also set an external ConfigMap with all the initialization scripts. This is done by setting the `initdbScriptsConfigMap` parameter. Note that this will override the two previous options. +In addition to this option, you can also set an external ConfigMap with all the initialization scripts. This is done by setting the `initdbScriptsConfigMap` parameter. Note that this will override the previous option. The allowed extensions are `.sh`, `.sql` and `.sql.gz`. -### Extra Init Containers +### Sidecars and Init Containers + +If you have a need for additional containers to run within the same pod as MongoDB, you can do so via the `sidecars` config parameter. Simply define your container according to the Kubernetes container spec. -The feature allows for specifying a template string for a initContainer in the master/slave pod. Usecases include situations when you need some pre-run setup. For example, in IKS (IBM Cloud Kubernetes Service), non-root users do not have write permission on the volume mount path for NFS-powered file storage. So, you could use a initcontainer to `chown` the mount. See a example below, where we add an initContainer on the master pod that reports to an external resource that the db is going to starting. -`values.yaml` ```yaml -master: - extraInitContainers: | - - name: initcontainer - image: bitnami/minideb:buster - command: ["/bin/sh", "-c"] - args: - - install_packages curl && curl http://api-service.local/db/starting; +sidecars: + - name: your-image-name + image: your-image + imagePullPolicy: Always + ports: + - name: portname + containerPort: 1234 +``` + +Similarly, you can add extra init containers using the `initContainers` parameter. + +```yaml +initContainers: + - name: your-image-name + image: your-image + imagePullPolicy: Always + ports: + - name: portname + containerPort: 1234 ``` ## Persistence @@ -310,14 +362,40 @@ You can enable this initContainer by setting `volumePermissions.enabled` to `tru ## Upgrading -It's necessary to set the `rootUser.password` parameter when upgrading for readiness/liveness probes to work properly. When you install this chart for the first time, some notes will be displayed providing the credentials you must use under the 'Administrator credentials' section. Please note down the password and run the command below to upgrade your chart: +It's necessary to set the `auth.rootPassword` parameter when upgrading for readiness/liveness probes to work properly. When you install this chart for the first time, some notes will be displayed providing the credentials you must use under the 'Administrator credentials' section. Please note down the password and run the command below to upgrade your chart: ```bash -$ helm upgrade my-release bitnami/mariadb --set rootUser.password=[ROOT_PASSWORD] +$ helm upgrade my-release bitnami/mariadb --set auth.rootPassword=[ROOT_PASSWORD] ``` | Note: you need to substitute the placeholder _[ROOT_PASSWORD]_ with the value obtained in the installation notes. +### To 8.0.0 + +- Several parameters were renamed or dissapeared in favor of new ones on this major version: + - The terms *master* and *slave* have been replaced by the terms *primary* and *secondary*. Therefore, parameters prefixed with `master` or `slave` are now prefixed with `primary` or `secondary`, respectively. + - `securityContext.*` is deprecated in favor of `primary.podSecurityContext`, `primary.containerSecurityContext`, `secondary.podSecurityContext`, and `secondary.containerSecurityContext`. + - Credentials parameter are reorganized under the `auth` parameter. + - `replication.enabled` parameter is deprecated in favor of `architecture` parameter that accepts two values: `standalone` and `replication`. +- The default MariaDB version was updated from 10.3 to 10.5. According to the official documentation, upgrading from 10.3 should be painless. However, there are some things that have changed which could affect an upgrade: + - [Incompatible changes upgrading from MariaDB 10.3 to MariaDB 10.4](https://mariadb.com/kb/en/upgrading-from-mariadb-103-to-mariadb-104/#incompatible-changes-between-103-and-104). + - [Incompatible changes upgrading from MariaDB 10.4 to MariaDB 10.5](https://mariadb.com/kb/en/upgrading-from-mariadb-104-to-mariadb-105/#incompatible-changes-between-104-and-105). +- Chart labels were adapted to follow the [Helm charts standard labels](https://helm.sh/docs/chart_best_practices/labels/#standard-labels). +- This version also introduces `bitnami/common`, a [library chart](https://helm.sh/docs/topics/library_charts/#helm) as a dependency. More documentation about this new utility could be found [here](https://github.com/bitnami/charts/tree/master/bitnami/common#bitnami-common-library-chart). Please, make sure that you have updated the chart dependencies before executing any upgrade. + +Consequences: + +Backwards compatibility is not guaranteed. To upgrade to `8.0.0`, install a new release of the MariaDB chart, and migrate the data from your previous release. You have 2 alternatives to do so: + +- Create a backup of the database, and restore it on the new release using tools such as [mysqldump](https://mariadb.com/kb/en/mysqldump/). +- Reuse the PVC used to hold the master data on your previous release. To do so, use the `primary.persistence.existingClaim` parameter. The following example assumes that the release name is `mariadb`: + +```bash +$ helm install mariadb bitnami/mariadb --set auth.rootPassword=[ROOT_PASSWORD] --set primary.persistence.existingClaim=[EXISTING_PVC] +``` + +| Note: you need to substitute the placeholder _[EXISTING_PVC]_ with the name of the PVC used on your previous release, and _[ROOT_PASSWORD]_ with the root password used in your previous release. + ### To 7.0.0 Helm performs a lookup for the object based on its group (apps), version (v1), and kind (Deployment). Also known as its GroupVersionKind, or GVK. Changing the GVK is considered a compatibility breaker from Kubernetes' point of view, so you cannot "upgrade" those objects to the new GVK in-place. Earlier versions of Helm 3 did not perform the lookup correctly which has since been fixed to match the spec. diff --git a/bitnami/mariadb/ci/values-production-with-rbac.yaml b/bitnami/mariadb/ci/values-production-with-rbac-and-metrics.yaml similarity index 66% rename from bitnami/mariadb/ci/values-production-with-rbac.yaml rename to bitnami/mariadb/ci/values-production-with-rbac-and-metrics.yaml index 3e71d77f9..2f1a8d95b 100644 --- a/bitnami/mariadb/ci/values-production-with-rbac.yaml +++ b/bitnami/mariadb/ci/values-production-with-rbac-and-metrics.yaml @@ -1,31 +1,33 @@ # Test values file for generating all of the yaml and check that # the rendering is correct +architecture: replication +auth: + usePasswordFiles: true -metrics: - enabled: true - -podDisruptionBudget: - create: true - -master: +primary: extraEnvVars: - name: TEST value: "3" - extraEnvVarsSecret: example-secret extraEnvVarsCM: example-cm + podDisruptionBudget: + create: true -slave: +secondary: + replicaCount: 2 extraEnvVars: - name: TEST value: "2" - extraEnvVarsSecret: example-secret-2 extraEnvVarsCM: example-cm-2 - -rbac: - create: true + podDisruptionBudget: + create: true serviceAccount: create: true - name: mariadb-galera-service-account + name: mariadb-service-account +rbac: + create: true + +metrics: + enabled: true diff --git a/bitnami/mariadb/files/docker-entrypoint-initdb.d/README.md b/bitnami/mariadb/files/docker-entrypoint-initdb.d/README.md deleted file mode 100644 index aaddde303..000000000 --- a/bitnami/mariadb/files/docker-entrypoint-initdb.d/README.md +++ /dev/null @@ -1,3 +0,0 @@ -You can copy here your custom .sh, .sql or .sql.gz file so they are executed during the first boot of the image. - -More info in the [bitnami-docker-mariadb](https://github.com/bitnami/bitnami-docker-mariadb#initializing-a-new-instance) repository. \ No newline at end of file diff --git a/bitnami/mariadb/requirements.lock b/bitnami/mariadb/requirements.lock new file mode 100644 index 000000000..f92acdeab --- /dev/null +++ b/bitnami/mariadb/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://charts.bitnami.com/bitnami + version: 0.8.0 +digest: sha256:8fa03abb94774b733224ea1f70dd149fe11d044439c46bdf62723e3802067936 +generated: "2020-10-02T12:45:48.749836+02:00" diff --git a/bitnami/mariadb/requirements.yaml b/bitnami/mariadb/requirements.yaml new file mode 100644 index 000000000..0c2495d0f --- /dev/null +++ b/bitnami/mariadb/requirements.yaml @@ -0,0 +1,6 @@ +dependencies: + - name: common + version: 0.x.x + repository: https://charts.bitnami.com/bitnami + tags: + - bitnami-common diff --git a/bitnami/mariadb/templates/NOTES.txt b/bitnami/mariadb/templates/NOTES.txt index 9cf93ae8a..7f61cef23 100644 --- a/bitnami/mariadb/templates/NOTES.txt +++ b/bitnami/mariadb/templates/NOTES.txt @@ -7,9 +7,9 @@ Tip: Services: - echo Master: {{ template "mariadb.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.port }} -{{- if .Values.replication.enabled }} - echo Slave: {{ template "slave.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.port }} + echo Primary: {{ include "mariadb.primary.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.primary.service.port }} +{{- if eq .Values.architecture "replication" }} + echo Secondary: {{ include "mariadb.secondary.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.secondary.service.port }} {{- end }} Administrator credentials: @@ -21,29 +21,28 @@ To connect to your database: 1. Run a pod that you can use as a client: - kubectl run {{ template "mariadb.fullname" . }}-client --rm --tty -i --restart='Never' --image {{ template "mariadb.image" . }} --namespace {{ .Release.Namespace }} --command -- bash + kubectl run {{ include "common.names.fullname" . }}-client --rm --tty -i --restart='Never' --image {{ template "mariadb.image" . }} --namespace {{ .Release.Namespace }} --command -- bash - 2. To connect to master service (read/write): + 2. To connect to primary service (read/write): - mysql -h {{ template "mariadb.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local -uroot -p {{ .Values.db.name }} + mysql -h {{ include "mariadb.primary.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} -uroot -p {{ .Values.auth.database }} -{{- if .Values.replication.enabled }} +{{- if eq .Values.architecture "replication" }} - 3. To connect to slave service (read-only): + 3. To connect to secondary service (read-only): - mysql -h {{ template "slave.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local -uroot -p {{ .Values.db.name }} + mysql -h {{ include "mariadb.secondary.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} -uroot -p {{ .Values.auth.database }} {{- end }} To upgrade this helm chart: - 1. Obtain the password as described on the 'Administrator credentials' section and set the 'rootUser.password' parameter as shown below: + 1. Obtain the password as described on the 'Administrator credentials' section and set the 'auth.rootPassword' parameter as shown below: ROOT_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mariadb.secretName" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode) - helm upgrade {{ .Release.Name }} bitnami/mariadb --set rootUser.password=$ROOT_PASSWORD + helm upgrade {{ .Release.Name }} bitnami/mariadb --set auth.rootPassword=$ROOT_PASSWORD -{{- if and (contains "bitnami/" .Values.image.repository) (not (.Values.image.tag | toString | regexFind "-r\\d+$|sha256:")) }} - -WARNING: Rolling tag detected ({{ .Values.image.repository }}:{{ .Values.image.tag }}), please note that it is strongly recommended to avoid using rolling tags in a production environment. -+info https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/ - -{{- end }} +{{- include "common.warnings.rollingTag" .Values.image }} +{{- include "common.warnings.rollingTag" .Values.metrics.image }} +{{- include "mariadb.validateValues" . }} +{{- $passwordValidationErrors := include "common.validations.values.mariadb.passwords" (dict "secret" (include "common.names.fullname" .) "context" $) -}} +{{- include "common.errors.upgrade.passwords.empty" (dict "validationErrors" (list $passwordValidationErrors) "context" $) -}} diff --git a/bitnami/mariadb/templates/_helpers.tpl b/bitnami/mariadb/templates/_helpers.tpl index b5c1d9739..5978701b3 100644 --- a/bitnami/mariadb/templates/_helpers.tpl +++ b/bitnami/mariadb/templates/_helpers.tpl @@ -1,109 +1,43 @@ -{{/* -Return the appropriate apiVersion for statefulset. -*/}} -{{- define "mariadb.statefulset.apiVersion" -}} -{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}} -{{- print "apps/v1beta1" -}} -{{- else -}} -{{- print "apps/v1" -}} -{{- end -}} -{{- end -}} - {{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "mariadb.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "mariadb.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- define "mariadb.primary.fullname" -}} +{{- if eq .Values.architecture "replication" }} +{{- printf "%s-%s" (include "common.names.fullname" .) "primary" | trunc 63 | trimSuffix "-" -}} {{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- printf .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{- define "master.fullname" -}} -{{- if .Values.replication.enabled -}} -{{- printf "%s-%s" (include "mariadb.fullname" .) "master" | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- include "mariadb.fullname" . -}} +{{- include "common.names.fullname" . -}} {{- end -}} {{- end -}} -{{- define "slave.fullname" -}} -{{- printf "%s-%s" (include "mariadb.fullname" .) "slave" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "mariadb.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create pod labels for mariadb -*/}} -{{- define "mariadb.podLabels" -}} -{{- if .Values.podLabels }} -{{ toYaml .Values.podLabels }} -{{- end -}} +{{- define "mariadb.secondary.fullname" -}} +{{- printf "%s-%s" (include "common.names.fullname" .) "secondary" | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* Return the proper MariaDB image name */}} {{- define "mariadb.image" -}} -{{- $registryName := .Values.image.registry -}} -{{- $repositoryName := .Values.image.repository -}} -{{- $tag := .Values.image.tag | toString -}} -{{/* -Helm 2.11 supports the assignment of a value to a variable defined in a different scope, -but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. -Also, we can't use a single if because lazy evaluation is not an option -*/}} -{{- if .Values.global }} - {{- if .Values.global.imageRegistry }} - {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} - {{- else -}} - {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} - {{- end -}} -{{- else -}} - {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} -{{- end -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) }} {{- end -}} {{/* Return the proper metrics image name */}} {{- define "mariadb.metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} -{{- $repositoryName := .Values.metrics.image.repository -}} -{{- $tag := .Values.metrics.image.tag | toString -}} -{{/* -Helm 2.11 supports the assignment of a value to a variable defined in a different scope, -but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. -Also, we can't use a single if because lazy evaluation is not an option -*/}} -{{- if .Values.global }} - {{- if .Values.global.imageRegistry }} - {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} - {{- else -}} - {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} - {{- end -}} -{{- else -}} - {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{ include "common.images.image" (dict "imageRoot" .Values.metrics.image "global" .Values.global) }} {{- end -}} + +{{/* +Return the proper image name (for the init container volume-permissions image) +*/}} +{{- define "mariadb.volumePermissions.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.volumePermissions.image "global" .Values.global) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "mariadb.imagePullSecrets" -}} +{{ include "common.images.pullSecrets" (dict "images" (list .Values.image .Values.metrics.image .Values.volumePermissions.image) "global" .Values.global) }} {{- end -}} {{ template "mariadb.initdbScriptsCM" . }} @@ -114,7 +48,7 @@ Get the initialization scripts ConfigMap name. {{- if .Values.initdbScriptsConfigMap -}} {{- printf "%s" .Values.initdbScriptsConfigMap -}} {{- else -}} -{{- printf "%s-init-scripts" (include "master.fullname" .) -}} +{{- printf "%s-init-scripts" (include "mariadb.primary.fullname" .) -}} {{- end -}} {{- end -}} @@ -123,166 +57,94 @@ Create the name of the service account to use */}} {{- define "mariadb.serviceAccountName" -}} {{- if .Values.serviceAccount.create -}} - {{ default (include "mariadb.fullname" .) .Values.serviceAccount.name }} + {{ default (include "common.names.fullname" .) .Values.serviceAccount.name }} {{- else -}} {{ default "default" .Values.serviceAccount.name }} {{- end -}} {{- end -}} {{/* -Return the proper Docker Image Registry Secret Names +Return the configmap with the MariaDB Primary configuration */}} -{{- define "mariadb.imagePullSecrets" -}} -{{/* -Helm 2.11 supports the assignment of a value to a variable defined in a different scope, -but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic. -Also, we can not use a single if because lazy evaluation is not an option -*/}} -{{- if .Values.global }} -{{- if .Values.global.imagePullSecrets }} -imagePullSecrets: -{{- range .Values.global.imagePullSecrets }} - - name: {{ . }} -{{- end }} -{{- else if or .Values.image.pullSecrets .Values.metrics.image.pullSecrets .Values.volumePermissions.image.pullSecrets }} -imagePullSecrets: -{{- range .Values.image.pullSecrets }} - - name: {{ . }} -{{- end }} -{{- range .Values.metrics.image.pullSecrets }} - - name: {{ . }} -{{- end }} -{{- range .Values.volumePermissions.image.pullSecrets }} - - name: {{ . }} -{{- end }} -{{- end -}} -{{- else if or .Values.image.pullSecrets .Values.metrics.image.pullSecrets .Values.volumePermissions.image.pullSecrets }} -imagePullSecrets: -{{- range .Values.image.pullSecrets }} - - name: {{ . }} -{{- end }} -{{- range .Values.metrics.image.pullSecrets }} - - name: {{ . }} -{{- end }} -{{- range .Values.volumePermissions.image.pullSecrets }} - - name: {{ . }} -{{- end }} -{{- end -}} -{{- end -}} - -{{/* -Return the proper image name (for the init container volume-permissions image) -*/}} -{{- define "mariadb.volumePermissions.image" -}} -{{- $registryName := .Values.volumePermissions.image.registry -}} -{{- $repositoryName := .Values.volumePermissions.image.repository -}} -{{- $tag := .Values.volumePermissions.image.tag | toString -}} -{{/* -Helm 2.11 supports the assignment of a value to a variable defined in a different scope, -but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. -Also, we can't use a single if because lazy evaluation is not an option -*/}} -{{- if .Values.global }} - {{- if .Values.global.imageRegistry }} - {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} - {{- else -}} - {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} - {{- end -}} +{{- define "mariadb.primary.configmapName" -}} +{{- if .Values.primary.existingConfigmap -}} + {{- printf "%s" (tpl .Values.primary.existingConfigmap $) -}} {{- else -}} - {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- printf "%s" (include "mariadb.primary.fullname" .) -}} {{- end -}} {{- end -}} {{/* -Return the proper Storage Class for the master +Return true if a configmap object should be created for MariaDB Secondary */}} -{{- define "mariadb.master.storageClass" -}} -{{/* -Helm 2.11 supports the assignment of a value to a variable defined in a different scope, -but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic. -*/}} -{{- if .Values.global -}} - {{- if .Values.global.storageClass -}} - {{- if (eq "-" .Values.global.storageClass) -}} - {{- printf "storageClassName: \"\"" -}} - {{- else }} - {{- printf "storageClassName: %s" .Values.global.storageClass -}} - {{- end -}} - {{- else -}} - {{- if .Values.master.persistence.storageClass -}} - {{- if (eq "-" .Values.master.persistence.storageClass) -}} - {{- printf "storageClassName: \"\"" -}} - {{- else }} - {{- printf "storageClassName: %s" .Values.master.persistence.storageClass -}} - {{- end -}} - {{- end -}} - {{- end -}} +{{- define "mariadb.primary.createConfigmap" -}} +{{- if and .Values.primary.configuration (not .Values.primary.existingConfigmap) }} + {{- true -}} {{- else -}} - {{- if .Values.master.persistence.storageClass -}} - {{- if (eq "-" .Values.master.persistence.storageClass) -}} - {{- printf "storageClassName: \"\"" -}} - {{- else }} - {{- printf "storageClassName: %s" .Values.master.persistence.storageClass -}} - {{- end -}} - {{- end -}} {{- end -}} {{- end -}} {{/* -Return the proper Storage Class for the slave +Return the configmap with the MariaDB Primary configuration */}} -{{- define "mariadb.slave.storageClass" -}} -{{/* -Helm 2.11 supports the assignment of a value to a variable defined in a different scope, -but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic. -*/}} -{{- if .Values.global -}} - {{- if .Values.global.storageClass -}} - {{- if (eq "-" .Values.global.storageClass) -}} - {{- printf "storageClassName: \"\"" -}} - {{- else }} - {{- printf "storageClassName: %s" .Values.global.storageClass -}} - {{- end -}} - {{- else -}} - {{- if .Values.slave.persistence.storageClass -}} - {{- if (eq "-" .Values.slave.persistence.storageClass) -}} - {{- printf "storageClassName: \"\"" -}} - {{- else }} - {{- printf "storageClassName: %s" .Values.slave.persistence.storageClass -}} - {{- end -}} - {{- end -}} - {{- end -}} +{{- define "mariadb.secondary.configmapName" -}} +{{- if .Values.secondary.existingConfigmap -}} + {{- printf "%s" (tpl .Values.secondary.existingConfigmap $) -}} {{- else -}} - {{- if .Values.slave.persistence.storageClass -}} - {{- if (eq "-" .Values.slave.persistence.storageClass) -}} - {{- printf "storageClassName: \"\"" -}} - {{- else }} - {{- printf "storageClassName: %s" .Values.slave.persistence.storageClass -}} - {{- end -}} - {{- end -}} + {{- printf "%s" (include "mariadb.secondary.fullname" .) -}} {{- end -}} {{- end -}} {{/* -Return the name of the Secret used to store the passwords +Return true if a configmap object should be created for MariaDB Secondary +*/}} +{{- define "mariadb.secondary.createConfigmap" -}} +{{- if and (eq .Values.architecture "replication") .Values.secondary.configuration (not .Values.secondary.existingConfigmap) }} + {{- true -}} +{{- else -}} +{{- end -}} +{{- end -}} + +{{/* +Return the secret with MariaDB credentials */}} {{- define "mariadb.secretName" -}} -{{- if .Values.existingSecret -}} -{{ .Values.existingSecret }} + {{- if .Values.auth.existingSecret -}} + {{- printf "%s" .Values.auth.existingSecret -}} + {{- else -}} + {{- printf "%s" (include "common.names.fullname" .) -}} + {{- end -}} +{{- end -}} + +{{/* +Return true if a secret object should be created for MariaDB +*/}} +{{- define "mariadb.createSecret" -}} +{{- if not .Values.auth.existingSecret }} + {{- true -}} {{- else -}} -{{ template "mariadb.fullname" . -}} {{- end -}} {{- end -}} {{/* -Renders a value that contains template. -Usage: -{{ include "mariadb.tplValue" ( dict "value" .Values.path.to.the.Value "context" $) }} +Compile all warnings into a single message, and call fail. */}} -{{- define "mariadb.tplValue" -}} - {{- if typeIs "string" .value }} - {{- tpl .value .context }} - {{- else }} - {{- tpl (.value | toYaml) .context }} - {{- end }} +{{- define "mariadb.validateValues" -}} +{{- $messages := list -}} +{{- $messages := append $messages (include "mariadb.validateValues.architecture" .) -}} +{{- $messages := without $messages "" -}} +{{- $message := join "\n" $messages -}} + +{{- if $message -}} +{{- printf "\nVALUES VALIDATION:\n%s" $message | fail -}} +{{- end -}} +{{- end -}} + +{{/* Validate values of MariaDB - must provide a valid architecture */}} +{{- define "mariadb.validateValues.architecture" -}} +{{- if and (ne .Values.architecture "standalone") (ne .Values.architecture "replication") -}} +mariadb: architecture + Invalid architecture selected. Valid values are "standalone" and + "replication". Please set a valid architecture (--set architecture="xxxx") +{{- end -}} {{- end -}} diff --git a/bitnami/mariadb/templates/initialization-configmap.yaml b/bitnami/mariadb/templates/initialization-configmap.yaml deleted file mode 100644 index 2dbeb2d12..000000000 --- a/bitnami/mariadb/templates/initialization-configmap.yaml +++ /dev/null @@ -1,27 +0,0 @@ -{{- if and (or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScripts) (not .Values.initdbScriptsConfigMap) }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "master.fullname" . }}-init-scripts - namespace: {{ .Release.Namespace }} - labels: - app: "{{ template "mariadb.name" . }}" - chart: "{{ template "mariadb.chart" . }}" - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} - component: "master" -{{- if and (.Files.Glob "files/docker-entrypoint-initdb.d/*.sql.gz") (not .Values.initdbScriptsConfigMap) }} -binaryData: -{{- $root := . }} -{{- range $path, $bytes := .Files.Glob "files/docker-entrypoint-initdb.d/*.sql.gz" }} - {{ base $path }}: {{ $root.Files.Get $path | b64enc | quote }} -{{- end }} -{{- end }} -data: -{{- if and (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql}") (not .Values.initdbScriptsConfigMap) }} -{{ (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql}").AsConfig | indent 2 }} -{{- end }} -{{- with .Values.initdbScripts }} -{{ toYaml . | indent 2 }} -{{- end }} -{{ end }} diff --git a/bitnami/mariadb/templates/master-configmap.yaml b/bitnami/mariadb/templates/master-configmap.yaml deleted file mode 100644 index 362074393..000000000 --- a/bitnami/mariadb/templates/master-configmap.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if .Values.master.config }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "master.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - app: "{{ template "mariadb.name" . }}" - component: "master" - chart: "{{ template "mariadb.chart" . }}" - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} -data: - my.cnf: |- -{{ .Values.master.config | indent 4 }} -{{- end -}} diff --git a/bitnami/mariadb/templates/master-pdb.yaml b/bitnami/mariadb/templates/master-pdb.yaml deleted file mode 100644 index 012d09a04..000000000 --- a/bitnami/mariadb/templates/master-pdb.yaml +++ /dev/null @@ -1,25 +0,0 @@ -{{- if .Values.master.podDisruptionBudget.enabled }} -apiVersion: policy/v1beta1 -kind: PodDisruptionBudget -metadata: - name: {{ template "mariadb.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - app: "{{ template "mariadb.name" . }}" - component: "master" - chart: {{ template "mariadb.chart" . }} - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} -spec: -{{- if .Values.master.podDisruptionBudget.minAvailable }} - minAvailable: {{ .Values.master.podDisruptionBudget.minAvailable }} -{{- end }} -{{- if .Values.master.podDisruptionBudget.maxUnavailable }} - maxUnavailable: {{ .Values.master.podDisruptionBudget.maxUnavailable }} -{{- end }} - selector: - matchLabels: - app: "{{ template "mariadb.name" . }}" - component: "master" - release: {{ .Release.Name | quote }} -{{- end }} diff --git a/bitnami/mariadb/templates/master-statefulset.yaml b/bitnami/mariadb/templates/master-statefulset.yaml deleted file mode 100644 index 5d335814b..000000000 --- a/bitnami/mariadb/templates/master-statefulset.yaml +++ /dev/null @@ -1,347 +0,0 @@ -apiVersion: {{ template "mariadb.statefulset.apiVersion" . }} -kind: StatefulSet -metadata: - name: {{ template "master.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - app: {{ template "mariadb.name" . }} - chart: {{ template "mariadb.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - component: master - {{- include "mariadb.podLabels" . | nindent 4 }} -spec: - selector: - matchLabels: - app: {{ template "mariadb.name" . }} - release: {{ .Release.Name }} - component: master - serviceName: {{ template "master.fullname" . }} - replicas: 1 - updateStrategy: - type: {{ .Values.master.updateStrategy.type }} - {{- if (eq "Recreate" .Values.master.updateStrategy.type) }} - rollingUpdate: null - {{- end }} - template: - metadata: - {{- if .Values.master.annotations }} - annotations: {{- include "mariadb.tplValue" (dict "value" .Values.master.annotations "context" $) | nindent 8 }} - {{- end }} - labels: - app: {{ template "mariadb.name" . }} - chart: {{ template "mariadb.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - component: master - {{- include "mariadb.podLabels" . | nindent 8 }} - spec: - {{- if .Values.schedulerName }} - schedulerName: {{ .Values.schedulerName | quote }} - {{- end }} - serviceAccountName: {{ template "mariadb.serviceAccountName" . }} - {{- if .Values.securityContext.enabled }} - securityContext: - fsGroup: {{ .Values.securityContext.fsGroup }} - runAsUser: {{ .Values.securityContext.runAsUser }} - {{- end }} - {{- if eq .Values.master.antiAffinity "hard" }} - affinity: - {{- with .Values.master.affinity }} -{{ toYaml . | indent 8 }} - {{- end }} - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - topologyKey: "kubernetes.io/hostname" - labelSelector: - matchLabels: - app: {{ template "mariadb.name" . }} - release: {{ .Release.Name }} - {{- else if eq .Values.master.antiAffinity "soft" }} - affinity: - {{- with .Values.master.affinity }} -{{ toYaml . | indent 8 }} - {{- end }} - podAntiAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 1 - podAffinityTerm: - topologyKey: kubernetes.io/hostname - labelSelector: - matchLabels: - app: {{ template "mariadb.name" . }} - release: {{ .Release.Name }} - {{- else}} - {{- with .Values.master.affinity }} - affinity: {{ toYaml . | nindent 8 }} - {{- end }} - {{- end }} - {{- if .Values.master.nodeSelector }} - nodeSelector: {{ toYaml .Values.master.nodeSelector | nindent 8 }} - {{- end -}} - {{- with .Values.master.tolerations }} - tolerations: {{ toYaml . | nindent 8 }} - {{- end }} -{{- include "mariadb.imagePullSecrets" . | indent 6 }} - initContainers: - {{- if .Values.master.extraInitContainers }} -{{ tpl .Values.master.extraInitContainers . | indent 8 }} - {{- end }} - {{- if and .Values.volumePermissions.enabled .Values.master.persistence.enabled }} - - name: volume-permissions - image: {{ template "mariadb.volumePermissions.image" . }} - imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }} - command: ["chown", "-R", "{{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }}", "{{ .Values.master.persistence.mountPath }}"] - securityContext: - runAsUser: 0 - resources: {{ toYaml .Values.volumePermissions.resources | nindent 12 }} - volumeMounts: - - name: data - mountPath: {{ .Values.master.persistence.mountPath }} - {{- end }} - containers: - - name: "mariadb" - image: {{ template "mariadb.image" . }} - imagePullPolicy: {{ .Values.image.pullPolicy | quote }} - env: - {{- if .Values.image.debug}} - - name: BITNAMI_DEBUG - value: "true" - {{- end }} - {{- if .Values.master.extraFlags }} - - name: MARIADB_EXTRA_FLAGS - value: "{{ .Values.master.extraFlags }}" - {{- end }} - {{- if .Values.rootUser.injectSecretsAsVolume }} - - name: MARIADB_ROOT_PASSWORD_FILE - value: {{ default "/opt/bitnami/mariadb/secrets/mariadb-root-password" .Values.rootUser.injectSecretsFile }} - {{- else }} - - name: MARIADB_ROOT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "mariadb.secretName" . }} - key: mariadb-root-password - {{- end }} - {{- if not (empty .Values.db.user) }} - - name: MARIADB_USER - value: "{{ .Values.db.user }}" - {{- if .Values.db.injectSecretsAsVolume }} - - name: MARIADB_PASSWORD_FILE - value: {{ default "/opt/bitnami/mariadb/secrets/mariadb-password" .Values.db.injectSecretsFile }} - {{- else }} - - name: MARIADB_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "mariadb.secretName" . }} - key: mariadb-password - {{- end }} - {{- end }} - - name: MARIADB_DATABASE - value: "{{ .Values.db.name }}" - {{- if .Values.replication.enabled }} - - name: MARIADB_REPLICATION_MODE - value: "master" - - name: MARIADB_REPLICATION_USER - value: "{{ .Values.replication.user }}" - {{- if .Values.replication.injectSecretsAsVolume }} - - name: MARIADB_REPLICATION_PASSWORD_FILE - value: {{ default "/opt/bitnami/mariadb/secrets/mariadb-replication-password" .Values.replication.injectSecretsFile }} - {{- else }} - - name: MARIADB_REPLICATION_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "mariadb.secretName" . }} - key: mariadb-replication-password - {{- end }} - {{- end }} - {{- if .Values.master.extraEnvVars }} - {{- tpl (toYaml .Values.master.extraEnvVars) $ | nindent 12 }} - {{- end }} - {{- if or .Values.master.extraEnvVarsCM .Values.master.extraEnvVarsSecret }} - envFrom: - {{- if .Values.master.extraEnvVarsCM }} - - configMapRef: - name: {{ .Values.master.extraEnvVarsCM }} - {{- end }} - {{- if .Values.master.extraEnvVarsSecret }} - - secretRef: - name: {{ .Values.master.extraEnvVarsSecret }} - {{- end }} - {{- end }} - ports: - - name: mysql - containerPort: 3306 - {{- if .Values.master.livenessProbe.enabled }} - livenessProbe: - exec: - command: - - sh - - -c - - | - password_aux="${MARIADB_ROOT_PASSWORD:-}" - if [ -f "${MARIADB_ROOT_PASSWORD_FILE:-}" ]; then - password_aux=$(cat $MARIADB_ROOT_PASSWORD_FILE) - fi - mysqladmin status -uroot -p$password_aux - initialDelaySeconds: {{ .Values.master.livenessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.master.livenessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.master.livenessProbe.timeoutSeconds }} - successThreshold: {{ .Values.master.livenessProbe.successThreshold }} - failureThreshold: {{ .Values.master.livenessProbe.failureThreshold }} - {{- end }} - {{- if .Values.master.readinessProbe.enabled }} - readinessProbe: - exec: - command: - - sh - - -c - - | - password_aux="${MARIADB_ROOT_PASSWORD:-}" - if [ -f "${MARIADB_ROOT_PASSWORD_FILE:-}" ]; then - password_aux=$(cat $MARIADB_ROOT_PASSWORD_FILE) - fi - mysqladmin status -uroot -p$password_aux - initialDelaySeconds: {{ .Values.master.readinessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.master.readinessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.master.readinessProbe.timeoutSeconds }} - successThreshold: {{ .Values.master.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.master.readinessProbe.failureThreshold }} - {{- end }} - {{- if .Values.master.resources }} - resources: {{ toYaml .Values.master.resources | nindent 12 }} - {{- end }} - volumeMounts: - - name: data - mountPath: {{ .Values.master.persistence.mountPath }} - {{- if .Values.master.persistence.subPath }} - subPath: {{ .Values.master.persistence.subPath }} - {{- end }} - {{- if or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScriptsConfigMap .Values.initdbScripts }} - - name: custom-init-scripts - mountPath: /docker-entrypoint-initdb.d - {{- end }} - {{- if .Values.master.config }} - - name: config - mountPath: /opt/bitnami/mariadb/conf/my.cnf - subPath: my.cnf - {{- end }} - {{- if or .Values.rootUser.injectSecretsAsVolume .Values.db.injectSecretsAsVolume .Values.replication.injectSecretsAsVolume }} - - name: mariadb-credentials - mountPath: /opt/bitnami/mariadb/secrets/ - {{- end }} - {{- if .Values.metrics.enabled }} - - name: metrics - image: {{ template "mariadb.metrics.image" . }} - imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} - env: - {{- if .Values.rootUser.injectSecretsAsVolume }} - - name: MARIADB_ROOT_PASSWORD_FILE - value: {{ default "/opt/bitnami/mysqld-exporter/secrets/mariadb-root-password" .Values.rootUser.injectSecretsFile }} - {{- else }} - - name: MARIADB_ROOT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "mariadb.secretName" . }} - key: mariadb-root-password - {{- end }} - command: - - sh - - -c - - | - password_aux="${MARIADB_ROOT_PASSWORD:-}" - if [ -f "${MARIADB_ROOT_PASSWORD_FILE:-}" ]; then - password_aux=$(cat $MARIADB_ROOT_PASSWORD_FILE) - fi - DATA_SOURCE_NAME="root:${password_aux}@(localhost:3306)/" /bin/mysqld_exporter {{- range .Values.metrics.extraArgs.master }} {{ . }} {{- end }} - ports: - - name: metrics - containerPort: 9104 - {{- if .Values.metrics.livenessProbe.enabled }} - livenessProbe: - httpGet: - path: /metrics - port: metrics - initialDelaySeconds: {{ .Values.metrics.livenessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.metrics.livenessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.metrics.livenessProbe.timeoutSeconds }} - successThreshold: {{ .Values.metrics.livenessProbe.successThreshold }} - failureThreshold: {{ .Values.metrics.livenessProbe.failureThreshold }} - {{- end }} - {{- if .Values.metrics.readinessProbe.enabled }} - readinessProbe: - httpGet: - path: /metrics - port: metrics - initialDelaySeconds: {{ .Values.metrics.readinessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.metrics.readinessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.metrics.readinessProbe.timeoutSeconds }} - successThreshold: {{ .Values.metrics.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.metrics.readinessProbe.failureThreshold }} - {{- end }} - {{- if .Values.metrics.resources }} - resources: {{ toYaml .Values.metrics.resources | nindent 12 }} - {{- end }} - {{- if .Values.rootUser.injectSecretsAsVolume }} - volumeMounts: - - name: mariadb-credentials - mountPath: /opt/bitnami/mysqld-exporter/secrets/ - {{- end }} - {{- end }} - volumes: - {{- if .Values.master.config }} - - name: config - configMap: - name: {{ template "master.fullname" . }} - {{- end }} - {{- if or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScriptsConfigMap .Values.initdbScripts }} - - name: custom-init-scripts - configMap: - name: {{ template "mariadb.initdbScriptsCM" . }} - {{- end }} - {{- if or .Values.rootUser.injectSecretsAsVolume .Values.db.injectSecretsAsVolume .Values.replication.injectSecretsAsVolume }} - - name: mariadb-credentials - secret: - secretName: {{ template "mariadb.secretName" . }} - items: - {{- if .Values.rootUser.injectSecretsAsVolume }} - - key: mariadb-root-password - path: mariadb-root-password - {{- end }} - {{- if .Values.db.injectSecretsAsVolume }} - - key: mariadb-password - path: mariadb-password - {{- end }} - {{- if and .Values.replication.enabled .Values.replication.injectSecretsAsVolume }} - - key: mariadb-replication-password - path: mariadb-replication-password - {{- end }} - {{- end }} -{{- if and .Values.master.persistence.enabled .Values.master.persistence.existingClaim }} - - name: data - persistentVolumeClaim: - claimName: {{ .Values.master.persistence.existingClaim }} -{{- else if not .Values.master.persistence.enabled }} - - name: data - emptyDir: {} -{{- else if and .Values.master.persistence.enabled (not .Values.master.persistence.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: data - labels: - app: "{{ template "mariadb.name" . }}" - component: "master" - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} - spec: - accessModes: - {{- range .Values.master.persistence.accessModes }} - - {{ . | quote }} - {{- end }} - resources: - requests: - storage: {{ .Values.master.persistence.size | quote }} - {{ include "mariadb.master.storageClass" . }} - {{- if .Values.master.persistence.selector }} - selector: {{- include "mariadb.tplValue" (dict "value" .Values.master.persistence.selector "context" $) | nindent 10 }} - {{- end -}} -{{- end }} diff --git a/bitnami/mariadb/templates/master-svc.yaml b/bitnami/mariadb/templates/master-svc.yaml deleted file mode 100644 index 5b1be802a..000000000 --- a/bitnami/mariadb/templates/master-svc.yaml +++ /dev/null @@ -1,47 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ template "mariadb.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - app: "{{ template "mariadb.name" . }}" - component: "master" - chart: "{{ template "mariadb.chart" . }}" - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} -{{- if or .Values.metrics.enabled .Values.master.service.annotations }} - annotations: -{{- if .Values.metrics.enabled }} -{{ toYaml .Values.metrics.annotations | indent 4 }} -{{- end }} -{{- if .Values.master.service.annotations }} -{{ toYaml .Values.master.service.annotations | indent 4 }} -{{- end }} -{{- end }} -spec: - type: {{ .Values.service.type }} - {{- if eq .Values.service.type "ClusterIP" }} - {{- if .Values.service.clusterIp }} - clusterIP: {{ .Values.service.clusterIp.master }} - {{- end }} - {{- end }} - ports: - - name: mysql - port: {{ .Values.service.port }} - targetPort: mysql - {{- if eq .Values.service.type "NodePort" }} - {{- if .Values.service.nodePort }} - {{- if .Values.service.nodePort.master }} - nodePort: {{ .Values.service.nodePort.master }} - {{- end }} - {{- end }} - {{- end }} - {{- if .Values.metrics.enabled }} - - name: metrics - port: 9104 - targetPort: metrics - {{- end }} - selector: - app: "{{ template "mariadb.name" . }}" - component: "master" - release: "{{ .Release.Name }}" diff --git a/bitnami/mariadb/templates/primary/configmap.yaml b/bitnami/mariadb/templates/primary/configmap.yaml new file mode 100644 index 000000000..8ee5f03a9 --- /dev/null +++ b/bitnami/mariadb/templates/primary/configmap.yaml @@ -0,0 +1,18 @@ +{{- if (include "mariadb.primary.createConfigmap" .) }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "mariadb.primary.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: primary + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +data: + my.cnf: |- +{{ .Values.primary.configuration | indent 4 }} +{{- end -}} diff --git a/bitnami/mariadb/templates/primary/initialization-configmap.yaml b/bitnami/mariadb/templates/primary/initialization-configmap.yaml new file mode 100644 index 000000000..826b59775 --- /dev/null +++ b/bitnami/mariadb/templates/primary/initialization-configmap.yaml @@ -0,0 +1,11 @@ +{{- if and .Values.initdbScripts (not .Values.initdbScriptsConfigMap) }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ printf "%s-init-scripts" (include "mariadb.primary.fullname" .) }} + namespace: {{ .Release.Namespace }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: primary +data: +{{- include "common.tplvalues.render" (dict "value" .Values.initdbScripts "context" .) | nindent 2 }} +{{ end }} diff --git a/bitnami/mariadb/templates/primary/pdb.yaml b/bitnami/mariadb/templates/primary/pdb.yaml new file mode 100644 index 000000000..4ca1bf854 --- /dev/null +++ b/bitnami/mariadb/templates/primary/pdb.yaml @@ -0,0 +1,25 @@ +{{- if .Values.primary.pdb.enabled }} +apiVersion: policy/v1beta1 +kind: PodDisruptionBudget +metadata: + name: {{ include "mariadb.primary.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: primary + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + {{- if .Values.primary.pdb.minAvailable }} + minAvailable: {{ .Values.primary.pdb.minAvailable }} + {{- end }} + {{- if .Values.primary.pdb.maxUnavailable }} + maxUnavailable: {{ .Values.primary.pdb.maxUnavailable }} + {{- end }} + selector: + matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }} + app.kubernetes.io/component: primary +{{- end }} diff --git a/bitnami/mariadb/templates/primary/statefulset.yaml b/bitnami/mariadb/templates/primary/statefulset.yaml new file mode 100644 index 000000000..823c169b3 --- /dev/null +++ b/bitnami/mariadb/templates/primary/statefulset.yaml @@ -0,0 +1,322 @@ +apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }} +kind: StatefulSet +metadata: + name: {{ include "mariadb.primary.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: primary + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + replicas: 1 + selector: + matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }} + app.kubernetes.io/component: primary + serviceName: {{ include "mariadb.primary.fullname" . }} + updateStrategy: + type: {{ .Values.primary.updateStrategy }} + {{- if (eq "Recreate" .Values.primary.updateStrategy) }} + rollingUpdate: null + {{- else if .Values.primary.rollingUpdatePartition }} + rollingUpdate: + partition: {{ .Values.primary.rollingUpdatePartition }} + {{- end }} + template: + metadata: + annotations: + {{- if (include "mariadb.primary.createConfigmap" .) }} + checksum/configuration: {{ include (print $.Template.BasePath "/primary/configmap.yaml") . | sha256sum }} + {{- end }} + {{- if .Values.primary.podAnnotations }} + {{- include "common.tplvalues.render" (dict "value" .Values.primary.podAnnotations "context" $) | nindent 8 }} + {{- end }} + labels: {{- include "common.labels.standard" . | nindent 8 }} + app.kubernetes.io/component: primary + spec: + {{- include "mariadb.imagePullSecrets" . | nindent 6 }} + {{- if .Values.schedulerName }} + schedulerName: {{ .Values.schedulerName | quote }} + {{- end }} + serviceAccountName: {{ template "mariadb.serviceAccountName" . }} + {{- if .Values.primary.affinity }} + affinity: {{- include "common.tplvalues.render" (dict "value" .Values.primary.affinity "context" $) | nindent 8 }} + {{- else }} + affinity: + podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.primary.podAffinityPreset "component" "primary" "context" $) | nindent 10 }} + podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.primary.podAntiAffinityPreset "component" "primary" "context" $) | nindent 10 }} + nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.primary.nodeAffinityPreset.type "key" .Values.primary.nodeAffinityPreset.key "values" .Values.primary.nodeAffinityPreset.values) | nindent 10 }} + {{- end }} + {{- if .Values.primary.nodeSelector }} + nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.primary.nodeSelector "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.primary.tolerations }} + tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.primary.tolerations "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName | quote }} + {{- end }} + {{- if .Values.primary.podSecurityContext.enabled }} + securityContext: {{- omit .Values.primary.podSecurityContext "enabled" | toYaml | nindent 8 }} + {{- end }} + {{- if or .Values.primary.initContainers (and .Values.primary.podSecurityContext.enabled .Values.volumePermissions.enabled .Values.primary.persistence.enabled) }} + initContainers: + {{- if .Values.primary.initContainers }} + {{- include "common.tplvalues.render" (dict "value" .Values.primary.initContainers "context" $) | nindent 8 }} + {{- end }} + {{- if and .Values.primary.podSecurityContext.enabled .Values.volumePermissions.enabled .Values.primary.persistence.enabled }} + - name: volume-permissions + image: {{ include "mariadb.volumePermissions.image" . }} + imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }} + command: + - /bin/bash + - -ec + - | + chown -R {{ .Values.primary.containerSecurityContext.runAsUser }}:{{ .Values.primary.podSecurityContext.fsGroup }} /bitnami/mariadb + securityContext: + runAsUser: 0 + {{- if .Values.volumePermissions.resources }} + resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: data + mountPath: /bitnami/mariadb + {{- end }} + {{- end }} + containers: + - name: mariadb + image: {{ include "mariadb.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} + {{- if .Values.primary.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.primary.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.primary.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.primary.command "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.primary.args }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.primary.args "context" $) | nindent 12 }} + {{- end }} + env: + - name: BITNAMI_DEBUG + value: {{ ternary "true" "false" .Values.image.debug | quote }} + {{- if .Values.auth.usePasswordFiles }} + - name: MARIADB_ROOT_PASSWORD_FILE + value: "/opt/bitnami/mariadb/secrets/mariadb-root-password" + {{- else }} + - name: MARIADB_ROOT_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "mariadb.secretName" . }} + key: mariadb-root-password + {{- end }} + {{- if not (empty .Values.auth.username) }} + - name: MARIADB_USER + value: {{ .Values.auth.username | quote }} + {{- if .Values.auth.usePasswordFiles }} + - name: MARIADB_PASSWORD_FILE + value: "/opt/bitnami/mariadb/secrets/mariadb-password" + {{- else }} + - name: MARIADB_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "mariadb.secretName" . }} + key: mariadb-password + {{- end }} + {{- end }} + - name: MARIADB_DATABASE + value: {{ .Values.auth.database | quote }} + {{- if eq .Values.architecture "replication" }} + - name: MARIADB_REPLICATION_MODE + value: "master" + - name: MARIADB_REPLICATION_USER + value: {{ .Values.auth.replicationUser | quote }} + {{- if .Values.auth.usePasswordFiles }} + - name: MARIADB_REPLICATION_PASSWORD_FILE + value: "/opt/bitnami/mariadb/secrets/mariadb-replication-password" + {{- else }} + - name: MARIADB_REPLICATION_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "mariadb.secretName" . }} + key: mariadb-replication-password + {{- end }} + {{- end }} + {{- if .Values.primary.extraFlags }} + - name: MARIADB_EXTRA_FLAGS + value: "{{ .Values.primary.extraFlags }}" + {{- end }} + {{- if .Values.primary.extraEnvVars }} + {{- include "common.tplvalues.render" (dict "value" .Values.primary.extraEnvVars "context" $) | nindent 12 }} + {{- end }} + {{- if or .Values.primary.extraEnvVarsCM .Values.primary.extraEnvVarsSecret }} + envFrom: + {{- if .Values.primary.extraEnvVarsCM }} + - configMapRef: + name: {{ .Values.primary.extraEnvVarsCM }} + {{- end }} + {{- if .Values.primary.extraEnvVarsSecret }} + - secretRef: + name: {{ .Values.primary.extraEnvVarsSecret }} + {{- end }} + {{- end }} + ports: + - name: mysql + containerPort: 3306 + {{- if .Values.primary.livenessProbe.enabled }} + livenessProbe: {{- omit .Values.primary.livenessProbe "enabled" | toYaml | nindent 12 }} + exec: + command: + - /bin/bash + - -ec + - | + password_aux="${MARIADB_ROOT_PASSWORD:-}" + if [[ -f "${MARIADB_ROOT_PASSWORD_FILE:-}" ]]; then + password_aux=$(cat "$MARIADB_ROOT_PASSWORD_FILE") + fi + mysqladmin status -uroot -p"${password_aux}" + {{- else if .Values.primary.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.primary.customLivenessProbe "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.primary.readinessProbe.enabled }} + readinessProbe: {{- omit .Values.primary.readinessProbe "enabled" | toYaml | nindent 12 }} + exec: + command: + - /bin/bash + - -ec + - | + password_aux="${MARIADB_ROOT_PASSWORD:-}" + if [[ -f "${MARIADB_ROOT_PASSWORD_FILE:-}" ]]; then + password_aux=$(cat "$MARIADB_ROOT_PASSWORD_FILE") + fi + mysqladmin status -uroot -p"${password_aux}" + {{- else if .Values.primary.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.primary.customReadinessProbe "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.primary.resources }} + resources: {{ toYaml .Values.primary.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: data + mountPath: /bitnami/mariadb + {{- if or .Values.initdbScriptsConfigMap .Values.initdbScripts }} + - name: custom-init-scripts + mountPath: /docker-entrypoint-initdb.d + {{- end }} + {{- if or .Values.primary.configuration .Values.primary.existingConfigmap }} + - name: config + mountPath: /opt/bitnami/mariadb/conf/my.cnf + subPath: my.cnf + {{- end }} + {{- if .Values.auth.usePasswordFiles }} + - name: mariadb-credentials + mountPath: /opt/bitnami/mariadb/secrets/ + {{- end }} + {{- if .Values.primary.extraVolumeMounts }} + {{- include "common.tplvalues.render" (dict "value" .Values.primary.extraVolumeMounts "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.metrics.enabled }} + - name: metrics + image: {{ include "mariadb.metrics.image" . }} + imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} + env: + {{- if .Values.auth.usePasswordFiles }} + - name: MARIADB_ROOT_PASSWORD_FILE + value: "/opt/bitnami/mysqld-exporter/secrets/mariadb-root-password" + {{- else }} + - name: MARIADB_ROOT_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "mariadb.secretName" . }} + key: mariadb-root-password + {{- end }} + command: + - /bin/bash + - -ec + - | + password_aux="${MARIADB_ROOT_PASSWORD:-}" + if [[ -f "${MARIADB_ROOT_PASSWORD_FILE:-}" ]]; then + password_aux=$(cat "$MARIADB_ROOT_PASSWORD_FILE") + fi + DATA_SOURCE_NAME="root:${password_aux}@(localhost:3306)/" /bin/mysqld_exporter {{- range .Values.metrics.extraArgs.primary }} {{ . }} {{- end }} + ports: + - name: metrics + containerPort: 9104 + {{- if .Values.metrics.livenessProbe.enabled }} + livenessProbe: {{- omit .Values.metrics.livenessProbe "enabled" | toYaml | nindent 12 }} + httpGet: + path: /metrics + port: metrics + {{- end }} + {{- if .Values.metrics.readinessProbe.enabled }} + readinessProbe: {{- omit .Values.metrics.readinessProbe "enabled" | toYaml | nindent 12 }} + httpGet: + path: /metrics + port: metrics + {{- end }} + {{- if .Values.metrics.resources }} + resources: {{- toYaml .Values.metrics.resources | nindent 12 }} + {{- end }} + {{- if .Values.auth.usePasswordFiles }} + volumeMounts: + - name: mariadb-credentials + mountPath: /opt/bitnami/mysqld-exporter/secrets/ + {{- end }} + {{- end }} + {{- if .Values.primary.sidecars }} + {{- include "common.tplvalues.render" (dict "value" .Values.primary.sidecars "context" $) | nindent 8 }} + {{- end }} + volumes: + {{- if or .Values.primary.configuration .Values.primary.existingConfigmap }} + - name: config + configMap: + name: {{ include "mariadb.primary.configmapName" . }} + {{- end }} + {{- if or .Values.initdbScriptsConfigMap .Values.initdbScripts }} + - name: custom-init-scripts + configMap: + name: {{ template "mariadb.initdbScriptsCM" . }} + {{- end }} + {{- if .Values.auth.usePasswordFiles }} + - name: mariadb-credentials + secret: + secretName: {{ template "mariadb.secretName" . }} + items: + - key: mariadb-root-password + path: mariadb-root-password + - key: mariadb-password + path: mariadb-password + - key: mariadb-replication-password + path: mariadb-replication-password + {{- end }} + {{- if .Values.primary.extraVolumes }} + {{- include "common.tplvalues.render" (dict "value" .Values.primary.extraVolumes "context" $) | nindent 8 }} + {{- end }} + {{- if and .Values.primary.persistence.enabled .Values.primary.persistence.existingClaim }} + - name: data + persistentVolumeClaim: + claimName: {{ tpl .Values.primary.persistence.existingClaim . }} + {{- else if not .Values.primary.persistence.enabled }} + - name: data + emptyDir: {} + {{- else if and .Values.primary.persistence.enabled (not .Values.primary.persistence.existingClaim) }} + volumeClaimTemplates: + - metadata: + name: data + labels: {{ include "common.labels.matchLabels" . | nindent 10 }} + app.kubernetes.io/component: primary + spec: + accessModes: + {{- range .Values.primary.persistence.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.primary.persistence.size | quote }} + {{ include "common.storage.class" (dict "persistence" .Values.primary.persistence "global" .Values.global) }} + {{- if .Values.primary.persistence.selector }} + selector: {{- include "common.tplvalues.render" (dict "value" .Values.primary.persistence.selector "context" $) | nindent 10 }} + {{- end -}} + {{- end }} diff --git a/bitnami/mariadb/templates/primary/svc.yaml b/bitnami/mariadb/templates/primary/svc.yaml new file mode 100644 index 000000000..9b60dd6df --- /dev/null +++ b/bitnami/mariadb/templates/primary/svc.yaml @@ -0,0 +1,49 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "mariadb.primary.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: primary + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.primary.service.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.primary.service.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if and .Values.metrics.enabled .Values.metrics.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.annotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + type: {{ .Values.primary.service.type }} + {{- if and (eq .Values.primary.service.type "ClusterIP") .Values.primary.service.clusterIP }} + clusterIP: {{ .Values.primary.service.clusterIP }} + {{- end }} + {{- if and .Values.primary.service.loadBalancerIP (eq .Values.primary.service.type "LoadBalancer") }} + loadBalancerIP: {{ .Values.primary.service.loadBalancerIP }} + {{- end }} + {{- if and (eq .Values.primary.service.type "LoadBalancer") .Values.primary.service.loadBalancerSourceRanges }} + loadBalancerSourceRanges: {{- toYaml .Values.primary.service.loadBalancerSourceRanges | nindent 4 }} + {{- end }} + ports: + - name: mysql + port: {{ .Values.primary.service.port }} + protocol: TCP + targetPort: mysql + {{- if (and (or (eq .Values.primary.service.type "NodePort") (eq .Values.primary.service.type "LoadBalancer")) .Values.primary.service.nodePort) }} + nodePort: {{ .Values.primary.service.nodePort }} + {{- else if eq .Values.primary.service.type "ClusterIP" }} + nodePort: null + {{- end }} + {{- if .Values.metrics.enabled }} + - name: metrics + port: 9104 + protocol: TCP + targetPort: metrics + {{- end }} + selector: {{ include "common.labels.matchLabels" . | nindent 4 }} + app.kubernetes.io/component: primary diff --git a/bitnami/mariadb/templates/role.yaml b/bitnami/mariadb/templates/role.yaml index 296c439ff..5dee7caf8 100644 --- a/bitnami/mariadb/templates/role.yaml +++ b/bitnami/mariadb/templates/role.yaml @@ -2,13 +2,15 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: {{ template "master.fullname" . }} + name: {{ include "common.names.fullname" . }} namespace: {{ .Release.Namespace }} - labels: - app: "{{ template "mariadb.name" . }}" - chart: "{{ template "mariadb.chart" . }}" - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} rules: - apiGroups: - "" diff --git a/bitnami/mariadb/templates/rolebinding.yaml b/bitnami/mariadb/templates/rolebinding.yaml index 223eda95b..a94b4b24c 100644 --- a/bitnami/mariadb/templates/rolebinding.yaml +++ b/bitnami/mariadb/templates/rolebinding.yaml @@ -2,18 +2,20 @@ kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: {{ template "master.fullname" . }} + name: {{ include "common.names.fullname" . }} namespace: {{ .Release.Namespace }} - labels: - app: "{{ template "mariadb.name" . }}" - chart: "{{ template "mariadb.chart" . }}" - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} subjects: - kind: ServiceAccount - name: {{ template "mariadb.serviceAccountName" . }} + name: {{ include "mariadb.serviceAccountName" . }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: {{ template "master.fullname" . }} + name: {{ include "common.names.fullname" . -}} {{- end }} diff --git a/bitnami/mariadb/templates/secondary/configmap.yaml b/bitnami/mariadb/templates/secondary/configmap.yaml new file mode 100644 index 000000000..e672c05c8 --- /dev/null +++ b/bitnami/mariadb/templates/secondary/configmap.yaml @@ -0,0 +1,18 @@ +{{- if (include "mariadb.secondary.createConfigmap" .) }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "mariadb.secondary.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: secondary + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +data: + my.cnf: |- +{{ .Values.secondary.configuration | indent 4 }} +{{- end -}} diff --git a/bitnami/mariadb/templates/secondary/pdb.yaml b/bitnami/mariadb/templates/secondary/pdb.yaml new file mode 100644 index 000000000..f5c7e2683 --- /dev/null +++ b/bitnami/mariadb/templates/secondary/pdb.yaml @@ -0,0 +1,25 @@ +{{- if and (eq .Values.architecture "replication") .Values.secondary.pdb.enabled }} +apiVersion: policy/v1beta1 +kind: PodDisruptionBudget +metadata: + name: {{ include "mariadb.secondary.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: secondary + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + {{- if .Values.secondary.pdb.minAvailable }} + minAvailable: {{ .Values.secondary.pdb.minAvailable }} + {{- end }} + {{- if .Values.secondary.pdb.maxUnavailable }} + maxUnavailable: {{ .Values.secondary.pdb.maxUnavailable }} + {{- end }} + selector: + matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }} + app.kubernetes.io/component: secondary +{{- end }} diff --git a/bitnami/mariadb/templates/secondary/statefulset.yaml b/bitnami/mariadb/templates/secondary/statefulset.yaml new file mode 100644 index 000000000..4d7a785e4 --- /dev/null +++ b/bitnami/mariadb/templates/secondary/statefulset.yaml @@ -0,0 +1,297 @@ +{{- if eq .Values.architecture "replication" }} +apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }} +kind: StatefulSet +metadata: + name: {{ include "mariadb.secondary.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: secondary + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.secondary.replicaCount }} + selector: + matchLabels: {{ include "common.labels.matchLabels" . | nindent 6 }} + app.kubernetes.io/component: secondary + serviceName: {{ include "mariadb.secondary.fullname" . }} + updateStrategy: + type: {{ .Values.secondary.updateStrategy }} + {{- if (eq "Recreate" .Values.secondary.updateStrategy) }} + rollingUpdate: null + {{- else if .Values.secondary.rollingUpdatePartition }} + rollingUpdate: + partition: {{ .Values.secondary.rollingUpdatePartition }} + {{- end }} + template: + metadata: + annotations: + {{- if (include "mariadb.secondary.createConfigmap" .) }} + checksum/configuration: {{ include (print $.Template.BasePath "/secondary/configmap.yaml") . | sha256sum }} + {{- end }} + {{- if .Values.secondary.podAnnotations }} + {{- include "common.tplvalues.render" (dict "value" .Values.secondary.podAnnotations "context" $) | nindent 8 }} + {{- end }} + labels: {{- include "common.labels.standard" . | nindent 8 }} + app.kubernetes.io/component: secondary + spec: + {{- include "mariadb.imagePullSecrets" . | nindent 6 }} + {{- if .Values.schedulerName }} + schedulerName: {{ .Values.schedulerName | quote }} + {{- end }} + serviceAccountName: {{ template "mariadb.serviceAccountName" . }} + {{- if .Values.secondary.affinity }} + affinity: {{- include "common.tplvalues.render" (dict "value" .Values.secondary.affinity "context" $) | nindent 8 }} + {{- else }} + affinity: + podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.secondary.podAffinityPreset "component" "secondary" "context" $) | nindent 10 }} + podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.secondary.podAntiAffinityPreset "component" "secondary" "context" $) | nindent 10 }} + nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.secondary.nodeAffinityPreset.type "key" .Values.secondary.nodeAffinityPreset.key "values" .Values.secondary.nodeAffinityPreset.values) | nindent 10 }} + {{- end }} + {{- if .Values.secondary.nodeSelector }} + nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.secondary.nodeSelector "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.secondary.tolerations }} + tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.secondary.tolerations "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName | quote }} + {{- end }} + {{- if .Values.secondary.podSecurityContext.enabled }} + securityContext: {{- omit .Values.secondary.podSecurityContext "enabled" | toYaml | nindent 8 }} + {{- end }} + {{- if or .Values.secondary.initContainers (and .Values.secondary.podSecurityContext.enabled .Values.volumePermissions.enabled .Values.secondary.persistence.enabled) }} + initContainers: + {{- if .Values.secondary.initContainers }} + {{- include "common.tplvalues.render" (dict "value" .Values.secondary.initContainers "context" $) | nindent 8 }} + {{- end }} + {{- if and .Values.secondary.podSecurityContext.enabled .Values.volumePermissions.enabled .Values.secondary.persistence.enabled }} + - name: volume-permissions + image: {{ include "mariadb.volumePermissions.image" . }} + imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }} + command: + - /bin/bash + - -ec + - | + chown -R {{ .Values.secondary.containerSecurityContext.runAsUser }}:{{ .Values.secondary.podSecurityContext.fsGroup }} /bitnami/mariadb + securityContext: + runAsUser: 0 + {{- if .Values.volumePermissions.resources }} + resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: data + mountPath: /bitnami/mariadb + {{- end }} + {{- end }} + containers: + - name: mariadb + image: {{ include "mariadb.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} + {{- if .Values.secondary.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.secondary.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.secondary.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.secondary.command "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.secondary.args }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.secondary.args "context" $) | nindent 12 }} + {{- end }} + env: + - name: BITNAMI_DEBUG + value: {{ ternary "true" "false" .Values.image.debug | quote }} + - name: MARIADB_REPLICATION_MODE + value: "slave" + - name: MARIADB_MASTER_HOST + value: {{ include "mariadb.primary.fullname" . }} + - name: MARIADB_MASTER_PORT_NUMBER + value: {{ .Values.primary.service.port | quote }} + - name: MARIADB_MASTER_ROOT_USER + value: "root" + {{- if .Values.auth.usePasswordFiles }} + - name: MARIADB_MASTER_ROOT_PASSWORD_FILE + value: "/opt/bitnami/mariadb/secrets/mariadb-root-password" + {{- else }} + - name: MARIADB_MASTER_ROOT_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "mariadb.secretName" . }} + key: mariadb-root-password + {{- end }} + - name: MARIADB_REPLICATION_USER + value: {{ .Values.auth.replicationUser | quote }} + {{- if .Values.auth.usePasswordFiles }} + - name: MARIADB_REPLICATION_PASSWORD_FILE + value: "/opt/bitnami/mariadb/secrets/mariadb-replication-password" + {{- else }} + - name: MARIADB_REPLICATION_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "mariadb.secretName" . }} + key: mariadb-replication-password + {{- end }} + {{- if .Values.secondary.extraFlags }} + - name: MARIADB_EXTRA_FLAGS + value: "{{ .Values.secondary.extraFlags }}" + {{- end }} + {{- if .Values.secondary.extraEnvVars }} + {{- include "common.tplvalues.render" (dict "value" .Values.secondary.extraEnvVars "context" $) | nindent 12 }} + {{- end }} + {{- if or .Values.secondary.extraEnvVarsCM .Values.secondary.extraEnvVarsSecret }} + envFrom: + {{- if .Values.secondary.extraEnvVarsCM }} + - configMapRef: + name: {{ .Values.secondary.extraEnvVarsCM }} + {{- end }} + {{- if .Values.secondary.extraEnvVarsSecret }} + - secretRef: + name: {{ .Values.secondary.extraEnvVarsSecret }} + {{- end }} + {{- end }} + ports: + - name: mysql + containerPort: 3306 + {{- if .Values.secondary.livenessProbe.enabled }} + livenessProbe: {{- omit .Values.secondary.livenessProbe "enabled" | toYaml | nindent 12 }} + exec: + command: + - /bin/bash + - -ec + - | + password_aux="${MARIADB_MASTER_ROOT_PASSWORD:-}" + if [[ -f "${MARIADB_MASTER_ROOT_PASSWORD_FILE:-}" ]]; then + password_aux=$(cat "$MARIADB_MASTER_ROOT_PASSWORD_FILE") + fi + mysqladmin status -uroot -p"${password_aux}" + {{- else if .Values.secondary.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.secondary.customLivenessProbe "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.secondary.readinessProbe.enabled }} + readinessProbe: {{- omit .Values.secondary.readinessProbe "enabled" | toYaml | nindent 12 }} + exec: + command: + - /bin/bash + - -ec + - | + password_aux="${MARIADB_MASTER_ROOT_PASSWORD:-}" + if [[ -f "${MARIADB_MASTER_ROOT_PASSWORD_FILE:-}" ]]; then + password_aux=$(cat "$MARIADB_MASTER_ROOT_PASSWORD_FILE") + fi + mysqladmin status -uroot -p"${password_aux}" + {{- else if .Values.secondary.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.secondary.customReadinessProbe "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.secondary.resources }} + resources: {{ toYaml .Values.secondary.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: data + mountPath: /bitnami/mariadb + {{- if or .Values.secondary.configuration .Values.secondary.existingConfigmap }} + - name: config + mountPath: /opt/bitnami/mariadb/conf/my.cnf + subPath: my.cnf + {{- end }} + {{- if .Values.auth.usePasswordFiles }} + - name: mariadb-credentials + mountPath: /opt/bitnami/mariadb/secrets/ + {{- end }} + {{- if .Values.secondary.extraVolumeMounts }} + {{- include "common.tplvalues.render" (dict "value" .Values.secondary.extraVolumeMounts "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.metrics.enabled }} + - name: metrics + image: {{ include "mariadb.metrics.image" . }} + imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} + env: + {{- if .Values.auth.usePasswordFiles }} + - name: MARIADB_ROOT_PASSWORD_FILE + value: "/opt/bitnami/mysqld-exporter/secrets/mariadb-root-password" + {{- else }} + - name: MARIADB_ROOT_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "mariadb.secretName" . }} + key: mariadb-root-password + {{- end }} + command: + - /bin/bash + - -ec + - | + password_aux="${MARIADB_ROOT_PASSWORD:-}" + if [[ -f "${MARIADB_ROOT_PASSWORD_FILE:-}" ]]; then + password_aux=$(cat "$MARIADB_ROOT_PASSWORD_FILE") + fi + DATA_SOURCE_NAME="root:${password_aux}@(localhost:3306)/" /bin/mysqld_exporter {{- range .Values.metrics.extraArgs.secondary }} {{ . }} {{- end }} + ports: + - name: metrics + containerPort: 9104 + {{- if .Values.metrics.livenessProbe.enabled }} + livenessProbe: {{- omit .Values.metrics.livenessProbe "enabled" | toYaml | nindent 12 }} + httpGet: + path: /metrics + port: metrics + {{- end }} + {{- if .Values.metrics.readinessProbe.enabled }} + readinessProbe: {{- omit .Values.metrics.readinessProbe "enabled" | toYaml | nindent 12 }} + httpGet: + path: /metrics + port: metrics + {{- end }} + {{- if .Values.metrics.resources }} + resources: {{- toYaml .Values.metrics.resources | nindent 12 }} + {{- end }} + {{- if .Values.auth.usePasswordFiles }} + volumeMounts: + - name: mariadb-credentials + mountPath: /opt/bitnami/mysqld-exporter/secrets/ + {{- end }} + {{- end }} + {{- if .Values.secondary.sidecars }} + {{- include "common.tplvalues.render" (dict "value" .Values.secondary.sidecars "context" $) | nindent 8 }} + {{- end }} + volumes: + {{- if or .Values.secondary.configuration .Values.secondary.existingConfigmap }} + - name: config + configMap: + name: {{ include "mariadb.secondary.configmapName" . }} + {{- end }} + {{- if .Values.auth.usePasswordFiles }} + - name: mariadb-credentials + secret: + secretName: {{ template "mariadb.secretName" . }} + items: + - key: mariadb-root-password + path: mariadb-root-password + - key: mariadb-replication-password + path: mariadb-replication-password + {{- end }} + {{- if .Values.secondary.extraVolumes }} + {{- include "common.tplvalues.render" (dict "value" .Values.secondary.extraVolumes "context" $) | nindent 8 }} + {{- end }} + {{- if not .Values.secondary.persistence.enabled }} + - name: data + emptyDir: {} + {{- else }} + volumeClaimTemplates: + - metadata: + name: data + labels: {{ include "common.labels.matchLabels" . | nindent 10 }} + app.kubernetes.io/component: secondary + spec: + accessModes: + {{- range .Values.secondary.persistence.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.secondary.persistence.size | quote }} + {{ include "common.storage.class" (dict "persistence" .Values.secondary.persistence "global" .Values.global) }} + {{- if .Values.secondary.persistence.selector }} + selector: {{- include "common.tplvalues.render" (dict "value" .Values.secondary.persistence.selector "context" $) | nindent 10 }} + {{- end -}} + {{- end }} +{{- end }} diff --git a/bitnami/mariadb/templates/secondary/svc.yaml b/bitnami/mariadb/templates/secondary/svc.yaml new file mode 100644 index 000000000..a0da81207 --- /dev/null +++ b/bitnami/mariadb/templates/secondary/svc.yaml @@ -0,0 +1,51 @@ +{{- if eq .Values.architecture "replication" }} +apiVersion: v1 +kind: Service +metadata: + name: {{ include "mariadb.secondary.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: secondary + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.secondary.service.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.secondary.service.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if and .Values.metrics.enabled .Values.metrics.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.annotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + type: {{ .Values.secondary.service.type }} + {{- if and (eq .Values.secondary.service.type "ClusterIP") .Values.secondary.service.clusterIP }} + clusterIP: {{ .Values.secondary.service.clusterIP }} + {{- end }} + {{- if and .Values.secondary.service.loadBalancerIP (eq .Values.secondary.service.type "LoadBalancer") }} + loadBalancerIP: {{ .Values.secondary.service.loadBalancerIP }} + {{- end }} + {{- if and (eq .Values.secondary.service.type "LoadBalancer") .Values.secondary.service.loadBalancerSourceRanges }} + loadBalancerSourceRanges: {{- toYaml .Values.secondary.service.loadBalancerSourceRanges | nindent 4 }} + {{- end }} + ports: + - name: mysql + port: {{ .Values.secondary.service.port }} + protocol: TCP + targetPort: mysql + {{- if (and (or (eq .Values.secondary.service.type "NodePort") (eq .Values.secondary.service.type "LoadBalancer")) .Values.secondary.service.nodePort) }} + nodePort: {{ .Values.secondary.service.nodePort }} + {{- else if eq .Values.secondary.service.type "ClusterIP" }} + nodePort: null + {{- end }} + {{- if .Values.metrics.enabled }} + - name: metrics + port: 9104 + protocol: TCP + targetPort: metrics + {{- end }} + selector: {{ include "common.labels.matchLabels" . | nindent 4 }} + app.kubernetes.io/component: secondary +{{- end }} diff --git a/bitnami/mariadb/templates/secrets.yaml b/bitnami/mariadb/templates/secrets.yaml index 5cb886af8..932552869 100644 --- a/bitnami/mariadb/templates/secrets.yaml +++ b/bitnami/mariadb/templates/secrets.yaml @@ -1,44 +1,37 @@ -{{- if (not .Values.existingSecret) -}} +{{- if (include "mariadb.createSecret" .) }} apiVersion: v1 kind: Secret metadata: - name: {{ template "mariadb.fullname" . }} + name: {{ include "common.names.fullname" . }} namespace: {{ .Release.Namespace }} - labels: - app: "{{ template "mariadb.name" . }}" - chart: "{{ template "mariadb.chart" . }}" - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} - {{- if .Values.secret.annotations }} - annotations: {{- include "mariadb.tplValue" (dict "value" .Values.secret.annotations "context" $) | nindent 4 }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} type: Opaque -{{- if .Values.secret.requirePasswords }} data: - {{- if not (empty .Values.rootUser.password) }} - mariadb-root-password: "{{ .Values.rootUser.password | b64enc }}" - {{- else if (not .Values.rootUser.forcePassword) }} - mariadb-root-password: "{{ randAlphaNum 10 | b64enc }}" - {{ else }} - mariadb-root-password: {{ required "A MariaDB Root Password is required!" .Values.rootUser.password }} - {{- end }} - {{- if not (empty .Values.db.user) }} - {{- if not (empty .Values.db.password) }} - mariadb-password: "{{ .Values.db.password | b64enc }}" - {{- else if (not .Values.db.forcePassword) }} - mariadb-password: "{{ randAlphaNum 10 | b64enc }}" + {{- if not (empty .Values.auth.rootPassword) }} + mariadb-root-password: {{ .Values.auth.rootPassword | b64enc | quote }} + {{- else if (not .Values.auth.forcePassword) }} + mariadb-root-password: {{ randAlphaNum 10 | b64enc | quote }} {{- else }} - mariadb-password: {{ required "A MariaDB Database Password is required!" .Values.db.password }} + mariadb-root-password: {{ required "A MariaDB Root Password is required!" .Values.auth.rootPassword }} {{- end }} - {{- end }} - {{- if .Values.replication.enabled }} - {{- if not (empty .Values.replication.password) }} - mariadb-replication-password: "{{ .Values.replication.password | b64enc }}" - {{- else if (not .Values.replication.forcePassword) }} - mariadb-replication-password: "{{ randAlphaNum 10 | b64enc }}" + {{- if and (not (empty .Values.auth.username)) (not (empty .Values.auth.password)) }} + mariadb-password: {{ .Values.auth.password | b64enc | quote }} + {{- else if (not .Values.auth.forcePassword) }} + mariadb-password: {{ randAlphaNum 10 | b64enc | quote }} {{- else }} - mariadb-replication-password: {{ required "A MariaDB Replication Password is required!" .Values.replication.password }} + mariadb-password: {{ required "A MariaDB Database Password is required!" .Values.auth.password }} {{- end }} + {{- if and (eq .Values.architecture "replication") (not (empty .Values.auth.replicationPassword)) }} + mariadb-replication-password: {{ .Values.auth.replicationPassword | b64enc | quote }} + {{- else if (not .Values.auth.forcePassword) }} + mariadb-replication-password: {{ randAlphaNum 10 | b64enc | quote }} + {{- else }} + mariadb-replication-password: {{ required "A MariaDB Replication Password is required!" .Values.rauth.replicationPassword }} {{- end }} {{- end }} -{{- end }} diff --git a/bitnami/mariadb/templates/serviceaccount.yaml b/bitnami/mariadb/templates/serviceaccount.yaml index 1611e9cef..ec8368586 100644 --- a/bitnami/mariadb/templates/serviceaccount.yaml +++ b/bitnami/mariadb/templates/serviceaccount.yaml @@ -2,12 +2,17 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ template "mariadb.serviceAccountName" . }} + name: {{ include "mariadb.serviceAccountName" . }} namespace: {{ .Release.Namespace }} - labels: - app: "{{ template "mariadb.name" . }}" - chart: "{{ template "mariadb.chart" . }}" - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} - annotations: {{- include "mariadb.tplValue" (dict "value" .Values.serviceAccount.annotations "context" $) | nindent 4 }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + annotations: + {{- if .Values.serviceAccount.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.serviceAccount.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} {{- end }} diff --git a/bitnami/mariadb/templates/servicemonitor.yaml b/bitnami/mariadb/templates/servicemonitor.yaml index 696a5c06f..273e58e99 100644 --- a/bitnami/mariadb/templates/servicemonitor.yaml +++ b/bitnami/mariadb/templates/servicemonitor.yaml @@ -2,34 +2,40 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "mariadb.fullname" . }} + name: {{ include "common.names.fullname" . }} {{- if .Values.metrics.serviceMonitor.namespace }} namespace: {{ .Values.metrics.serviceMonitor.namespace }} {{- else }} namespace: {{ .Release.Namespace }} {{- end }} - labels: - app: "{{ template "mariadb.name" . }}" - chart: {{ template "mariadb.chart" . }} - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} - {{- range $key, $value := .Values.metrics.serviceMonitor.selector }} - {{ $key }}: {{ $value | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} + {{- if .Values.metrics.serviceMonitor.additionalLabels }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.additionalLabels "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: - selector: - matchLabels: - app: {{ template "mariadb.name" . }} - release: {{ .Release.Name | quote }} endpoints: - - port: metrics - {{- if .Values.metrics.serviceMonitor.interval }} - interval: {{ .Values.metrics.serviceMonitor.interval }} - {{- end }} - {{- if .Values.metrics.serviceMonitor.scrapeTimeout }} - scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }} - {{- end }} + - port: metrics + {{- if .Values.metrics.serviceMonitor.interval }} + interval: {{ .Values.metrics.serviceMonitor.interval }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.scrapeTimeout }} + scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.honorLabels }} + honorLabels: {{ .Values.metrics.serviceMonitor.honorLabels }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.relabellings }} + metricRelabelings: {{- toYaml .Values.metrics.serviceMonitor.relabellings | nindent 6 }} + {{- end }} namespaceSelector: matchNames: - - {{ .Release.Namespace }} + - {{ .Release.Namespace }} + selector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} {{- end }} diff --git a/bitnami/mariadb/templates/slave-configmap.yaml b/bitnami/mariadb/templates/slave-configmap.yaml deleted file mode 100644 index 21b0579d5..000000000 --- a/bitnami/mariadb/templates/slave-configmap.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if and .Values.replication.enabled .Values.slave.config }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "slave.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - app: "{{ template "mariadb.name" . }}" - component: "slave" - chart: "{{ template "mariadb.chart" . }}" - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} -data: - my.cnf: |- -{{ .Values.slave.config | indent 4 }} -{{- end }} diff --git a/bitnami/mariadb/templates/slave-pdb.yaml b/bitnami/mariadb/templates/slave-pdb.yaml deleted file mode 100644 index 40f357274..000000000 --- a/bitnami/mariadb/templates/slave-pdb.yaml +++ /dev/null @@ -1,27 +0,0 @@ -{{- if .Values.replication.enabled }} -{{- if .Values.slave.podDisruptionBudget.enabled }} -apiVersion: policy/v1beta1 -kind: PodDisruptionBudget -metadata: - name: {{ template "mariadb.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - app: "{{ template "mariadb.name" . }}" - component: "slave" - chart: {{ template "mariadb.chart" . }} - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} -spec: -{{- if .Values.slave.podDisruptionBudget.minAvailable }} - minAvailable: {{ .Values.slave.podDisruptionBudget.minAvailable }} -{{- end }} -{{- if .Values.slave.podDisruptionBudget.maxUnavailable }} - maxUnavailable: {{ .Values.slave.podDisruptionBudget.maxUnavailable }} -{{- end }} - selector: - matchLabels: - app: "{{ template "mariadb.name" . }}" - component: "slave" - release: {{ .Release.Name | quote }} -{{- end }} -{{- end }} diff --git a/bitnami/mariadb/templates/slave-statefulset.yaml b/bitnami/mariadb/templates/slave-statefulset.yaml deleted file mode 100644 index aab861f39..000000000 --- a/bitnami/mariadb/templates/slave-statefulset.yaml +++ /dev/null @@ -1,317 +0,0 @@ -{{- if .Values.replication.enabled }} -apiVersion: {{ template "mariadb.statefulset.apiVersion" . }} -kind: StatefulSet -metadata: - name: {{ template "slave.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - app: {{ template "mariadb.name" . }} - chart: {{ template "mariadb.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - component: slave - {{- include "mariadb.podLabels" . | nindent 4 }} -spec: - selector: - matchLabels: - app: {{ template "mariadb.name" . }} - release: {{ .Release.Name }} - component: slave - serviceName: {{ template "slave.fullname" . }} - replicas: {{ .Values.slave.replicas }} - updateStrategy: - type: {{ .Values.slave.updateStrategy.type }} - {{- if (eq "Recreate" .Values.slave.updateStrategy.type) }} - rollingUpdate: null - {{- end }} - template: - metadata: - {{- if .Values.slave.annotations }} - annotations: {{- include "mariadb.tplValue" (dict "value" .Values.slave.annotations "context" $) | nindent 8 }} - {{- end }} - labels: - app: {{ template "mariadb.name" . }} - chart: {{ template "mariadb.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - component: slave - {{- include "mariadb.podLabels" . | nindent 8 }} - spec: - {{- if .Values.schedulerName }} - schedulerName: {{ .Values.schedulerName | quote }} - {{- end }} - serviceAccountName: {{ template "mariadb.serviceAccountName" . }} - {{- if .Values.securityContext.enabled }} - securityContext: - fsGroup: {{ .Values.securityContext.fsGroup }} - runAsUser: {{ .Values.securityContext.runAsUser }} - {{- end }} - {{- if eq .Values.slave.antiAffinity "hard" }} - affinity: - {{- with .Values.slave.affinity }} -{{ toYaml . | indent 8 }} - {{- end }} - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - topologyKey: "kubernetes.io/hostname" - labelSelector: - matchLabels: - app: {{ template "mariadb.name" . }} - release: {{ .Release.Name }} - {{- else if eq .Values.slave.antiAffinity "soft" }} - affinity: - {{- with .Values.slave.affinity }} -{{ toYaml . | indent 8 }} - {{- end }} - podAntiAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 1 - podAffinityTerm: - topologyKey: kubernetes.io/hostname - labelSelector: - matchLabels: - app: {{ template "mariadb.name" . }} - release: {{ .Release.Name }} - {{- else}} - {{- with .Values.slave.affinity }} - affinity: {{ toYaml . | nindent 8 }} - {{- end }} - {{- end }} - {{- if .Values.slave.nodeSelector }} - nodeSelector: {{ toYaml .Values.slave.nodeSelector | nindent 8 }} - {{- end -}} - {{- with .Values.slave.tolerations }} - tolerations: {{ toYaml . | nindent 8 }} - {{- end }} -{{- include "mariadb.imagePullSecrets" . | indent 6 }} - initContainers: - {{- if .Values.master.extraInitContainers }} - {{- tpl .Values.master.extraInitContainers . | nindent 8 }} - {{- end }} - {{- if and .Values.volumePermissions.enabled .Values.slave.persistence.enabled }} - - name: volume-permissions - image: {{ template "mariadb.volumePermissions.image" . }} - imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }} - command: ["chown", "-R", "{{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }}", "/bitnami/mariadb"] - securityContext: - runAsUser: 0 - resources: {{ toYaml .Values.volumePermissions.resources | nindent 12 }} - volumeMounts: - - name: data - mountPath: /bitnami/mariadb - {{- end }} - containers: - - name: "mariadb" - image: {{ template "mariadb.image" . }} - imagePullPolicy: {{ .Values.image.pullPolicy | quote }} - env: - {{- if .Values.image.debug}} - - name: BITNAMI_DEBUG - value: "true" - {{- end }} - {{- if .Values.slave.extraFlags }} - - name: MARIADB_EXTRA_FLAGS - value: "{{ .Values.slave.extraFlags }}" - {{- end }} - - name: MARIADB_REPLICATION_MODE - value: "slave" - - name: MARIADB_MASTER_HOST - value: {{ template "mariadb.fullname" . }} - - name: MARIADB_MASTER_PORT_NUMBER - value: "{{ .Values.service.port }}" - - name: MARIADB_MASTER_ROOT_USER - value: "root" - {{- if .Values.rootUser.injectSecretsAsVolume }} - - name: MARIADB_MASTER_ROOT_PASSWORD_FILE - value: {{ default "/opt/bitnami/mariadb/secrets/mariadb-root-password" .Values.rootUser.injectSecretsFile }} - {{- else }} - - name: MARIADB_MASTER_ROOT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "mariadb.secretName" . }} - key: mariadb-root-password - {{- end }} - - name: MARIADB_REPLICATION_USER - value: "{{ .Values.replication.user }}" - {{- if .Values.replication.injectSecretsAsVolume }} - - name: MARIADB_REPLICATION_PASSWORD_FILE - value: {{ default "/opt/bitnami/mariadb/secrets/mariadb-replication-password" .Values.replication.injectSecretsFile }} - {{- else }} - - name: MARIADB_REPLICATION_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "mariadb.secretName" . }} - key: mariadb-replication-password - {{- end }} - {{- if .Values.slave.extraEnvVars }} - {{- tpl (toYaml .Values.slave.extraEnvVars) $ | nindent 12 }} - {{- end }} - {{- if or .Values.slave.extraEnvVarsCM .Values.slave.extraEnvVarsSecret }} - envFrom: - {{- if .Values.slave.extraEnvVarsCM }} - - configMapRef: - name: {{ .Values.slave.extraEnvVarsCM }} - {{- end }} - {{- if .Values.slave.extraEnvVarsSecret }} - - secretRef: - name: {{ .Values.slave.extraEnvVarsSecret }} - {{- end }} - {{- end }} - ports: - - name: mysql - containerPort: 3306 - {{- if .Values.slave.livenessProbe.enabled }} - livenessProbe: - exec: - command: - - sh - - -c - - | - password_aux="${MARIADB_MASTER_ROOT_PASSWORD:-}" - if [ -f "${MARIADB_MASTER_ROOT_PASSWORD_FILE:-}" ]; then - password_aux=$(cat $MARIADB_MASTER_ROOT_PASSWORD_FILE) - fi - mysqladmin status -uroot -p$password_aux - initialDelaySeconds: {{ .Values.slave.livenessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.slave.livenessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.slave.livenessProbe.timeoutSeconds }} - successThreshold: {{ .Values.slave.livenessProbe.successThreshold }} - failureThreshold: {{ .Values.slave.livenessProbe.failureThreshold }} - {{- end }} - {{- if .Values.slave.readinessProbe.enabled }} - readinessProbe: - exec: - command: - - sh - - -c - - | - password_aux="${MARIADB_MASTER_ROOT_PASSWORD:-}" - if [ -f "${MARIADB_MASTER_ROOT_PASSWORD_FILE:-}" ]; then - password_aux=$(cat $MARIADB_MASTER_ROOT_PASSWORD_FILE) - fi - mysqladmin status -uroot -p$password_aux - initialDelaySeconds: {{ .Values.slave.readinessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.slave.readinessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.slave.readinessProbe.timeoutSeconds }} - successThreshold: {{ .Values.slave.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.slave.readinessProbe.failureThreshold }} - {{- end }} - {{- if .Values.slave.resources }} - resources: {{ toYaml .Values.slave.resources | nindent 12 }} - {{- end }} - volumeMounts: - - name: data - mountPath: /bitnami/mariadb - {{- if .Values.slave.config }} - - name: config - mountPath: /opt/bitnami/mariadb/conf/my.cnf - subPath: my.cnf - {{- end }} - {{- if or .Values.rootUser.injectSecretsAsVolume .Values.replication.injectSecretsAsVolume }} - - name: mariadb-credentials - mountPath: /opt/bitnami/mariadb/secrets/ - {{- end }} - {{- if .Values.metrics.enabled }} - - name: metrics - image: {{ template "mariadb.metrics.image" . }} - imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} - env: - {{- if .Values.rootUser.injectSecretsAsVolume }} - - name: MARIADB_ROOT_PASSWORD_FILE - value: {{ default "/opt/bitnami/mysqld-exporter/secrets/mariadb-root-password" .Values.rootUser.injectSecretsFile }} - {{- else }} - - name: MARIADB_ROOT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "mariadb.secretName" . }} - key: mariadb-root-password - {{- end }} - command: - - sh - - -c - - | - password_aux="${MARIADB_ROOT_PASSWORD:-}" - if [ -f "${MARIADB_ROOT_PASSWORD_FILE:-}" ]; then - password_aux=$(cat $MARIADB_ROOT_PASSWORD_FILE) - fi - DATA_SOURCE_NAME="root:${password_aux}@(localhost:3306)/" /bin/mysqld_exporter {{- range .Values.metrics.extraArgs.slave }} {{ . }} {{- end }} - ports: - - name: metrics - containerPort: 9104 - {{- if .Values.metrics.livenessProbe.enabled }} - livenessProbe: - httpGet: - path: /metrics - port: metrics - initialDelaySeconds: {{ .Values.metrics.livenessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.metrics.livenessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.metrics.livenessProbe.timeoutSeconds }} - successThreshold: {{ .Values.metrics.livenessProbe.successThreshold }} - failureThreshold: {{ .Values.metrics.livenessProbe.failureThreshold }} - {{- end }} - {{- if .Values.metrics.readinessProbe.enabled }} - readinessProbe: - httpGet: - path: /metrics - port: metrics - initialDelaySeconds: {{ .Values.metrics.readinessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.metrics.readinessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.metrics.readinessProbe.timeoutSeconds }} - successThreshold: {{ .Values.metrics.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.metrics.readinessProbe.failureThreshold }} - {{- end }} - {{- if .Values.metrics.resources }} - resources: {{ toYaml .Values.metrics.resources | nindent 12 }} - {{- end }} - {{- if .Values.rootUser.injectSecretsAsVolume }} - volumeMounts: - - name: mariadb-credentials - mountPath: /opt/bitnami/mysqld-exporter/secrets/ - {{- end }} - {{- end }} - volumes: - {{- if .Values.slave.config }} - - name: config - configMap: - name: {{ template "slave.fullname" . }} - {{- end }} - {{- if or .Values.rootUser.injectSecretsAsVolume .Values.replication.injectSecretsAsVolume }} - - name: mariadb-credentials - secret: - secretName: {{ template "mariadb.secretName" . }} - items: - {{- if .Values.rootUser.injectSecretsAsVolume }} - - key: mariadb-root-password - path: mariadb-root-password - {{- end }} - {{- if .Values.replication.injectSecretsAsVolume }} - - key: mariadb-replication-password - path: mariadb-replication-password - {{- end }} - {{- end }} -{{- if not .Values.slave.persistence.enabled }} - - name: "data" - emptyDir: {} -{{- else }} - volumeClaimTemplates: - - metadata: - name: data - labels: - app: "{{ template "mariadb.name" . }}" - component: "slave" - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} - spec: - accessModes: - {{- range .Values.slave.persistence.accessModes }} - - {{ . | quote }} - {{- end }} - resources: - requests: - storage: {{ .Values.slave.persistence.size | quote }} - {{ include "mariadb.slave.storageClass" . }} - {{- if .Values.slave.persistence.selector }} - selector: {{- include "mariadb.tplValue" (dict "value" .Values.slave.persistence.selector "context" $) | nindent 10 }} - {{- end -}} -{{- end }} -{{- end }} diff --git a/bitnami/mariadb/templates/slave-svc.yaml b/bitnami/mariadb/templates/slave-svc.yaml deleted file mode 100644 index 12fa7ebc6..000000000 --- a/bitnami/mariadb/templates/slave-svc.yaml +++ /dev/null @@ -1,49 +0,0 @@ -{{- if .Values.replication.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "slave.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - app: "{{ template "mariadb.name" . }}" - chart: "{{ template "mariadb.chart" . }}" - component: "slave" - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} -{{- if or .Values.metrics.enabled .Values.slave.service.annotations }} - annotations: -{{- if .Values.metrics.enabled }} -{{ toYaml .Values.metrics.annotations | indent 4 }} -{{- end }} -{{- if .Values.slave.service.annotations }} -{{ toYaml .Values.slave.service.annotations | indent 4 }} -{{- end }} -{{- end }} -spec: - type: {{ .Values.service.type }} - {{- if eq .Values.service.type "ClusterIP" }} - {{- if .Values.service.clusterIp }} - clusterIP: {{ .Values.service.clusterIp.slave }} - {{- end }} - {{- end }} - ports: - - name: mysql - port: {{ .Values.service.port }} - targetPort: mysql - {{- if (eq .Values.service.type "NodePort") }} - {{- if .Values.service.nodePort }} - {{- if .Values.service.nodePort.slave }} - nodePort: {{ .Values.service.nodePort.slave }} - {{- end }} - {{- end }} - {{- end }} - {{- if .Values.metrics.enabled }} - - name: metrics - port: 9104 - targetPort: metrics - {{- end }} - selector: - app: "{{ template "mariadb.name" . }}" - component: "slave" - release: "{{ .Release.Name }}" -{{- end }} diff --git a/bitnami/mariadb/values-production.yaml b/bitnami/mariadb/values-production.yaml index 1e8c2edf2..e9d07f493 100644 --- a/bitnami/mariadb/values-production.yaml +++ b/bitnami/mariadb/values-production.yaml @@ -8,30 +8,25 @@ # - myRegistryKeySecretName # storageClass: myStorageClass -## Use an alternate scheduler, e.g. "stork". -## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ -## -# schedulerName: - ## Bitnami MariaDB image ## ref: https://hub.docker.com/r/bitnami/mariadb/tags/ ## image: registry: docker.io repository: bitnami/mariadb - tag: 10.3.24-debian-10-r49 + tag: 10.5.5-debian-10-r48 ## 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 ## pullPolicy: IfNotPresent - ## Optionally specify an array of imagePullSecrets. - ## Secrets must be manually created in the namespace. + ## 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/ + ## Example: + ## pullSecrets: + ## - myRegistryKeySecretName ## - # pullSecrets: - # - myRegistryKeySecretName - + pullSecrets: [] ## Set to true if you would like to see extra information on logs ## It turns BASH and NAMI debugging in minideb ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging @@ -45,216 +40,255 @@ image: ## # fullnameOverride: -## Additional pod labels +## Cluster domain ## -# podLabels: -# extraLabel: extraValue +clusterDomain: cluster.local -## Init containers parameters: -## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section. +## Common annotations to add to all MariaDB resources (sub-charts are not considered). Evaluated as a template ## -volumePermissions: - enabled: false - image: - registry: docker.io - repository: bitnami/minideb - tag: buster - 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/ - ## - # pullSecrets: - # - myRegistryKeySecretName - resources: {} +commonAnnotations: {} -service: - ## Kubernetes service type, ClusterIP and NodePort are supported at present - type: ClusterIP - # clusterIp: - # master: xx.xx.xx.xx - # slave: xx.xx.xx.xx - port: 3306 - ## Specify the nodePort value for the LoadBalancer and NodePort service types. - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport - ## - # nodePort: - # master: 30001 - # slave: 30002 - -## Pods Service Account -## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ -serviceAccount: - ## Specifies whether a ServiceAccount should be created - ## - create: false - ## The name of the ServiceAccount to use. - ## If not set and create is true, a name is generated using the mariadb.fullname template - # name: - ## Annotations to add to the service account (evaluated as a template) - ## - annotations: {} - -## Role Based Access -## Ref: https://kubernetes.io/docs/admin/authorization/rbac/ +## Common labels to add to all MariaDB resources (sub-charts are not considered). Evaluated as a template ## -rbac: - create: false +commonLabels: {} -## Pod Security Context -## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ +## Use an alternate scheduler, e.g. "stork". +## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ ## -securityContext: - enabled: true - fsGroup: 1001 - runAsUser: 1001 +# schedulerName: -## Use existing secret (ignores root, db and replication passwords) +## MariaDB architecture. Allowed values: standalone or replication ## -# existingSecret: +architecture: replication -## Allow customization of the secret resource +## MariaDB Authentication parameters ## -secret: - ## Add custom annotations to the secret (evaluated as a template) - ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ - annotations: {} - ## Require all passwords at the secret resource - ## - requirePasswords: true - -## MariaDB admin credentials -## -rootUser: - ## MariaDB admin password +auth: + ## MariaDB root password ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-the-root-password-on-first-run ## + rootPassword: "" + ## MariaDB custom user and database + ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#creating-a-database-on-first-run + ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#creating-a-database-user-on-first-run + ## + database: my_database + username: "" password: "" - ## Option to force users to specify a password. That is required for 'helm upgrade' to work properly. - ## If it is not force, a random password will be generated. - ## - forcePassword: true - ## Mount admin password as a file instead of using an environment variable - ## - injectSecretsAsVolume: true - ## Specify custom secrets file location if injectSecretsAsVolume is true, - ## defaults to /opt/bitnami/mariadb/secrets/mariadb-root-password - # injectSecretsFile: "/vault/secrets/root-password" - -## Custom user/db credentials -## -db: - ## MariaDB username and password - ## ref: https://github.com/bitnami/bitnami-docker-mariadb#creating-a-database-user-on-first-run - ## - user: "" - password: "" - ## Database to create - ## ref: https://github.com/bitnami/bitnami-docker-mariadb#creating-a-database-on-first-run - ## - name: my_database - ## Option to force users to specify a password. That is required for 'helm upgrade' to work properly. - ## If it is not force, a random password will be generated. - ## - forcePassword: true - ## Mount user password as a file instead of using an environment variable - ## - injectSecretsAsVolume: true - ## Specify custom secrets file location if injectSecretsAsVolume is true, - ## defaults to /opt/bitnami/mariadb/secrets/mariadb-password - # injectSecretsFile: "/vault/secrets/user-password" - -## Replication configuration -## -replication: - ## Enable replication. This enables the creation of replicas of MariaDB. If false, only a - ## master deployment would be created - ## - enabled: true - ## MariaDB replication user + ## MariaDB replication user and password ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-up-a-replication-cluster ## - user: replicator - ## MariaDB replication user password - ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-up-a-replication-cluster + replicationUser: replicator + replicationPassword: "" + ## Existing secret with MariaDB credentials + ## NOTE: When it's set the previous parameters are ignored. ## - password: "" - ## Option to force users to specify a password. That is required for 'helm upgrade' to work properly. - ## If it is not force, a random password will be generated. + # existingSecret: name-of-existing-secret + ## Force users to specify required passwords ## forcePassword: true - ## Mount replication user password as a file instead of using an environment variable + ## Mount credentials as a files instead of using an environment variable ## - injectSecretsAsVolume: true - ## Specify custom secrets file location if injectSecretsAsVolume is true, - ## defaults to //opt/bitnami/mariadb/secrets/mariadb-replication-password - # injectSecretsFile: "/vault/secrets/replication-password" + usePasswordFiles: true ## initdb scripts ## Specify dictionary of scripts to be run at first boot -## Alternatively, you can put your scripts under the files/docker-entrypoint-initdb.d directory +## Example: +## initdbScripts: +## my_init_script.sh: | +## #!/bin/bash +## echo "Do something." +## +initdbScripts: {} + +## Existing ConfigMap with custom init scripts ## -# initdbScripts: -# my_init_script.sh: | -# #!/bin/sh -# echo "Do something." -# -## ConfigMap with scripts to be run at first boot -## Note: This will override initdbScripts # initdbScriptsConfigMap: -master: - ## Mariadb Master additional pod annotations - ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ - # annotations: - # key: value - # another-key: another-value - - ## MariaDB additional command line flags - ## Can be used to specify command line flags, for example: +## Mariadb Primary parameters +## +primary: + ## Command and args for running the container (set to default if not set). Use array form ## - ## extraFlags: "--max-connect-errors=1000 --max_connections=155" + command: [] + args: [] - ## Affinity for pod assignment + ## Configure MariaDB Primary with a custom my.cnf file + ## ref: https://mysql.com/kb/en/mysql/configuring-mysql-with-mycnf/#example-of-configuration-file + ## + configuration: |- + [mysqld] + skip-name-resolve + explicit_defaults_for_timestamp + basedir=/opt/bitnami/mariadb + plugin_dir=/opt/bitnami/mariadb/plugin + port=3306 + socket=/opt/bitnami/mariadb/tmp/mysql.sock + tmpdir=/opt/bitnami/mariadb/tmp + max_allowed_packet=16M + bind-address=0.0.0.0 + pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid + log-error=/opt/bitnami/mariadb/logs/mysqld.log + character-set-server=UTF8 + collation-server=utf8_general_ci + + [client] + port=3306 + socket=/opt/bitnami/mariadb/tmp/mysql.sock + default-character-set=UTF8 + plugin_dir=/opt/bitnami/mariadb/plugin + + [manager] + port=3306 + socket=/opt/bitnami/mariadb/tmp/mysql.sock + pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid + + ## Name of existing ConfigMap with MariaDB Primary configuration. + ## NOTE: When it's set the 'configuration' parameter is ignored + ## + # existingConfiguration: + + ## updateStrategy for Mariadb Primary statefulset + ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies + ## + updateStrategy: RollingUpdate + + ## Partition update strategy for Mariadb Primary statefulset + ## https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#partitions + ## + # rollingUpdatePartition: + + ## Mariadb Primary pod annotations + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + ## + podAnnotations: {} + + ## Mariadb Primary pod affinity preset + ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity + ## Allowed values: soft, hard + ## + podAffinityPreset: "" + + ## Mariadb Primary pod anti-affinity preset + ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity + ## Allowed values: soft, hard + ## + podAntiAffinityPreset: soft + + ## Mariadb Primary node affinity preset + ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity + ## Allowed values: soft, hard + ## + nodeAffinityPreset: + ## Node affinity type + ## Allowed values: soft, hard + type: "" + ## Node label key to match + ## E.g. + ## key: "kubernetes.io/e2e-az-name" + ## + key: "" + ## Node label values to match + ## E.g. + ## values: + ## - e2e-az1 + ## - e2e-az2 + ## + values: [] + + ## Affinity for MariaDB primary pods assignment ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity + ## Note: podAffinityPreset, podAntiAffinityPreset, and nodeAffinityPreset will be ignored when it's set ## affinity: {} - ## An array to add extra environment variables - ## For example: - ## extraEnvVars: - ## - name: TZ - ## value: "Europe/Paris" - ## - extraEnvVars: - - ## ConfigMap with extra env vars: - ## - extraEnvVarsCM: - - ## Secret with extra env vars: - ## - extraEnvVarsSecret: - - ## Kept for backwards compatibility. You can now disable it by removing it. - ## if you wish to set it through master.affinity.podAntiAffinity instead. - ## - antiAffinity: soft - - ## Node labels for pod assignment + ## Node labels for MariaDB primary pods assignment ## Ref: https://kubernetes.io/docs/user-guide/node-selection/ ## nodeSelector: {} - ## Tolerations for pod assignment + ## Tolerations for MariaDB primary pods assignment ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ ## tolerations: [] - ## updateStrategy for MariaDB Master StatefulSet - ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies - updateStrategy: - type: RollingUpdate + ## MariaDB primary Pod security context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod + ## + podSecurityContext: + enabled: true + fsGroup: 1001 + + ## MariaDB primary container security context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container + ## + containerSecurityContext: + enabled: true + runAsUser: 1001 + + ## MariaDB primary container's resource requests and limits + ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ + ## + resources: + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + limits: {} + # memory: 256Mi + # cpu: 100m + requests: {} + # memory: 256Mi + # cpu: 100m + + ## MariaDB primary container's liveness and readiness probes + ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes + ## + livenessProbe: + enabled: true + initialDelaySeconds: 120 + periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 + successThreshold: 1 + readinessProbe: + enabled: true + initialDelaySeconds: 30 + periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 + successThreshold: 1 + + ## MariaDB primary custom liveness probe + ## + customLivenessProbe: {} + + ## MariaDB primary custom rediness probe + ## + customReadinessProbe: {} + + ## MariaDB primary additional command line flags + ## Can be used to specify command line flags, for example: + ## E.g. + ## extraFlags: "--max-connect-errors=1000 --max_connections=155" + ## + extraFlags: "" + + ## An array to add extra environment variables on MariaDB primary containers + ## E.g. + ## extraEnvVars: + ## - name: TZ + ## value: "Europe/Paris" + ## + extraEnvVars: [] + + ## ConfigMap with extra env vars for MariaDB primary containers: + ## + extraEnvVarsCM: "" + + ## Secret with extra env vars for MariaDB primary containers: + ## + extraEnvVarsSecret: "" ## Enable persistence using Persistent Volume Claims ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ @@ -263,11 +297,10 @@ master: ## If true, use a Persistent Volume Claim, If false, use emptyDir ## enabled: true - # Enable persistence using an existing PVC + ## Name of existing PVC to hold MariaDB Primary data + ## NOTE: When it's set the rest of persistence parameters are ignored + ## # existingClaim: - # Subdirectory of the volume to mount - # subPath: - mountPath: /bitnami/mariadb ## Persistent Volume Storage Class ## If defined, storageClassName: ## If set to "-", storageClassName: "", which disables dynamic provisioning @@ -292,25 +325,86 @@ master: ## app: my-app selector: {} - extraInitContainers: [] - - ## An array to add extra environment variables - ## For example: - ## extraEnvVars: - ## - name: TZ - ## value: "Europe/Paris" + ## Extra volumes to add to the MariaDB Primary pod(s) ## - # extraEnvVars: + extraVolumes: [] - ## Configure MySQL with a custom my.cnf file + ## Extra volume mounts to add to the MariaDB Primary container(s) + ## + extraVolumeMounts: [] + + ## Extra init containers to add to the MariaDB Primary pod(s) + ## + initContainers: [] + + ## Extra sidecar containers to add to the MariaDB Primary pod(s) + ## + sidecars: [] + + ## MariaDB Primary Service paramaters + ## + service: + ## Service type + ## + type: ClusterIP + ## Service port + ## + port: 3306 + ## Specify the nodePort value for the LoadBalancer and NodePort service types. + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport + ## + nodePort: "" + ## Service clusterIP + ## + # clusterIP: None + clusterIP: "" + ## Set the LoadBalancer service type to internal only. + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer + ## + loadBalancerIP: "" + ## Load Balancer sources + ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service + ## E.g. + ## loadBalancerSourceRanges: + ## - 10.10.10.0/24 + ## + loadBalancerSourceRanges: [] + ## Provide any additional annotations which may be required + ## + annotations: {} + + ## MariaDB primary Pod Disruption Budget configuration + ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ + ## + pdb: + create: false + ## Min number of pods that must still be available after the eviction + ## + minAvailable: 1 + ## Max number of pods that can be unavailable after the eviction + ## + # maxUnavailable: 1 + +## Mariadb Secondary parameters +## +secondary: + ## Number of Mariadb Secondary replicas to deploy + ## + replicaCount: 2 + + ## Command and args for running the container (set to default if not set). Use array form + ## + command: [] + args: [] + + ## Configure MariaDB Secondary with a custom my.cnf file ## ref: https://mysql.com/kb/en/mysql/configuring-mysql-with-mycnf/#example-of-configuration-file ## - config: |- + configuration: |- [mysqld] skip-name-resolve explicit_defaults_for_timestamp basedir=/opt/bitnami/mariadb - plugin_dir=/opt/bitnami/mariadb/plugin port=3306 socket=/opt/bitnami/mariadb/tmp/mysql.sock tmpdir=/opt/bitnami/mariadb/tmp @@ -325,111 +419,179 @@ master: port=3306 socket=/opt/bitnami/mariadb/tmp/mysql.sock default-character-set=UTF8 - plugin_dir=/opt/bitnami/mariadb/plugin [manager] port=3306 socket=/opt/bitnami/mariadb/tmp/mysql.sock pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid - ## Configure master resource requests and limits - ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ + ## Name of existing ConfigMap with MariaDB Secondary configuration. + ## NOTE: When it's set the 'configuration' parameter is ignored ## - resources: {} - livenessProbe: - enabled: true - ## - ## Initializing the database could take some time - initialDelaySeconds: 120 - ## - ## Default Kubernetes values - periodSeconds: 10 - timeoutSeconds: 1 - successThreshold: 1 - failureThreshold: 3 - readinessProbe: - enabled: true - initialDelaySeconds: 30 - ## - ## Default Kubernetes values - periodSeconds: 10 - timeoutSeconds: 1 - successThreshold: 1 - failureThreshold: 3 + # existingConfiguration: - podDisruptionBudget: - enabled: false - minAvailable: 1 - # maxUnavailable: 1 - - ## Allow customization of the service resource + ## updateStrategy for Mariadb Secondary statefulset + ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies ## - service: - ## Add custom annotations to the service - ## - annotations: {} + updateStrategy: RollingUpdate -slave: - replicas: 2 + ## Partition update strategy for Mariadb Secondary statefulset + ## https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#partitions + ## + # rollingUpdatePartition: - ## Mariadb Slave additional pod annotations + ## Mariadb Secondary pod annotations ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ - # annotations: - # key: value - # another-key: another-value - - ## MariaDB additional command line flags - ## Can be used to specify command line flags, for example: ## - ## extraFlags: --max-connect-errors=1000 --max_connections=155" + podAnnotations: {} - ## An array to add extra environment variables - ## For example: - ## extraEnvVars: - ## - name: TZ - ## value: "Europe/Paris" + ## Mariadb Secondary pod affinity preset + ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity + ## Allowed values: soft, hard ## - extraEnvVars: + podAffinityPreset: "" - ## ConfigMap with extra env vars: + ## Mariadb Secondary pod anti-affinity preset + ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity + ## Allowed values: soft, hard ## - extraEnvVarsCM: + podAntiAffinityPreset: soft - ## Secret with extra env vars: + ## Mariadb Secondary node affinity preset + ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity + ## Allowed values: soft, hard ## - extraEnvVarsSecret: + nodeAffinityPreset: + ## Node affinity type + ## Allowed values: soft, hard + type: "" + ## Node label key to match + ## E.g. + ## key: "kubernetes.io/e2e-az-name" + ## + key: "" + ## Node label values to match + ## E.g. + ## values: + ## - e2e-az1 + ## - e2e-az2 + ## + values: [] - ## Affinity for pod assignment + ## Affinity for MariaDB secondary pods assignment ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity + ## Note: podAffinityPreset, podAntiAffinityPreset, and nodeAffinityPreset will be ignored when it's set ## affinity: {} - ## Kept for backwards compatibility. You can now disable it by removing it. - ## if you wish to set it through slave.affinity.podAntiAffinity instead. - ## - antiAffinity: soft - - ## Node labels for pod assignment + ## Node labels for MariaDB secondary pods assignment ## Ref: https://kubernetes.io/docs/user-guide/node-selection/ ## nodeSelector: {} - ## Tolerations for pod assignment + ## Tolerations for MariaDB secondary pods assignment ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ ## tolerations: [] - ## updateStrategy for MariaDB Slave StatefulSet - ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies - updateStrategy: - type: RollingUpdate + ## MariaDB secondary Pod security context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod + ## + podSecurityContext: + enabled: true + fsGroup: 1001 + ## MariaDB secondary container security context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container + ## + containerSecurityContext: + enabled: true + runAsUser: 1001 + + ## MariaDB secondary container's resource requests and limits + ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ + ## + resources: + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + limits: {} + # memory: 256Mi + # cpu: 100m + requests: {} + # memory: 256Mi + # cpu: 100m + + ## MariaDB secondary container's liveness and readiness probes + ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes + ## + livenessProbe: + enabled: true + initialDelaySeconds: 120 + periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 + successThreshold: 1 + readinessProbe: + enabled: true + initialDelaySeconds: 30 + periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 + successThreshold: 1 + + ## MariaDB secondary custom liveness probe + ## + customLivenessProbe: {} + + ## MariaDB secondary custom rediness probe + ## + customReadinessProbe: {} + + ## MariaDB secondary additional command line flags + ## Can be used to specify command line flags, for example: + ## E.g. + ## extraFlags: "--max-connect-errors=1000 --max_connections=155" + ## + extraFlags: "" + + ## An array to add extra environment variables on MariaDB secondary containers + ## E.g. + ## extraEnvVars: + ## - name: TZ + ## value: "Europe/Paris" + ## + extraEnvVars: [] + + ## ConfigMap with extra env vars for MariaDB secondary containers: + ## + extraEnvVarsCM: "" + + ## Secret with extra env vars for MariaDB secondary containers: + ## + extraEnvVarsSecret: "" + + ## Enable persistence using Persistent Volume Claims + ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ + ## persistence: ## If true, use a Persistent Volume Claim, If false, use emptyDir ## enabled: true + ## Persistent Volume Storage Class + ## If defined, storageClassName: + ## If set to "-", storageClassName: "", which disables dynamic provisioning + ## If undefined (the default) or set to null, no storageClassName spec is + ## set, choosing the default provisioner. (gp2 on AWS, standard on + ## GKE, AWS & OpenStack) + ## # storageClass: "-" - annotations: + ## Persistent Volume Claim annotations + ## + annotations: {} + ## Persistent Volume Access Mode + ## accessModes: - ReadWriteOnce ## Persistent Volume size @@ -441,86 +603,111 @@ slave: ## app: my-app selector: {} - ## Add extra init containers + ## Extra volumes to add to the MariaDB Secondary pod(s) ## - extraInitContainers: [] + extraVolumes: [] - ## An array to add extra environment variables - ## For example: - ## extraEnvVars: - ## - name: TZ - ## value: "Europe/Paris" + ## Extra volume mounts to add to the MariaDB Secondary container(s) ## - # extraEnvVars: + extraVolumeMounts: [] - ## Configure MySQL slave with a custom my.cnf file - ## ref: https://mysql.com/kb/en/mysql/configuring-mysql-with-mycnf/#example-of-configuration-file + ## Extra init containers to add to the MariaDB Secondary pod(s) ## - config: |- - [mysqld] - skip-name-resolve - explicit_defaults_for_timestamp - basedir=/opt/bitnami/mariadb - port=3306 - socket=/opt/bitnami/mariadb/tmp/mysql.sock - tmpdir=/opt/bitnami/mariadb/tmp - max_allowed_packet=16M - bind-address=0.0.0.0 - pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid - log-error=/opt/bitnami/mariadb/logs/mysqld.log - character-set-server=UTF8 - collation-server=utf8_general_ci - - [client] - port=3306 - socket=/opt/bitnami/mariadb/tmp/mysql.sock - default-character-set=UTF8 - - [manager] - port=3306 - socket=/opt/bitnami/mariadb/tmp/mysql.sock - pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid + initContainers: [] + ## Extra sidecar containers to add to the MariaDB Secondary pod(s) ## - ## Configure slave resource requests and limits - ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ - ## - resources: {} - livenessProbe: - enabled: true - ## - ## Initializing the database could take some time - initialDelaySeconds: 120 - ## - ## Default Kubernetes values - periodSeconds: 10 - timeoutSeconds: 1 - successThreshold: 1 - failureThreshold: 3 - readinessProbe: - enabled: true - initialDelaySeconds: 45 - ## - ## Default Kubernetes values - periodSeconds: 10 - timeoutSeconds: 1 - successThreshold: 1 - failureThreshold: 3 + sidecars: [] - podDisruptionBudget: - enabled: false - minAvailable: 1 - # maxUnavailable: 1 - - ## Allow customization of the service resource + ## MariaDB Secondary Service paramaters ## service: - ## Add custom annotations to the service + ## Service type + ## + type: ClusterIP + ## Service port + ## + port: 3306 + ## Specify the nodePort value for the LoadBalancer and NodePort service types. + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport + ## + nodePort: "" + ## Service clusterIP + ## + # clusterIP: None + clusterIP: "" + ## Set the LoadBalancer service type to internal only. + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer + ## + loadBalancerIP: "" + ## Load Balancer sources + ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service + ## E.g. + ## loadBalancerSourceRanges: + ## - 10.10.10.0/24 + ## + loadBalancerSourceRanges: [] + ## Provide any additional annotations which may be required ## annotations: {} + ## MariaDB secondary Pod Disruption Budget configuration + ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ + ## + pdb: + create: false + ## Min number of pods that must still be available after the eviction + ## + minAvailable: 1 + ## Max number of pods that can be unavailable after the eviction + ## + # maxUnavailable: 1 + +## MariaDB pods ServiceAccount +## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ +## +serviceAccount: + ## Specifies whether a ServiceAccount should be created + ## + create: true + ## The name of the ServiceAccount to use. + ## If not set and create is true, a name is generated using the mariadb.fullname template + ## + # name: + ## Annotations to add to the service account (evaluated as a template) + ## + annotations: {} + +## Role Based Access +## ref: https://kubernetes.io/docs/admin/authorization/rbac/ +## +rbac: + ## Specifies whether RBAC rules should be created + ## + create: false + +## Init containers parameters: +## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section. +## +volumePermissions: + enabled: false + image: + registry: docker.io + repository: bitnami/minideb + tag: buster + 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/ + ## + # pullSecrets: + # - myRegistryKeySecretName + resources: {} + +## Mysqld Prometheus exporter paramters +## metrics: - enabled: true + enabled: false image: registry: docker.io repository: bitnami/mysqld-exporter @@ -532,59 +719,74 @@ metrics: ## # pullSecrets: # - myRegistryKeySecretName - resources: {} + annotations: prometheus.io/scrape: "true" prometheus.io/port: "9104" ## Extra args to be passed to mysqld_exporter ## ref: https://github.com/prometheus/mysqld_exporter/ + ## E.g. + ## - --collect.auto_increment.columns + ## - --collect.binlog_size + ## - --collect.engine_innodb_status + ## - --collect.engine_tokudb_status + ## - --collect.global_status + ## - --collect.global_variables + ## - --collect.info_schema.clientstats + ## - --collect.info_schema.innodb_metrics + ## - --collect.info_schema.innodb_tablespaces + ## - --collect.info_schema.innodb_cmp + ## - --collect.info_schema.innodb_cmpmem + ## - --collect.info_schema.processlist + ## - --collect.info_schema.processlist.min_time + ## - --collect.info_schema.query_response_time + ## - --collect.info_schema.tables + ## - --collect.info_schema.tables.databases + ## - --collect.info_schema.tablestats + ## - --collect.info_schema.userstats + ## - --collect.perf_schema.eventsstatements + ## - --collect.perf_schema.eventsstatements.digest_text_limit + ## - --collect.perf_schema.eventsstatements.limit + ## - --collect.perf_schema.eventsstatements.timelimit + ## - --collect.perf_schema.eventswaits + ## - --collect.perf_schema.file_events + ## - --collect.perf_schema.file_instances + ## - --collect.perf_schema.indexiowaits + ## - --collect.perf_schema.tableiowaits + ## - --collect.perf_schema.tablelocks + ## - --collect.perf_schema.replication_group_member_stats + ## - --collect.slave_status + ## - --collect.slave_hosts + ## - --collect.heartbeat + ## - --collect.heartbeat.database + ## - --collect.heartbeat.table ## extraArgs: master: [] slave: [] - # - --collect.auto_increment.columns - # - --collect.binlog_size - # - --collect.engine_innodb_status - # - --collect.engine_tokudb_status - # - --collect.global_status - # - --collect.global_variables - # - --collect.info_schema.clientstats - # - --collect.info_schema.innodb_metrics - # - --collect.info_schema.innodb_tablespaces - # - --collect.info_schema.innodb_cmp - # - --collect.info_schema.innodb_cmpmem - # - --collect.info_schema.processlist - # - --collect.info_schema.processlist.min_time - # - --collect.info_schema.query_response_time - # - --collect.info_schema.tables - # - --collect.info_schema.tables.databases - # - --collect.info_schema.tablestats - # - --collect.info_schema.userstats - # - --collect.perf_schema.eventsstatements - # - --collect.perf_schema.eventsstatements.digest_text_limit - # - --collect.perf_schema.eventsstatements.limit - # - --collect.perf_schema.eventsstatements.timelimit - # - --collect.perf_schema.eventswaits - # - --collect.perf_schema.file_events - # - --collect.perf_schema.file_instances - # - --collect.perf_schema.indexiowaits - # - --collect.perf_schema.tableiowaits - # - --collect.perf_schema.tablelocks - # - --collect.perf_schema.replication_group_member_stats - # - --collect.slave_status - # - --collect.slave_hosts - # - --collect.heartbeat - # - --collect.heartbeat.database - # - --collect.heartbeat.table + ## Mysqld Prometheus exporter resource requests and limits + ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ + ## + resources: + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + limits: {} + # memory: 256Mi + # cpu: 100m + requests: {} + # memory: 256Mi + # cpu: 100m + + ## Mysqld Prometheus exporter liveness and readiness probes + ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes + ## livenessProbe: enabled: true - ## - ## Initializing the database could take some time initialDelaySeconds: 120 - ## - ## Default Kubernetes values periodSeconds: 10 timeoutSeconds: 1 successThreshold: 1 @@ -592,23 +794,37 @@ metrics: readinessProbe: enabled: true initialDelaySeconds: 30 - ## - ## Default Kubernetes values periodSeconds: 10 timeoutSeconds: 1 successThreshold: 1 failureThreshold: 3 - # Enable this if you're using https://github.com/coreos/prometheus-operator + ## Prometheus Service Monitor + ## ref: https://github.com/coreos/prometheus-operator + ## serviceMonitor: + ## If the operator is installed in your cluster, set to true to create a Service Monitor Entry + ## enabled: false - ## Specify a namespace if needed - # namespace: monitoring - # fallback to the prometheus default unless specified - # interval: 10s - # scrapeTimeout: 10s - ## Defaults to what's used if you follow CoreOS [Prometheus Install Instructions](https://github.com/bitnami/charts/tree/master/bitnami/prometheus-operator#tldr) - ## [Prometheus Selector Label](https://github.com/bitnami/charts/tree/master/bitnami/prometheus-operator#prometheus-operator-1) - ## [Kube Prometheus Selector Label](https://github.com/bitnami/charts/tree/master/bitnami/prometheus-operator#exporters) - selector: - prometheus: kube-prometheus + ## Specify the namespace in which the serviceMonitor resource will be created + ## + # namespace: "" + ## Specify the interval at which metrics should be scraped + ## + interval: 30s + ## Specify the timeout after which the scrape is ended + ## + # scrapeTimeout: 30s + ## Specify Metric Relabellings to add to the scrape endpoint + ## + # relabellings: + ## Specify honorLabels parameter to add the scrape endpoint + ## + honorLabels: false + ## Specify the release for ServiceMonitor. Sometimes it should be custom for prometheus operator to work + ## + # release: "" + ## Used to pass Labels that are used by the Prometheus installed in your cluster to select Service Monitors to work with + ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#prometheusspec + ## + additionalLabels: {} diff --git a/bitnami/mariadb/values.schema.json b/bitnami/mariadb/values.schema.json index b1b72e136..500c4eb93 100644 --- a/bitnami/mariadb/values.schema.json +++ b/bitnami/mariadb/values.schema.json @@ -2,31 +2,30 @@ "$schema": "http://json-schema.org/schema#", "type": "object", "properties": { - "rootUser": { - "type": "object", - "properties": { - "password": { - "type": "string", - "title": "MariaDB admin password", - "form": true, - "description": "Defaults to a random 10-character alphanumeric string if not set", - "hidden": { - "value": false, - "path": "usePassword" - } - } - } + "architecture": { + "type": "string", + "title": "MariaDB architecture", + "form": true, + "description": "Allowed values: `standalone` or `replication`" }, - "db": { + "auth": { "type": "object", + "title": "Authentication configuration", + "form": true, "properties": { - "name": { + "rootPassword": { + "type": "string", + "title": "MariaDB root password", + "form": true, + "description": "Defaults to a random 10-character alphanumeric string if not set" + }, + "database": { "type": "string", "title": "MariaDB custom database", "description": "Name of the custom database to be created during the 1st initialization of MariaDB", "form": true }, - "user": { + "username": { "type": "string", "title": "MariaDB custom user", "description": "Name of the custom user to be created during the 1st initialization of MariaDB. This user only has permissions on the MariaDB custom database", @@ -35,35 +34,43 @@ "password": { "type": "string", "title": "Password for MariaDB custom user", - "form": true, "description": "Defaults to a random 10-character alphanumeric string if not set", + "form": true, "hidden": { "value": false, "path": "usePassword" } - } - } - }, - "replication": { - "type": "object", - "title": "Replication configuration", - "form": true, - "properties": { - "enabled": { - "type": "boolean", + }, + "replicationUser": { + "type": "string", + "title": "MariaDB replication user", + "description": "Name of user used to manage replication.", "form": true, - "title": "Enable replication configuration" + "hidden": { + "value": "standalone", + "path": "architecture" + } + }, + "replicationPassword": { + "type": "string", + "title": "Password for MariaDB replication user", + "description": "Defaults to a random 10-character alphanumeric string if not set", + "form": true, + "hidden": { + "value": "standalone", + "path": "architecture" + } } } }, - "master": { + "primary": { "type": "object", - "title": "Master replicas settings", + "title": "Primary replicas settings", "form": true, "properties": { "persistence": { "type": "object", - "title": "Persistence for master replicas", + "title": "Persistence for primary replicas", "form": true, "properties": { "enabled": { @@ -89,9 +96,9 @@ } } }, - "slave": { + "secondary": { "type": "object", - "title": "Slave replicas settings", + "title": "Secondary replicas settings", "form": true, "hidden": { "value": false, @@ -100,7 +107,7 @@ "properties": { "persistence": { "type": "object", - "title": "Persistence for slave replicas", + "title": "Persistence for secondary replicas", "form": true, "properties": { "enabled": { diff --git a/bitnami/mariadb/values.yaml b/bitnami/mariadb/values.yaml index 906f433f5..9d4178e94 100644 --- a/bitnami/mariadb/values.yaml +++ b/bitnami/mariadb/values.yaml @@ -8,30 +8,25 @@ # - myRegistryKeySecretName # storageClass: myStorageClass -## Use an alternate scheduler, e.g. "stork". -## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ -## -# schedulerName: - ## Bitnami MariaDB image ## ref: https://hub.docker.com/r/bitnami/mariadb/tags/ ## image: registry: docker.io repository: bitnami/mariadb - tag: 10.3.24-debian-10-r49 + tag: 10.5.5-debian-10-r48 ## 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 ## pullPolicy: IfNotPresent - ## Optionally specify an array of imagePullSecrets. - ## Secrets must be manually created in the namespace. + ## 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/ + ## Example: + ## pullSecrets: + ## - myRegistryKeySecretName ## - # pullSecrets: - # - myRegistryKeySecretName - + pullSecrets: [] ## Set to true if you would like to see extra information on logs ## It turns BASH and NAMI debugging in minideb ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging @@ -45,200 +40,255 @@ image: ## # fullnameOverride: -## Additional pod labels +## Cluster domain ## -# podLabels: -# extraLabel: extraValue +clusterDomain: cluster.local -## Init containers parameters: -## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section. +## Common annotations to add to all MariaDB resources (sub-charts are not considered). Evaluated as a template ## -volumePermissions: - enabled: false - image: - registry: docker.io - repository: bitnami/minideb - tag: buster - 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/ - ## - # pullSecrets: - # - myRegistryKeySecretName - resources: {} +commonAnnotations: {} -service: - ## Kubernetes service type, ClusterIP and NodePort are supported at present - type: ClusterIP - # clusterIp: - # master: xx.xx.xx.xx - # slave: xx.xx.xx.xx - port: 3306 - ## Specify the nodePort value for the LoadBalancer and NodePort service types. - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport - ## - # nodePort: - # master: 30001 - # slave: 30002 - -## Pods Service Account -## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ -serviceAccount: - ## Specifies whether a ServiceAccount should be created - ## - create: false - ## The name of the ServiceAccount to use. - ## If not set and create is true, a name is generated using the mariadb.fullname template - # name: - ## Annotations to add to the service account (evaluated as a template) - ## - annotations: {} - -## Role Based Access -## Ref: https://kubernetes.io/docs/admin/authorization/rbac/ +## Common labels to add to all MariaDB resources (sub-charts are not considered). Evaluated as a template ## -rbac: - create: false +commonLabels: {} -## Pod Security Context -## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ +## Use an alternate scheduler, e.g. "stork". +## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ ## -securityContext: - enabled: true - fsGroup: 1001 - runAsUser: 1001 +# schedulerName: -## Use existing secret (ignores root, db and replication passwords) +## MariaDB architecture. Allowed values: standalone or replication ## -# existingSecret: +architecture: standalone -## Allow customization of the secret resource +## MariaDB Authentication parameters ## -secret: - ## Add custom annotations to the secret (evaluated as a template) - ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ - annotations: {} - ## Require all passwords at the secret resource - ## - requirePasswords: true - -## MariaDB admin credentials -## -rootUser: - ## MariaDB admin password +auth: + ## MariaDB root password ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-the-root-password-on-first-run ## + rootPassword: "" + ## MariaDB custom user and database + ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#creating-a-database-on-first-run + ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#creating-a-database-user-on-first-run + ## + database: my_database + username: "" password: "" - ## Option to force users to specify a password. That is required for 'helm upgrade' to work properly. - ## If it is not force, a random password will be generated. - ## - forcePassword: false - ## Mount admin password as a file instead of using an environment variable - ## - injectSecretsAsVolume: false - ## Specify custom secrets file location if injectSecretsAsVolume is true, - ## defaults to /opt/bitnami/mariadb/secrets/mariadb-root-password - # injectSecretsFile: "/vault/secrets/root-password" - -## Custom user/db credentials -## -db: - ## MariaDB username and password - ## ref: https://github.com/bitnami/bitnami-docker-mariadb#creating-a-database-user-on-first-run - ## - user: "" - password: "" - ## Database to create - ## ref: https://github.com/bitnami/bitnami-docker-mariadb#creating-a-database-on-first-run - ## - name: my_database - ## Option to force users to specify a password. That is required for 'helm upgrade' to work properly. - ## If it is not force, a random password will be generated. - ## - forcePassword: false - ## Mount user password as a file instead of using an environment variable - ## - injectSecretsAsVolume: false - ## Specify custom secrets file location if injectSecretsAsVolume is true, - ## defaults to /opt/bitnami/mariadb/secrets/mariadb-password - # injectSecretsFile: "/vault/secrets/user-password" - -## Replication configuration -## -replication: - ## Enable replication. This enables the creation of replicas of MariaDB. If false, only a - ## master deployment would be created - ## - enabled: true - ## MariaDB replication user + ## MariaDB replication user and password ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-up-a-replication-cluster ## - user: replicator - ## MariaDB replication user password - ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-up-a-replication-cluster + replicationUser: replicator + replicationPassword: "" + ## Existing secret with MariaDB credentials + ## NOTE: When it's set the previous parameters are ignored. ## - password: "" - ## Option to force users to specify a password. That is required for 'helm upgrade' to work properly. - ## If it is not force, a random password will be generated. + # existingSecret: name-of-existing-secret + ## Force users to specify required passwords ## forcePassword: false - ## Mount replication user password as a file instead of using an environment variable + ## Mount credentials as a files instead of using an environment variable ## - injectSecretsAsVolume: false - ## Specify custom secrets file location if injectSecretsAsVolume is true, - ## defaults to //opt/bitnami/mariadb/secrets/mariadb-replication-password - # injectSecretsFile: "/vault/secrets/replication-password" + usePasswordFiles: false ## initdb scripts ## Specify dictionary of scripts to be run at first boot -## Alternatively, you can put your scripts under the files/docker-entrypoint-initdb.d directory +## Example: +## initdbScripts: +## my_init_script.sh: | +## #!/bin/bash +## echo "Do something." +## +initdbScripts: {} + +## Existing ConfigMap with custom init scripts ## -# initdbScripts: -# my_init_script.sh: | -# #!/bin/sh -# echo "Do something." -# -## ConfigMap with scripts to be run at first boot -## Note: This will override initdbScripts # initdbScriptsConfigMap: -master: - ## Mariadb Master additional pod annotations - ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ - # annotations: - # key: value - # another-key: another-value - - ## MariaDB additional command line flags - ## Can be used to specify command line flags, for example: +## Mariadb Primary parameters +## +primary: + ## Command and args for running the container (set to default if not set). Use array form ## - ## extraFlags: "--max-connect-errors=1000 --max_connections=155" + command: [] + args: [] - ## Affinity for pod assignment + ## Configure MariaDB Primary with a custom my.cnf file + ## ref: https://mysql.com/kb/en/mysql/configuring-mysql-with-mycnf/#example-of-configuration-file + ## + configuration: |- + [mysqld] + skip-name-resolve + explicit_defaults_for_timestamp + basedir=/opt/bitnami/mariadb + plugin_dir=/opt/bitnami/mariadb/plugin + port=3306 + socket=/opt/bitnami/mariadb/tmp/mysql.sock + tmpdir=/opt/bitnami/mariadb/tmp + max_allowed_packet=16M + bind-address=0.0.0.0 + pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid + log-error=/opt/bitnami/mariadb/logs/mysqld.log + character-set-server=UTF8 + collation-server=utf8_general_ci + + [client] + port=3306 + socket=/opt/bitnami/mariadb/tmp/mysql.sock + default-character-set=UTF8 + plugin_dir=/opt/bitnami/mariadb/plugin + + [manager] + port=3306 + socket=/opt/bitnami/mariadb/tmp/mysql.sock + pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid + + ## Name of existing ConfigMap with MariaDB Primary configuration. + ## NOTE: When it's set the 'configuration' parameter is ignored + ## + # existingConfiguration: + + ## updateStrategy for Mariadb Primary statefulset + ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies + ## + updateStrategy: RollingUpdate + + ## Partition update strategy for Mariadb Primary statefulset + ## https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#partitions + ## + # rollingUpdatePartition: + + ## Mariadb Primary pod annotations + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + ## + podAnnotations: {} + + ## Mariadb Primary pod affinity preset + ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity + ## Allowed values: soft, hard + ## + podAffinityPreset: "" + + ## Mariadb Primary pod anti-affinity preset + ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity + ## Allowed values: soft, hard + ## + podAntiAffinityPreset: soft + + ## Mariadb Primary node affinity preset + ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity + ## Allowed values: soft, hard + ## + nodeAffinityPreset: + ## Node affinity type + ## Allowed values: soft, hard + type: "" + ## Node label key to match + ## E.g. + ## key: "kubernetes.io/e2e-az-name" + ## + key: "" + ## Node label values to match + ## E.g. + ## values: + ## - e2e-az1 + ## - e2e-az2 + ## + values: [] + + ## Affinity for MariaDB primary pods assignment ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity + ## Note: podAffinityPreset, podAntiAffinityPreset, and nodeAffinityPreset will be ignored when it's set ## affinity: {} - ## Kept for backwards compatibility. You can now disable it by removing it. - ## if you wish to set it through master.affinity.podAntiAffinity instead. - ## - antiAffinity: soft - - ## Node labels for pod assignment + ## Node labels for MariaDB primary pods assignment ## Ref: https://kubernetes.io/docs/user-guide/node-selection/ ## nodeSelector: {} - ## Tolerations for pod assignment + ## Tolerations for MariaDB primary pods assignment ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ ## tolerations: [] - ## updateStrategy for MariaDB Master StatefulSet - ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies - updateStrategy: - type: RollingUpdate + ## MariaDB primary Pod security context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod + ## + podSecurityContext: + enabled: true + fsGroup: 1001 + + ## MariaDB primary container security context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container + ## + containerSecurityContext: + enabled: true + runAsUser: 1001 + + ## MariaDB primary container's resource requests and limits + ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ + ## + resources: + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + limits: {} + # memory: 256Mi + # cpu: 100m + requests: {} + # memory: 256Mi + # cpu: 100m + + ## MariaDB primary container's liveness and readiness probes + ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes + ## + livenessProbe: + enabled: true + initialDelaySeconds: 120 + periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 + successThreshold: 1 + readinessProbe: + enabled: true + initialDelaySeconds: 30 + periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 + successThreshold: 1 + + ## MariaDB primary custom liveness probe + ## + customLivenessProbe: {} + + ## MariaDB primary custom rediness probe + ## + customReadinessProbe: {} + + ## MariaDB primary additional command line flags + ## Can be used to specify command line flags, for example: + ## E.g. + ## extraFlags: "--max-connect-errors=1000 --max_connections=155" + ## + extraFlags: "" + + ## An array to add extra environment variables on MariaDB primary containers + ## E.g. + ## extraEnvVars: + ## - name: TZ + ## value: "Europe/Paris" + ## + extraEnvVars: [] + + ## ConfigMap with extra env vars for MariaDB primary containers: + ## + extraEnvVarsCM: "" + + ## Secret with extra env vars for MariaDB primary containers: + ## + extraEnvVarsSecret: "" ## Enable persistence using Persistent Volume Claims ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ @@ -247,11 +297,10 @@ master: ## If true, use a Persistent Volume Claim, If false, use emptyDir ## enabled: true - # Enable persistence using an existing PVC + ## Name of existing PVC to hold MariaDB Primary data + ## NOTE: When it's set the rest of persistence parameters are ignored + ## # existingClaim: - # Subdirectory of the volume to mount - # subPath: - mountPath: /bitnami/mariadb ## Persistent Volume Storage Class ## If defined, storageClassName: ## If set to "-", storageClassName: "", which disables dynamic provisioning @@ -276,35 +325,86 @@ master: ## app: my-app selector: {} - ## Add extra init Containers (evaluated as a templ + ## Extra volumes to add to the MariaDB Primary pod(s) ## - extraInitContainers: [] + extraVolumes: [] - ## An array to add extra environment variables - ## For example: - ## extraEnvVars: - ## - name: TZ - ## value: "Europe/Paris" + ## Extra volume mounts to add to the MariaDB Primary container(s) ## - extraEnvVars: + extraVolumeMounts: [] - ## ConfigMap with extra env vars: + ## Extra init containers to add to the MariaDB Primary pod(s) ## - extraEnvVarsCM: + initContainers: [] - ## Secret with extra env vars: + ## Extra sidecar containers to add to the MariaDB Primary pod(s) ## - extraEnvVarsSecret: + sidecars: [] - ## Configure MySQL with a custom my.cnf file + ## MariaDB Primary Service paramaters + ## + service: + ## Service type + ## + type: ClusterIP + ## Service port + ## + port: 3306 + ## Specify the nodePort value for the LoadBalancer and NodePort service types. + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport + ## + nodePort: "" + ## Service clusterIP + ## + # clusterIP: None + clusterIP: "" + ## Set the LoadBalancer service type to internal only. + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer + ## + loadBalancerIP: "" + ## Load Balancer sources + ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service + ## E.g. + ## loadBalancerSourceRanges: + ## - 10.10.10.0/24 + ## + loadBalancerSourceRanges: [] + ## Provide any additional annotations which may be required + ## + annotations: {} + + ## MariaDB primary Pod Disruption Budget configuration + ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ + ## + pdb: + create: false + ## Min number of pods that must still be available after the eviction + ## + minAvailable: 1 + ## Max number of pods that can be unavailable after the eviction + ## + # maxUnavailable: 1 + +## Mariadb Secondary parameters +## +secondary: + ## Number of Mariadb Secondary replicas to deploy + ## + replicaCount: 1 + + ## Command and args for running the container (set to default if not set). Use array form + ## + command: [] + args: [] + + ## Configure MariaDB Secondary with a custom my.cnf file ## ref: https://mysql.com/kb/en/mysql/configuring-mysql-with-mycnf/#example-of-configuration-file ## - config: |- + configuration: |- [mysqld] skip-name-resolve explicit_defaults_for_timestamp basedir=/opt/bitnami/mariadb - plugin_dir=/opt/bitnami/mariadb/plugin port=3306 socket=/opt/bitnami/mariadb/tmp/mysql.sock tmpdir=/opt/bitnami/mariadb/tmp @@ -319,96 +419,179 @@ master: port=3306 socket=/opt/bitnami/mariadb/tmp/mysql.sock default-character-set=UTF8 - plugin_dir=/opt/bitnami/mariadb/plugin [manager] port=3306 socket=/opt/bitnami/mariadb/tmp/mysql.sock pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid - ## Configure master resource requests and limits - ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ + ## Name of existing ConfigMap with MariaDB Secondary configuration. + ## NOTE: When it's set the 'configuration' parameter is ignored ## - resources: {} - livenessProbe: - enabled: true - ## - ## Initializing the database could take some time - initialDelaySeconds: 120 - ## - ## Default Kubernetes values - periodSeconds: 10 - timeoutSeconds: 1 - successThreshold: 1 - failureThreshold: 3 - readinessProbe: - enabled: true - initialDelaySeconds: 30 - ## - ## Default Kubernetes values - periodSeconds: 10 - timeoutSeconds: 1 - successThreshold: 1 - failureThreshold: 3 + # existingConfiguration: - podDisruptionBudget: - enabled: false - minAvailable: 1 - # maxUnavailable: 1 - - ## Allow customization of the service resource + ## updateStrategy for Mariadb Secondary statefulset + ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies ## - service: - ## Add custom annotations to the service - ## - annotations: {} - # external-dns.alpha.kubernetes.io/hostname: db.example.com + updateStrategy: RollingUpdate -slave: - replicas: 1 + ## Partition update strategy for Mariadb Secondary statefulset + ## https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#partitions + ## + # rollingUpdatePartition: - ## Mariadb Slave additional pod annotations + ## Mariadb Secondary pod annotations ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ - # annotations: - # key: value - # another-key: another-value - - ## MariaDB additional command line flags - ## Can be used to specify command line flags, for example: ## - ## extraFlags: "--max-connect-errors=1000 --max_connections=155" + podAnnotations: {} - ## Affinity for pod assignment + ## Mariadb Secondary pod affinity preset + ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity + ## Allowed values: soft, hard + ## + podAffinityPreset: "" + + ## Mariadb Secondary pod anti-affinity preset + ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity + ## Allowed values: soft, hard + ## + podAntiAffinityPreset: soft + + ## Mariadb Secondary node affinity preset + ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity + ## Allowed values: soft, hard + ## + nodeAffinityPreset: + ## Node affinity type + ## Allowed values: soft, hard + type: "" + ## Node label key to match + ## E.g. + ## key: "kubernetes.io/e2e-az-name" + ## + key: "" + ## Node label values to match + ## E.g. + ## values: + ## - e2e-az1 + ## - e2e-az2 + ## + values: [] + + ## Affinity for MariaDB secondary pods assignment ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity + ## Note: podAffinityPreset, podAntiAffinityPreset, and nodeAffinityPreset will be ignored when it's set ## affinity: {} - ## Kept for backwards compatibility. You can now disable it by removing it. - ## if you wish to set it through slave.affinity.podAntiAffinity instead. - ## - antiAffinity: soft - - ## Node labels for pod assignment + ## Node labels for MariaDB secondary pods assignment ## Ref: https://kubernetes.io/docs/user-guide/node-selection/ ## nodeSelector: {} - ## Tolerations for pod assignment + ## Tolerations for MariaDB secondary pods assignment ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ ## tolerations: [] - ## updateStrategy for MariaDB Slave StatefulSet - ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies - updateStrategy: - type: RollingUpdate + ## MariaDB secondary Pod security context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod + ## + podSecurityContext: + enabled: true + fsGroup: 1001 + ## MariaDB secondary container security context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container + ## + containerSecurityContext: + enabled: true + runAsUser: 1001 + + ## MariaDB secondary container's resource requests and limits + ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ + ## + resources: + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + limits: {} + # memory: 256Mi + # cpu: 100m + requests: {} + # memory: 256Mi + # cpu: 100m + + ## MariaDB secondary container's liveness and readiness probes + ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes + ## + livenessProbe: + enabled: true + initialDelaySeconds: 120 + periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 + successThreshold: 1 + readinessProbe: + enabled: true + initialDelaySeconds: 30 + periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 + successThreshold: 1 + + ## MariaDB secondary custom liveness probe + ## + customLivenessProbe: {} + + ## MariaDB secondary custom rediness probe + ## + customReadinessProbe: {} + + ## MariaDB secondary additional command line flags + ## Can be used to specify command line flags, for example: + ## E.g. + ## extraFlags: "--max-connect-errors=1000 --max_connections=155" + ## + extraFlags: "" + + ## An array to add extra environment variables on MariaDB secondary containers + ## E.g. + ## extraEnvVars: + ## - name: TZ + ## value: "Europe/Paris" + ## + extraEnvVars: [] + + ## ConfigMap with extra env vars for MariaDB secondary containers: + ## + extraEnvVarsCM: "" + + ## Secret with extra env vars for MariaDB secondary containers: + ## + extraEnvVarsSecret: "" + + ## Enable persistence using Persistent Volume Claims + ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ + ## persistence: ## If true, use a Persistent Volume Claim, If false, use emptyDir ## enabled: true + ## Persistent Volume Storage Class + ## If defined, storageClassName: + ## If set to "-", storageClassName: "", which disables dynamic provisioning + ## If undefined (the default) or set to null, no storageClassName spec is + ## set, choosing the default provisioner. (gp2 on AWS, standard on + ## GKE, AWS & OpenStack) + ## # storageClass: "-" - annotations: + ## Persistent Volume Claim annotations + ## + annotations: {} + ## Persistent Volume Access Mode + ## accessModes: - ReadWriteOnce ## Persistent Volume size @@ -420,93 +603,109 @@ slave: ## app: my-app selector: {} - ## Add extra init containers + ## Extra volumes to add to the MariaDB Secondary pod(s) ## - extraInitContainers: + extraVolumes: [] - ## An array to add extra environment variables - ## For example: - ## extraEnvVars: - ## - name: TZ - ## value: "Europe/Paris" + ## Extra volume mounts to add to the MariaDB Secondary container(s) ## - extraEnvVars: + extraVolumeMounts: [] - ## ConfigMap with extra env vars: + ## Extra init containers to add to the MariaDB Secondary pod(s) ## - extraEnvVarsCM: + initContainers: [] - ## Secret with extra env vars: + ## Extra sidecar containers to add to the MariaDB Secondary pod(s) ## - extraEnvVarsSecret: + sidecars: [] - ## Configure MySQL slave with a custom my.cnf file - ## ref: https://mysql.com/kb/en/mysql/configuring-mysql-with-mycnf/#example-of-configuration-file - ## - config: |- - [mysqld] - skip-name-resolve - explicit_defaults_for_timestamp - basedir=/opt/bitnami/mariadb - port=3306 - socket=/opt/bitnami/mariadb/tmp/mysql.sock - tmpdir=/opt/bitnami/mariadb/tmp - max_allowed_packet=16M - bind-address=0.0.0.0 - pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid - log-error=/opt/bitnami/mariadb/logs/mysqld.log - character-set-server=UTF8 - collation-server=utf8_general_ci - - [client] - port=3306 - socket=/opt/bitnami/mariadb/tmp/mysql.sock - default-character-set=UTF8 - - [manager] - port=3306 - socket=/opt/bitnami/mariadb/tmp/mysql.sock - pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid - - ## - ## Configure slave resource requests and limits - ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ - ## - resources: {} - livenessProbe: - enabled: true - ## - ## Initializing the database could take some time - initialDelaySeconds: 120 - ## - ## Default Kubernetes values - periodSeconds: 10 - timeoutSeconds: 1 - successThreshold: 1 - failureThreshold: 3 - readinessProbe: - enabled: true - initialDelaySeconds: 45 - ## - ## Default Kubernetes values - periodSeconds: 10 - timeoutSeconds: 1 - successThreshold: 1 - failureThreshold: 3 - - podDisruptionBudget: - enabled: false - minAvailable: 1 - # maxUnavailable: 1 - - ## Allow customization of the service resource + ## MariaDB Secondary Service paramaters ## service: - ## Add custom annotations to the service + ## Service type + ## + type: ClusterIP + ## Service port + ## + port: 3306 + ## Specify the nodePort value for the LoadBalancer and NodePort service types. + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport + ## + nodePort: "" + ## Service clusterIP + ## + # clusterIP: None + clusterIP: "" + ## Set the LoadBalancer service type to internal only. + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer + ## + loadBalancerIP: "" + ## Load Balancer sources + ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service + ## E.g. + ## loadBalancerSourceRanges: + ## - 10.10.10.0/24 + ## + loadBalancerSourceRanges: [] + ## Provide any additional annotations which may be required ## annotations: {} - # external-dns.alpha.kubernetes.io/hostname: rodb.example.com + ## MariaDB secondary Pod Disruption Budget configuration + ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ + ## + pdb: + create: false + ## Min number of pods that must still be available after the eviction + ## + minAvailable: 1 + ## Max number of pods that can be unavailable after the eviction + ## + # maxUnavailable: 1 + +## MariaDB pods ServiceAccount +## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ +## +serviceAccount: + ## Specifies whether a ServiceAccount should be created + ## + create: true + ## The name of the ServiceAccount to use. + ## If not set and create is true, a name is generated using the mariadb.fullname template + ## + # name: + ## Annotations to add to the service account (evaluated as a template) + ## + annotations: {} + +## Role Based Access +## ref: https://kubernetes.io/docs/admin/authorization/rbac/ +## +rbac: + ## Specifies whether RBAC rules should be created + ## + create: false + +## Init containers parameters: +## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section. +## +volumePermissions: + enabled: false + image: + registry: docker.io + repository: bitnami/minideb + tag: buster + 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/ + ## + # pullSecrets: + # - myRegistryKeySecretName + resources: {} + +## Mysqld Prometheus exporter paramters +## metrics: enabled: false image: @@ -520,59 +719,74 @@ metrics: ## # pullSecrets: # - myRegistryKeySecretName - resources: {} + annotations: prometheus.io/scrape: "true" prometheus.io/port: "9104" ## Extra args to be passed to mysqld_exporter ## ref: https://github.com/prometheus/mysqld_exporter/ + ## E.g. + ## - --collect.auto_increment.columns + ## - --collect.binlog_size + ## - --collect.engine_innodb_status + ## - --collect.engine_tokudb_status + ## - --collect.global_status + ## - --collect.global_variables + ## - --collect.info_schema.clientstats + ## - --collect.info_schema.innodb_metrics + ## - --collect.info_schema.innodb_tablespaces + ## - --collect.info_schema.innodb_cmp + ## - --collect.info_schema.innodb_cmpmem + ## - --collect.info_schema.processlist + ## - --collect.info_schema.processlist.min_time + ## - --collect.info_schema.query_response_time + ## - --collect.info_schema.tables + ## - --collect.info_schema.tables.databases + ## - --collect.info_schema.tablestats + ## - --collect.info_schema.userstats + ## - --collect.perf_schema.eventsstatements + ## - --collect.perf_schema.eventsstatements.digest_text_limit + ## - --collect.perf_schema.eventsstatements.limit + ## - --collect.perf_schema.eventsstatements.timelimit + ## - --collect.perf_schema.eventswaits + ## - --collect.perf_schema.file_events + ## - --collect.perf_schema.file_instances + ## - --collect.perf_schema.indexiowaits + ## - --collect.perf_schema.tableiowaits + ## - --collect.perf_schema.tablelocks + ## - --collect.perf_schema.replication_group_member_stats + ## - --collect.slave_status + ## - --collect.slave_hosts + ## - --collect.heartbeat + ## - --collect.heartbeat.database + ## - --collect.heartbeat.table ## extraArgs: master: [] slave: [] - # - --collect.auto_increment.columns - # - --collect.binlog_size - # - --collect.engine_innodb_status - # - --collect.engine_tokudb_status - # - --collect.global_status - # - --collect.global_variables - # - --collect.info_schema.clientstats - # - --collect.info_schema.innodb_metrics - # - --collect.info_schema.innodb_tablespaces - # - --collect.info_schema.innodb_cmp - # - --collect.info_schema.innodb_cmpmem - # - --collect.info_schema.processlist - # - --collect.info_schema.processlist.min_time - # - --collect.info_schema.query_response_time - # - --collect.info_schema.tables - # - --collect.info_schema.tables.databases - # - --collect.info_schema.tablestats - # - --collect.info_schema.userstats - # - --collect.perf_schema.eventsstatements - # - --collect.perf_schema.eventsstatements.digest_text_limit - # - --collect.perf_schema.eventsstatements.limit - # - --collect.perf_schema.eventsstatements.timelimit - # - --collect.perf_schema.eventswaits - # - --collect.perf_schema.file_events - # - --collect.perf_schema.file_instances - # - --collect.perf_schema.indexiowaits - # - --collect.perf_schema.tableiowaits - # - --collect.perf_schema.tablelocks - # - --collect.perf_schema.replication_group_member_stats - # - --collect.slave_status - # - --collect.slave_hosts - # - --collect.heartbeat - # - --collect.heartbeat.database - # - --collect.heartbeat.table + ## Mysqld Prometheus exporter resource requests and limits + ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ + ## + resources: + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + limits: {} + # memory: 256Mi + # cpu: 100m + requests: {} + # memory: 256Mi + # cpu: 100m + + ## Mysqld Prometheus exporter liveness and readiness probes + ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes + ## livenessProbe: enabled: true - ## - ## Initializing the database could take some time initialDelaySeconds: 120 - ## - ## Default Kubernetes values periodSeconds: 10 timeoutSeconds: 1 successThreshold: 1 @@ -580,23 +794,37 @@ metrics: readinessProbe: enabled: true initialDelaySeconds: 30 - ## - ## Default Kubernetes values periodSeconds: 10 timeoutSeconds: 1 successThreshold: 1 failureThreshold: 3 - # Enable this if you're using https://github.com/coreos/prometheus-operator + ## Prometheus Service Monitor + ## ref: https://github.com/coreos/prometheus-operator + ## serviceMonitor: + ## If the operator is installed in your cluster, set to true to create a Service Monitor Entry + ## enabled: false - ## Specify a namespace if needed - # namespace: monitoring - # fallback to the prometheus default unless specified - # interval: 10s - # scrapeTimeout: 10s - ## Defaults to what's used if you follow CoreOS [Prometheus Install Instructions](https://github.com/bitnami/charts/tree/master/bitnami/prometheus-operator#tldr) - ## [Prometheus Selector Label](https://github.com/bitnami/charts/tree/master/bitnami/prometheus-operator#prometheus-operator-1) - ## [Kube Prometheus Selector Label](https://github.com/bitnami/charts/tree/master/bitnami/prometheus-operator#exporters) - selector: - prometheus: kube-prometheus + ## Specify the namespace in which the serviceMonitor resource will be created + ## + # namespace: "" + ## Specify the interval at which metrics should be scraped + ## + interval: 30s + ## Specify the timeout after which the scrape is ended + ## + # scrapeTimeout: 30s + ## Specify Metric Relabellings to add to the scrape endpoint + ## + # relabellings: + ## Specify honorLabels parameter to add the scrape endpoint + ## + honorLabels: false + ## Specify the release for ServiceMonitor. Sometimes it should be custom for prometheus operator to work + ## + # release: "" + ## Used to pass Labels that are used by the Prometheus installed in your cluster to select Service Monitors to work with + ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#prometheusspec + ## + additionalLabels: {}