From a68fc72002b50423d41fb8d16adde78f20100bc1 Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Thu, 17 Oct 2019 08:35:02 +0000 Subject: [PATCH] Synchronize upstreamed folder to c25ac17e5 --- upstreamed/ghost/Chart.yaml | 2 +- upstreamed/ghost/README.md | 4 +- upstreamed/joomla/Chart.yaml | 2 +- upstreamed/joomla/README.md | 4 +- upstreamed/kubewatch/Chart.yaml | 2 +- upstreamed/kubewatch/README.md | 5 + upstreamed/mariadb/Chart.yaml | 2 +- upstreamed/mariadb/README.md | 50 +-- .../mariadb/templates/master-statefulset.yaml | 340 +++++++++--------- .../mariadb/templates/slave-statefulset.yaml | 322 ++++++++--------- upstreamed/mariadb/values-production.yaml | 22 +- upstreamed/mariadb/values.yaml | 20 +- upstreamed/mediawiki/Chart.yaml | 2 +- upstreamed/mediawiki/README.md | 4 +- upstreamed/moodle/Chart.yaml | 2 +- upstreamed/moodle/README.md | 4 +- upstreamed/nats/Chart.yaml | 2 +- upstreamed/nats/README.md | 4 +- upstreamed/odoo/Chart.yaml | 2 +- upstreamed/odoo/README.md | 4 +- upstreamed/opencart/Chart.yaml | 2 +- upstreamed/opencart/README.md | 4 +- upstreamed/orangehrm/Chart.yaml | 2 +- upstreamed/orangehrm/README.md | 4 +- upstreamed/owncloud/Chart.yaml | 2 +- upstreamed/owncloud/README.md | 4 +- upstreamed/phabricator/Chart.yaml | 2 +- upstreamed/phabricator/README.md | 5 +- upstreamed/phabricator/requirements.lock | 4 +- upstreamed/phabricator/templates/ingress.yaml | 14 +- upstreamed/phabricator/values.yaml | 23 +- 31 files changed, 470 insertions(+), 395 deletions(-) diff --git a/upstreamed/ghost/Chart.yaml b/upstreamed/ghost/Chart.yaml index fecb06153..b9b9f6b1a 100644 --- a/upstreamed/ghost/Chart.yaml +++ b/upstreamed/ghost/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: ghost -version: 7.2.10 +version: 7.2.11 appVersion: 2.37.0 description: A simple, powerful publishing platform that allows you to share your stories with the world keywords: diff --git a/upstreamed/ghost/README.md b/upstreamed/ghost/README.md index 71f498db5..16511b25d 100644 --- a/upstreamed/ghost/README.md +++ b/upstreamed/ghost/README.md @@ -18,8 +18,10 @@ Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment ## Prerequisites -- Kubernetes 1.4+ with Beta APIs enabled +- Kubernetes 1.12+ +- Helm 2.11+ or Helm 3.0-beta3+ - PV provisioner support in the underlying infrastructure +- ReadWriteMany volumes for deployment scaling ## Installing the Chart diff --git a/upstreamed/joomla/Chart.yaml b/upstreamed/joomla/Chart.yaml index 00788f46a..7b306cf45 100644 --- a/upstreamed/joomla/Chart.yaml +++ b/upstreamed/joomla/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: joomla -version: 6.1.8 +version: 6.1.9 appVersion: 3.9.12 description: PHP content management system (CMS) for publishing web content keywords: diff --git a/upstreamed/joomla/README.md b/upstreamed/joomla/README.md index c2fe181ab..b0a5f8df1 100644 --- a/upstreamed/joomla/README.md +++ b/upstreamed/joomla/README.md @@ -18,8 +18,10 @@ Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment ## Prerequisites -- Kubernetes 1.4+ with Beta APIs enabled +- Kubernetes 1.12+ +- Helm 2.11+ or Helm 3.0-beta3+ - PV provisioner support in the underlying infrastructure +- ReadWriteMany volumes for deployment scaling ## Installing the Chart diff --git a/upstreamed/kubewatch/Chart.yaml b/upstreamed/kubewatch/Chart.yaml index 0024b2b65..642af4ff7 100644 --- a/upstreamed/kubewatch/Chart.yaml +++ b/upstreamed/kubewatch/Chart.yaml @@ -1,5 +1,5 @@ name: kubewatch -version: 0.8.10 +version: 0.8.11 apiVersion: v1 appVersion: 0.0.4 home: https://github.com/bitnami-labs/kubewatch diff --git a/upstreamed/kubewatch/README.md b/upstreamed/kubewatch/README.md index da12e6543..005beb26b 100644 --- a/upstreamed/kubewatch/README.md +++ b/upstreamed/kubewatch/README.md @@ -13,6 +13,11 @@ $ helm install stable/kubewatch This chart bootstraps a kubewatch deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +## Prerequisites + +- Kubernetes 1.12+ +- Helm 2.11+ or Helm 3.0-beta3+ + ## Installing the Chart To install the chart with the release name `my-release`: diff --git a/upstreamed/mariadb/Chart.yaml b/upstreamed/mariadb/Chart.yaml index 6894ca267..dfde9d52f 100644 --- a/upstreamed/mariadb/Chart.yaml +++ b/upstreamed/mariadb/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mariadb -version: 6.11.3 +version: 6.12.0 appVersion: 10.3.18 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: diff --git a/upstreamed/mariadb/README.md b/upstreamed/mariadb/README.md index 8544e4d93..150efac61 100644 --- a/upstreamed/mariadb/README.md +++ b/upstreamed/mariadb/README.md @@ -52,7 +52,7 @@ The following table lists the configurable parameters of the MariaDB chart and t |-------------------------------------------|-----------------------------------------------------|-------------------------------------------------------------------| | `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` | +| `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}` | @@ -61,12 +61,12 @@ The following table lists the configurable parameters of the MariaDB chart and t | `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` | -| `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 | `stretch` | -| `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `Always` | -| `volumePermissions.resources` | Init container resource requests/limit | `nil` | +| `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 | `stretch` | +| `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` | @@ -78,7 +78,7 @@ The following table lists the configurable parameters of the MariaDB chart and t | `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`. | | +| `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` | | `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` | | `db.user` | Username of new user to create | `nil` | @@ -108,6 +108,7 @@ The following table lists the configurable parameters of the MariaDB chart and t | `master.persistence.accessModes` | Persistent Volume Access Modes | `[ReadWriteOnce]` | | `master.persistence.size` | Persistent Volume Size | `8Gi` | | `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.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` | @@ -140,7 +141,8 @@ The following table lists the configurable parameters of the MariaDB chart and t | `slave.persistence.storageClass` | Persistent Volume Storage Class | `` | | `slave.persistence.accessModes` | Persistent Volume Access Modes | `[ReadWriteOnce]` | | `slave.persistence.size` | Persistent Volume Size | `8Gi` | -| `slave.extraInitContainers` | Additional init containers as a string to be passed to the `tpl` function (slave) | | +| `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.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` | @@ -167,22 +169,22 @@ The following table lists the configurable parameters of the MariaDB chart and t | `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.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 }` | +| `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 }` | 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. diff --git a/upstreamed/mariadb/templates/master-statefulset.yaml b/upstreamed/mariadb/templates/master-statefulset.yaml index 1541d47e7..877d75288 100644 --- a/upstreamed/mariadb/templates/master-statefulset.yaml +++ b/upstreamed/mariadb/templates/master-statefulset.yaml @@ -3,18 +3,18 @@ kind: StatefulSet metadata: name: {{ template "master.fullname" . }} labels: - app: "{{ template "mariadb.name" . }}" - chart: "{{ template "mariadb.chart" . }}" - component: "master" - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} + app: {{ template "mariadb.name" . }} + chart: {{ template "mariadb.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} + component: master spec: selector: matchLabels: - release: "{{ .Release.Name }}" - component: "master" - app: "{{ template "mariadb.name" . }}" - serviceName: "{{ template "master.fullname" . }}" + app: {{ template "mariadb.name" . }} + release: {{ .Release.Name }} + component: master + serviceName: {{ template "master.fullname" . }} replicas: 1 updateStrategy: type: {{ .Values.master.updateStrategy.type }} @@ -26,19 +26,19 @@ spec: {{- if .Values.master.annotations }} annotations: {{- range $key, $value := .Values.master.annotations }} - {{ $key }}: '{{ $value }}' + {{ $key }}: {{ $value }} {{- end }} {{- end }} labels: - app: "{{ template "mariadb.name" . }}" - component: "master" - release: "{{ .Release.Name }}" - chart: "{{ template "mariadb.chart" . }}" + app: {{ template "mariadb.name" . }} + chart: {{ template "mariadb.chart" . }} + release: {{ .Release.Name }} + component: master spec: {{- if .Values.schedulerName }} - schedulerName: "{{ .Values.schedulerName }}" + schedulerName: {{ .Values.schedulerName | quote }} {{- end }} - serviceAccountName: "{{ template "mariadb.serviceAccountName" . }}" + serviceAccountName: {{ template "mariadb.serviceAccountName" . }} {{- if .Values.securityContext.enabled }} securityContext: fsGroup: {{ .Values.securityContext.fsGroup }} @@ -54,8 +54,8 @@ spec: - topologyKey: "kubernetes.io/hostname" labelSelector: matchLabels: - app: "{{ template "mariadb.name" . }}" - release: "{{ .Release.Name }}" + app: {{ template "mariadb.name" . }} + release: {{ .Release.Name }} {{- else if eq .Values.master.antiAffinity "soft" }} affinity: {{- with .Values.master.affinity }} @@ -63,171 +63,173 @@ spec: {{- end }} podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - - weight: 1 - podAffinityTerm: - topologyKey: kubernetes.io/hostname - labelSelector: - matchLabels: - app: "{{ template "mariadb.name" . }}" - release: "{{ .Release.Name }}" + - weight: 1 + podAffinityTerm: + topologyKey: kubernetes.io/hostname + labelSelector: + matchLabels: + app: {{ template "mariadb.name" . }} + release: {{ .Release.Name }} {{- else}} {{- with .Values.master.affinity }} - affinity: -{{ toYaml . | indent 8 }} + affinity: {{ toYaml . | nindent 8 }} {{- end }} {{- end }} {{- if .Values.master.nodeSelector }} - nodeSelector: - {{ toYaml .Values.master.nodeSelector | nindent 8 }} + nodeSelector: {{ toYaml .Values.master.nodeSelector | nindent 8 }} {{- end -}} {{- with .Values.master.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} + tolerations: {{ toYaml . | nindent 8 }} {{- end }} {{- include "mariadb.imagePullSecrets" . | indent 6 }} initContainers: - {{- if .Values.master.extraInitContainers }} -{{ tpl .Values.master.extraInitContainers . | indent 6}} - {{- 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 10 }} - volumeMounts: - - name: data - mountPath: {{ .Values.master.persistence.mountPath }} - {{- end }} + {{- 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 }} - - name: MARIADB_ROOT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "mariadb.secretName" . }} - key: mariadb-root-password - {{- if .Values.db.user }} - - name: MARIADB_USER - value: "{{ .Values.db.user }}" - - name: MARIADB_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "mariadb.secretName" . }} - key: mariadb-password - {{- 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 }}" - - name: MARIADB_REPLICATION_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "mariadb.secretName" . }} - key: mariadb-replication-password - {{- end }} - ports: - - name: mysql - containerPort: 3306 - {{- if .Values.master.livenessProbe.enabled }} - livenessProbe: - exec: - command: ["sh", "-c", "exec mysqladmin status -uroot -p$MARIADB_ROOT_PASSWORD"] - 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", "exec mysqladmin status -uroot -p$MARIADB_ROOT_PASSWORD"] - 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 }} - resources: -{{ toYaml .Values.master.resources | indent 10 }} - 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 .Values.metrics.enabled }} - - name: metrics - image: {{ template "mariadb.metrics.image" . }} - imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} - env: - - name: MARIADB_ROOT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "mariadb.secretName" . }} - key: mariadb-root-password - command: - - sh - - -c - - >- - DATA_SOURCE_NAME="root:$MARIADB_ROOT_PASSWORD@(localhost:3306)/" - /bin/mysqld_exporter - {{- range .Values.metrics.extraArgs.master }} - {{ . }} + - name: "mariadb" + image: {{ template "mariadb.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} + env: + {{- if .Values.image.debug}} + - name: BITNAMI_DEBUG + value: "true" {{- end }} - ports: + {{- if .Values.master.extraFlags }} + - name: MARIADB_EXTRA_FLAGS + value: "{{ .Values.master.extraFlags }}" + {{- end }} + - name: MARIADB_ROOT_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "mariadb.secretName" . }} + key: mariadb-root-password + {{- if .Values.db.user }} + - name: MARIADB_USER + value: "{{ .Values.db.user }}" + - name: MARIADB_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "mariadb.secretName" . }} + key: mariadb-password + {{- 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 }}" + - name: MARIADB_REPLICATION_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "mariadb.secretName" . }} + key: mariadb-replication-password + {{- end }} + {{- if .Values.master.extraEnvVars }} + {{- tpl (toYaml .Values.master.extraEnvVars) $ | nindent 12 }} + {{- end }} + ports: + - name: mysql + containerPort: 3306 + {{- if .Values.master.livenessProbe.enabled }} + livenessProbe: + exec: + command: ["sh", "-c", "exec mysqladmin status -uroot -p$MARIADB_ROOT_PASSWORD"] + 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", "exec mysqladmin status -uroot -p$MARIADB_ROOT_PASSWORD"] + 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 .Values.metrics.enabled }} - 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 }} + image: {{ template "mariadb.metrics.image" . }} + imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} + env: + - name: MARIADB_ROOT_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "mariadb.secretName" . }} + key: mariadb-root-password + command: + - sh + - -c + - >- + DATA_SOURCE_NAME="root:$MARIADB_ROOT_PASSWORD@(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 }} {{- 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 }} - resources: -{{ toYaml .Values.metrics.resources | indent 10 }} -{{- end }} volumes: {{- if .Values.master.config }} - name: config diff --git a/upstreamed/mariadb/templates/slave-statefulset.yaml b/upstreamed/mariadb/templates/slave-statefulset.yaml index 28a2ac103..4b850d30e 100644 --- a/upstreamed/mariadb/templates/slave-statefulset.yaml +++ b/upstreamed/mariadb/templates/slave-statefulset.yaml @@ -4,18 +4,18 @@ kind: StatefulSet metadata: name: {{ template "slave.fullname" . }} labels: - app: "{{ template "mariadb.name" . }}" - chart: "{{ template "mariadb.chart" . }}" - component: "slave" - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} + app: {{ template "mariadb.name" . }} + chart: {{ template "mariadb.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} + component: slave spec: selector: matchLabels: - release: "{{ .Release.Name }}" - component: "slave" - app: "{{ template "mariadb.name" . }}" - serviceName: "{{ template "slave.fullname" . }}" + app: {{ template "mariadb.name" . }} + release: {{ .Release.Name }} + component: slave + serviceName: {{ template "slave.fullname" . }} replicas: {{ .Values.slave.replicas }} updateStrategy: type: {{ .Values.slave.updateStrategy.type }} @@ -27,19 +27,19 @@ spec: {{- if .Values.slave.annotations }} annotations: {{- range $key, $value := .Values.slave.annotations }} - {{ $key }}: '{{ $value }}' + {{ $key }}: {{ $value }} {{- end }} {{- end }} labels: - app: "{{ template "mariadb.name" . }}" - component: "slave" - release: "{{ .Release.Name }}" - chart: "{{ template "mariadb.chart" . }}" + app: {{ template "mariadb.name" . }} + chart: {{ template "mariadb.chart" . }} + release: {{ .Release.Name }} + component: slave spec: {{- if .Values.schedulerName }} - schedulerName: "{{ .Values.schedulerName }}" + schedulerName: {{ .Values.schedulerName | quote }} {{- end }} - serviceAccountName: "{{ template "mariadb.serviceAccountName" . }}" + serviceAccountName: {{ template "mariadb.serviceAccountName" . }} {{- if .Values.securityContext.enabled }} securityContext: fsGroup: {{ .Values.securityContext.fsGroup }} @@ -55,8 +55,8 @@ spec: - topologyKey: "kubernetes.io/hostname" labelSelector: matchLabels: - app: "{{ template "mariadb.name" . }}" - release: "{{ .Release.Name }}" + app: {{ template "mariadb.name" . }} + release: {{ .Release.Name }} {{- else if eq .Values.slave.antiAffinity "soft" }} affinity: {{- with .Values.slave.affinity }} @@ -64,164 +64,169 @@ spec: {{- end }} podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - - weight: 1 - podAffinityTerm: - topologyKey: kubernetes.io/hostname - labelSelector: - matchLabels: - app: "{{ template "mariadb.name" . }}" - release: "{{ .Release.Name }}" + - weight: 1 + podAffinityTerm: + topologyKey: kubernetes.io/hostname + labelSelector: + matchLabels: + app: {{ template "mariadb.name" . }} + release: {{ .Release.Name }} {{- else}} {{- with .Values.slave.affinity }} - affinity: -{{ toYaml . | indent 8 }} + affinity: {{ toYaml . | nindent 8 }} {{- end }} {{- end }} {{- if .Values.slave.nodeSelector }} - nodeSelector: - {{ toYaml .Values.slave.nodeSelector | nindent 8 }} + nodeSelector: {{ toYaml .Values.slave.nodeSelector | nindent 8 }} {{- end -}} {{- with .Values.slave.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} + tolerations: {{ toYaml . | nindent 8 }} {{- end }} {{- include "mariadb.imagePullSecrets" . | indent 6 }} initContainers: - {{- if .Values.master.extraInitContainers }} + {{- if .Values.master.extraInitContainers }} {{ tpl .Values.master.extraInitContainers . | indent 6}} - {{- 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 10 }} - volumeMounts: - - name: data - mountPath: /bitnami/mariadb - {{- end }} + {{- 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" - - name: MARIADB_MASTER_ROOT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "mariadb.secretName" . }} - key: mariadb-root-password - - name: MARIADB_REPLICATION_USER - value: "{{ .Values.replication.user }}" - - name: MARIADB_REPLICATION_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "mariadb.secretName" . }} - key: mariadb-replication-password - ports: - - name: mysql - containerPort: 3306 - {{- if .Values.slave.livenessProbe.enabled }} - livenessProbe: - exec: - command: ["sh", "-c", "exec mysqladmin status -uroot -p$MARIADB_MASTER_ROOT_PASSWORD"] - 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", "exec mysqladmin status -uroot -p$MARIADB_MASTER_ROOT_PASSWORD"] - 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 }} - resources: -{{ toYaml .Values.slave.resources | indent 10 }} - volumeMounts: - - name: data - mountPath: /bitnami/mariadb -{{- if .Values.slave.config }} - - name: config - mountPath: /opt/bitnami/mariadb/conf/my.cnf - subPath: my.cnf -{{- end }} -{{- if .Values.metrics.enabled }} - - name: metrics - image: {{ template "mariadb.metrics.image" . }} - imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} - env: - - name: MARIADB_ROOT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "mariadb.secretName" . }} - key: mariadb-root-password - command: - - sh - - -c - - >- - DATA_SOURCE_NAME="root:$MARIADB_ROOT_PASSWORD@(localhost:3306)/" - /bin/mysqld_exporter - {{- range .Values.metrics.extraArgs.slave }} - {{ . }} + - name: "mariadb" + image: {{ template "mariadb.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} + env: + {{- if .Values.image.debug}} + - name: BITNAMI_DEBUG + value: "true" {{- end }} - ports: + {{- 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" + - name: MARIADB_MASTER_ROOT_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "mariadb.secretName" . }} + key: mariadb-root-password + - name: MARIADB_REPLICATION_USER + value: "{{ .Values.replication.user }}" + - name: MARIADB_REPLICATION_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "mariadb.secretName" . }} + key: mariadb-replication-password + {{- if .Values.slave.extraEnvVars }} + {{- tpl (toYaml .Values.slave.extraEnvVars) $ | nindent 12 }} + {{- end }} + ports: + - name: mysql + containerPort: 3306 + {{- if .Values.slave.livenessProbe.enabled }} + livenessProbe: + exec: + command: ["sh", "-c", "exec mysqladmin status -uroot -p$MARIADB_MASTER_ROOT_PASSWORD"] + 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", "exec mysqladmin status -uroot -p$MARIADB_MASTER_ROOT_PASSWORD"] + 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 .Values.metrics.enabled }} - 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 }} + image: {{ template "mariadb.metrics.image" . }} + imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} + env: + - name: MARIADB_ROOT_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "mariadb.secretName" . }} + key: mariadb-root-password + command: + - sh + - -c + - >- + DATA_SOURCE_NAME="root:$MARIADB_ROOT_PASSWORD@(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 }} {{- 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 }} - resources: -{{ toYaml .Values.metrics.resources | indent 10 }} -{{- end }} volumes: - {{- if .Values.slave.config }} + {{- if .Values.slave.config }} - name: config configMap: name: {{ template "slave.fullname" . }} - {{- end }} -{{- if .Values.slave.persistence.enabled }} + {{- end }} +{{- if not .Values.slave.persistence.enabled }} + - name: "data" + emptyDir: {} +{{- else }} volumeClaimTemplates: - metadata: name: data @@ -239,8 +244,5 @@ spec: requests: storage: {{ .Values.slave.persistence.size | quote }} {{ include "mariadb.slave.storageClass" . }} -{{- else }} - - name: "data" - emptyDir: {} {{- end }} {{- end }} diff --git a/upstreamed/mariadb/values-production.yaml b/upstreamed/mariadb/values-production.yaml index c60d8ac5b..b0a801c46 100644 --- a/upstreamed/mariadb/values-production.yaml +++ b/upstreamed/mariadb/values-production.yaml @@ -229,12 +229,20 @@ master: ## Persistent Volume size ## size: 8Gi - ## + extraInitContainers: | # - name: do-something # image: busybox # command: ['do', 'something'] + ## An array to add extra environment variables + ## For example: + ## extraEnvVars: + ## - name: TZ + ## value: "Europe/Paris" + ## + # extraEnvVars: + ## Configure MySQL with a custom my.cnf file ## ref: https://mysql.com/kb/en/mysql/configuring-mysql-with-mycnf/#example-of-configuration-file ## @@ -307,7 +315,7 @@ slave: ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ # annotations: # key: value - # another-key: another-value + # another-key: another-value ## MariaDB additional command line flags ## Can be used to specify command line flags, for example: @@ -350,12 +358,20 @@ slave: ## Persistent Volume size ## size: 8Gi - ## + extraInitContainers: | # - name: do-something # image: busybox # command: ['do', 'something'] + ## An array to add extra environment variables + ## For example: + ## extraEnvVars: + ## - name: TZ + ## value: "Europe/Paris" + ## + # extraEnvVars: + ## Configure MySQL slave with a custom my.cnf file ## ref: https://mysql.com/kb/en/mysql/configuring-mysql-with-mycnf/#example-of-configuration-file ## diff --git a/upstreamed/mariadb/values.yaml b/upstreamed/mariadb/values.yaml index c04fce73b..d2c147118 100644 --- a/upstreamed/mariadb/values.yaml +++ b/upstreamed/mariadb/values.yaml @@ -229,12 +229,20 @@ master: ## Persistent Volume size ## size: 8Gi - ## + extraInitContainers: | # - name: do-something # image: busybox # command: ['do', 'something'] + ## An array to add extra environment variables + ## For example: + ## extraEnvVars: + ## - name: TZ + ## value: "Europe/Paris" + ## + # extraEnvVars: + ## Configure MySQL with a custom my.cnf file ## ref: https://mysql.com/kb/en/mysql/configuring-mysql-with-mycnf/#example-of-configuration-file ## @@ -351,12 +359,20 @@ slave: ## Persistent Volume size ## size: 8Gi - ## + extraInitContainers: | # - name: do-something # image: busybox # command: ['do', 'something'] + ## An array to add extra environment variables + ## For example: + ## extraEnvVars: + ## - name: TZ + ## value: "Europe/Paris" + ## + # extraEnvVars: + ## Configure MySQL slave with a custom my.cnf file ## ref: https://mysql.com/kb/en/mysql/configuring-mysql-with-mycnf/#example-of-configuration-file ## diff --git a/upstreamed/mediawiki/Chart.yaml b/upstreamed/mediawiki/Chart.yaml index 9f801feb7..d1a715f9a 100644 --- a/upstreamed/mediawiki/Chart.yaml +++ b/upstreamed/mediawiki/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mediawiki -version: 8.2.6 +version: 8.2.7 appVersion: 1.33.1 description: Extremely powerful, scalable software and a feature-rich wiki implementation that uses PHP to process and display data stored in a database. home: http://www.mediawiki.org/ diff --git a/upstreamed/mediawiki/README.md b/upstreamed/mediawiki/README.md index 4c4d7ae9b..4bca98c5b 100644 --- a/upstreamed/mediawiki/README.md +++ b/upstreamed/mediawiki/README.md @@ -18,8 +18,10 @@ Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment ## Prerequisites -- Kubernetes 1.4+ with Beta APIs enabled +- Kubernetes 1.12+ +- Helm 2.11+ or Helm 3.0-beta3+ - PV provisioner support in the underlying infrastructure +- ReadWriteMany volumes for deployment scaling ## Installing the Chart diff --git a/upstreamed/moodle/Chart.yaml b/upstreamed/moodle/Chart.yaml index c22741e42..8eca15200 100644 --- a/upstreamed/moodle/Chart.yaml +++ b/upstreamed/moodle/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: moodle -version: 6.1.10 +version: 6.1.11 appVersion: 3.7.2 description: Moodle is a learning platform designed to provide educators, administrators and learners with a single robust, secure and integrated system to create personalised learning environments keywords: diff --git a/upstreamed/moodle/README.md b/upstreamed/moodle/README.md index 7662fb7ce..11697f746 100644 --- a/upstreamed/moodle/README.md +++ b/upstreamed/moodle/README.md @@ -18,8 +18,10 @@ Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment ## Prerequisites -- Kubernetes 1.4+ with Beta APIs enabled +- Kubernetes 1.12+ +- Helm 2.11+ or Helm 3.0-beta3+ - PV provisioner support in the underlying infrastructure +- ReadWriteMany volumes for deployment scaling ## Installing the Chart diff --git a/upstreamed/nats/Chart.yaml b/upstreamed/nats/Chart.yaml index af9f3b5c5..5e2a8db8f 100644 --- a/upstreamed/nats/Chart.yaml +++ b/upstreamed/nats/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: nats -version: 4.2.1 +version: 4.2.2 appVersion: 2.1.0 description: An open-source, cloud-native messaging system keywords: diff --git a/upstreamed/nats/README.md b/upstreamed/nats/README.md index 3ba70de91..e64a2a9ca 100644 --- a/upstreamed/nats/README.md +++ b/upstreamed/nats/README.md @@ -16,8 +16,8 @@ Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment ## Prerequisites -- Kubernetes 1.4+ with Beta APIs enabled -- PV provisioner support in the underlying infrastructure +- Kubernetes 1.12+ +- Helm 2.11+ or Helm 3.0-beta3+ ## Installing the Chart diff --git a/upstreamed/odoo/Chart.yaml b/upstreamed/odoo/Chart.yaml index 8e37021f2..930697fc5 100644 --- a/upstreamed/odoo/Chart.yaml +++ b/upstreamed/odoo/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: odoo -version: 11.1.8 +version: 11.1.9 appVersion: 12.0.20191015 description: A suite of web based open source business apps. home: https://www.odoo.com/ diff --git a/upstreamed/odoo/README.md b/upstreamed/odoo/README.md index 4af501da4..8fc728523 100644 --- a/upstreamed/odoo/README.md +++ b/upstreamed/odoo/README.md @@ -18,8 +18,10 @@ Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment ## Prerequisites -- Kubernetes 1.4+ with Beta APIs enabled +- Kubernetes 1.12+ +- Helm 2.11+ or Helm 3.0-beta3+ - PV provisioner support in the underlying infrastructure +- ReadWriteMany volumes for deployment scaling ## Installing the Chart diff --git a/upstreamed/opencart/Chart.yaml b/upstreamed/opencart/Chart.yaml index 75248d541..0b2fef8a3 100644 --- a/upstreamed/opencart/Chart.yaml +++ b/upstreamed/opencart/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: opencart -version: 6.2.4 +version: 6.2.5 appVersion: 3.0.3-2 description: A free and open source e-commerce platform for online merchants. It provides a professional and reliable foundation for a successful online store. keywords: diff --git a/upstreamed/opencart/README.md b/upstreamed/opencart/README.md index 9fae639b6..ac9a2d5e4 100644 --- a/upstreamed/opencart/README.md +++ b/upstreamed/opencart/README.md @@ -18,8 +18,10 @@ Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment ## Prerequisites -- Kubernetes 1.4+ with Beta APIs enabled +- Kubernetes 1.12+ +- Helm 2.11+ or Helm 3.0-beta3+ - PV provisioner support in the underlying infrastructure +- ReadWriteMany volumes for deployment scaling ## Installing the Chart diff --git a/upstreamed/orangehrm/Chart.yaml b/upstreamed/orangehrm/Chart.yaml index c7c001273..c2ffcef19 100644 --- a/upstreamed/orangehrm/Chart.yaml +++ b/upstreamed/orangehrm/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: orangehrm -version: 6.2.5 +version: 6.2.6 appVersion: 4.3.3-0 description: OrangeHRM is a free HR management system that offers a wealth of modules to suit the needs of your business. diff --git a/upstreamed/orangehrm/README.md b/upstreamed/orangehrm/README.md index 2ffb4afa7..28e799992 100644 --- a/upstreamed/orangehrm/README.md +++ b/upstreamed/orangehrm/README.md @@ -18,8 +18,10 @@ Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment ## Prerequisites -- Kubernetes 1.4+ with Beta APIs enabled +- Kubernetes 1.12+ +- Helm 2.11+ or Helm 3.0-beta3+ - PV provisioner support in the underlying infrastructure +- ReadWriteMany volumes for deployment scaling ## Installing the Chart diff --git a/upstreamed/owncloud/Chart.yaml b/upstreamed/owncloud/Chart.yaml index 31e704da6..0fca91930 100644 --- a/upstreamed/owncloud/Chart.yaml +++ b/upstreamed/owncloud/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: owncloud -version: 6.2.6 +version: 6.2.7 appVersion: 10.2.1 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: diff --git a/upstreamed/owncloud/README.md b/upstreamed/owncloud/README.md index a5b672f9c..bb9d673af 100644 --- a/upstreamed/owncloud/README.md +++ b/upstreamed/owncloud/README.md @@ -18,8 +18,10 @@ Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment ## Prerequisites -- Kubernetes 1.4+ with Beta APIs enabled +- Kubernetes 1.12+ +- Helm 2.11+ or Helm 3.0-beta3+ - PV provisioner support in the underlying infrastructure +- ReadWriteMany volumes for deployment scaling ## Installing the Chart diff --git a/upstreamed/phabricator/Chart.yaml b/upstreamed/phabricator/Chart.yaml index e7494f84a..8e6d6d6c6 100644 --- a/upstreamed/phabricator/Chart.yaml +++ b/upstreamed/phabricator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: phabricator -version: 7.0.12 +version: 8.0.0 appVersion: 2019.39.0 description: Collection of open source web applications that help software companies build better software. keywords: diff --git a/upstreamed/phabricator/README.md b/upstreamed/phabricator/README.md index ee37f9487..e2ea23d85 100644 --- a/upstreamed/phabricator/README.md +++ b/upstreamed/phabricator/README.md @@ -91,8 +91,9 @@ The following table lists the configurable parameters of the Phabricator chart a | `ingress.annotations` | Ingress annotations | `[]` | | `ingress.hosts[0].name` | Hostname to your Phabricator installation | `phabricator.local` | | `ingress.hosts[0].path` | Path within the url structure | `/` | -| `ingress.tls[0].hosts[0]` | TLS hosts | `phabricator.local` | -| `ingress.tls[0].secretName` | TLS Secret (certificates) | `phabricator.local-tls` | +| `ingress.hosts[0].tls` | Utilize TLS backend in ingress | `false` | +| `ingress.hosts[0].tlsHosts` | Array of TLS hosts for ingress record (defaults to `ingress.hosts[0].name` if `nil`) | `nil` | +| `ingress.hosts[0].tlsSecret` | TLS Secret (certificates) | `phabricator.local-tls-secret` | | `ingress.secrets[0].name` | TLS Secret Name | `nil` | | `ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` | | `ingress.secrets[0].key` | TLS Secret Key | `nil` | diff --git a/upstreamed/phabricator/requirements.lock b/upstreamed/phabricator/requirements.lock index ea5e423d1..93ba60577 100644 --- a/upstreamed/phabricator/requirements.lock +++ b/upstreamed/phabricator/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 6.10.1 + version: 6.11.3 digest: sha256:98f8faaf456130a5ab8958a3f87b17ea1eed6a40f39fdbf1ee50c3d295ede5ef -generated: 2019-10-01T12:51:01.84620603Z +generated: 2019-10-16T15:24:39.963906625Z diff --git a/upstreamed/phabricator/templates/ingress.yaml b/upstreamed/phabricator/templates/ingress.yaml index 7e48acc0f..19775e1f5 100644 --- a/upstreamed/phabricator/templates/ingress.yaml +++ b/upstreamed/phabricator/templates/ingress.yaml @@ -26,8 +26,18 @@ spec: serviceName: {{ template "phabricator.fullname" $ }} servicePort: http {{- end }} - {{- if .Values.ingress.tls }} tls: -{{ toYaml .Values.ingress.tls | indent 4 }} + {{- range .Values.ingress.hosts }} + {{- if .tls }} + - hosts: + {{- if .tlsHosts }} + {{- range $host := .tlsHosts }} + - {{ $host }} + {{- end }} + {{- else }} + - {{ .name }} + {{- end }} + secretName: {{ .tlsSecret }} + {{- end }} {{- end }} {{- end }} diff --git a/upstreamed/phabricator/values.yaml b/upstreamed/phabricator/values.yaml index 009399043..ab2dfc340 100644 --- a/upstreamed/phabricator/values.yaml +++ b/upstreamed/phabricator/values.yaml @@ -14,7 +14,7 @@ image: registry: docker.io repository: bitnami/phabricator - tag: 2019.39.0-debian-9-r1 + tag: 2019.39.0-debian-9-r9 ## 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 @@ -182,13 +182,18 @@ ingress: - name: phabricator.local path: / - ## The tls configuration for the ingress - ## ref: https://kubernetes.io/docs/concepts/services-networking/ingress/#tls - ## - tls: - - hosts: - - phabricator.local - secretName: phabricator.local-tls + ## Set this to true in order to enable TLS on the ingress record + tls: false + + ## Optionally specify the TLS hosts for the ingress record + ## Useful when the Ingress controller supports www-redirection + ## If not specified, the above host name will be used + # tlsHosts: + # - www.phabricator.local + # - phabricator.local + + ## If TLS is set to true, you must declare what secret will store the key/certificate for TLS + tlsSecret: phabricator.local-tls secrets: ## If you're providing your own certificates, please use this to add the certificates as secrets @@ -223,7 +228,7 @@ metrics: image: registry: docker.io repository: bitnami/apache-exporter - tag: 0.7.0-debian-9-r72 + tag: 0.7.0-debian-9-r85 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace.