From 0ff01ee91c7f0ac2a7ce9aa8f88d12e41f5c2fcc Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Tue, 2 Apr 2019 18:37:29 +0000 Subject: [PATCH] Synchronize upstreamed folder to b2bc8b56b --- upstreamed/ghost/Chart.yaml | 4 ++-- upstreamed/ghost/values.yaml | 2 +- upstreamed/mongodb/Chart.yaml | 2 +- upstreamed/mongodb/README.md | 6 ++++-- .../templates/deployment-standalone.yaml | 3 ++- .../templates/statefulset-primary-rs.yaml | 3 ++- .../templates/statefulset-secondary-rs.yaml | 3 ++- upstreamed/mongodb/values-production.yaml | 11 +++++++++++ upstreamed/mongodb/values.yaml | 11 +++++++++++ upstreamed/odoo/Chart.yaml | 2 +- upstreamed/odoo/README.md | 2 ++ upstreamed/odoo/templates/deployment.yaml | 2 +- upstreamed/odoo/templates/pvc.yaml | 2 +- upstreamed/odoo/values.yaml | 5 +++++ upstreamed/postgresql/Chart.yaml | 2 +- upstreamed/postgresql/README.md | 17 +++++++++-------- .../templates/statefulset-slaves.yaml | 2 ++ .../postgresql/templates/statefulset.yaml | 2 ++ upstreamed/postgresql/values-production.yaml | 11 +++++++++++ upstreamed/postgresql/values.yaml | 11 +++++++++++ 20 files changed, 82 insertions(+), 21 deletions(-) diff --git a/upstreamed/ghost/Chart.yaml b/upstreamed/ghost/Chart.yaml index 0672fb86f..1e8f2f224 100644 --- a/upstreamed/ghost/Chart.yaml +++ b/upstreamed/ghost/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: ghost -version: 6.7.4 -appVersion: 2.19.1 +version: 6.7.5 +appVersion: 2.19.2 description: A simple, powerful publishing platform that allows you to share your stories with the world keywords: - ghost diff --git a/upstreamed/ghost/values.yaml b/upstreamed/ghost/values.yaml index 173c5b777..e54bc8d0c 100644 --- a/upstreamed/ghost/values.yaml +++ b/upstreamed/ghost/values.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/ghost - tag: 2.19.1 + tag: 2.19.2 ## 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 diff --git a/upstreamed/mongodb/Chart.yaml b/upstreamed/mongodb/Chart.yaml index 3795054bf..5df8ea794 100644 --- a/upstreamed/mongodb/Chart.yaml +++ b/upstreamed/mongodb/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mongodb -version: 5.14.2 +version: 5.15.0 appVersion: 4.0.8 description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications. keywords: diff --git a/upstreamed/mongodb/README.md b/upstreamed/mongodb/README.md index b8ddab490..76d919615 100644 --- a/upstreamed/mongodb/README.md +++ b/upstreamed/mongodb/README.md @@ -93,6 +93,8 @@ The following table lists the configurable parameters of the MongoDB chart and t | `securityContext.fsGroup` | Group ID for the container | `1001` | | `securityContext.runAsUser` | User ID for the container | `1001` | | `persistence.enabled` | Use a PVC to persist data | `true` | +| `persistence.mountPath` | Path to mount the volume at | `/bitnami/mongodb` | +| `persistence.subPath` | Subdirectory of the volume to mount at | `""` | | `persistence.storageClass` | Storage class of backing PVC | `nil` (uses alpha storage class annotation) | | `persistence.accessMode` | Use volume as ReadOnly or ReadWrite | `ReadWriteOnce` | | `persistence.size` | Size of data volume | `8Gi` | @@ -217,7 +219,7 @@ $ kubectl delete statefulset my-release-mongodb-arbiter my-release-mongodb-prima MongoDB can exposed externally using the [NGINX Ingress Controller](https://github.com/kubernetes/ingress-nginx). To do so, it's necessary to: - Install the MongoDB chart setting the parameter `ingress.enabled=true`. -- Create a ConfigMap to map the external port to use and the internal service/port where to redirect the requests (see https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/exposing-tcp-udp-services.md for more information). +- Create a ConfigMap to map the external port to use and the internal service/port where to redirect the requests (see https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/exposing-tcp-udp-services.md for more information). For instance, if you installed the MongoDB chart in the `default` namespace, you can install the [stable/nginx-ingress chart](https://github.com/helm/charts/tree/master/stable/nginx-ingress) setting the "tcp" parameter in the **values.yaml** used to install the chart as shown below: @@ -226,4 +228,4 @@ For instance, if you installed the MongoDB chart in the `default` namespace, you tcp: 27017: "default/mongodb:27017" -``` \ No newline at end of file +``` diff --git a/upstreamed/mongodb/templates/deployment-standalone.yaml b/upstreamed/mongodb/templates/deployment-standalone.yaml index 4ad3099a9..879ed3ea0 100644 --- a/upstreamed/mongodb/templates/deployment-standalone.yaml +++ b/upstreamed/mongodb/templates/deployment-standalone.yaml @@ -147,7 +147,8 @@ spec: {{- end }} volumeMounts: - name: data - mountPath: /bitnami/mongodb + mountPath: {{ .Values.persistence.mountPath }} + subPath: {{ .Values.persistence.subPath }} {{- if or (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js|json]") (.Values.initConfigMap) }} - name: custom-init-scripts mountPath: /docker-entrypoint-initdb.d diff --git a/upstreamed/mongodb/templates/statefulset-primary-rs.yaml b/upstreamed/mongodb/templates/statefulset-primary-rs.yaml index bd87daf07..768ff6fc7 100644 --- a/upstreamed/mongodb/templates/statefulset-primary-rs.yaml +++ b/upstreamed/mongodb/templates/statefulset-primary-rs.yaml @@ -173,7 +173,8 @@ spec: {{- end }} volumeMounts: - name: datadir - mountPath: /bitnami/mongodb + mountPath: {{ .Values.persistence.mountPath }} + subPath: {{ .Values.persistence.subPath }} {{- if or (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js|json]") (.Values.initConfigMap) }} - name: custom-init-scripts mountPath: /docker-entrypoint-initdb.d diff --git a/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml b/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml index a73adf36c..9fd218314 100644 --- a/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml +++ b/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml @@ -161,7 +161,8 @@ spec: {{- end }} volumeMounts: - name: datadir - mountPath: /bitnami/mongodb + mountPath: {{ .Values.persistence.mountPath }} + subPath: {{ .Values.persistence.subPath }} {{- if .Values.configmap }} - name: config mountPath: /opt/bitnami/mongodb/conf/mongodb.conf diff --git a/upstreamed/mongodb/values-production.yaml b/upstreamed/mongodb/values-production.yaml index 498c2e2ea..4b63740d7 100644 --- a/upstreamed/mongodb/values-production.yaml +++ b/upstreamed/mongodb/values-production.yaml @@ -181,8 +181,19 @@ persistence: ## A manually managed Persistent Volume and Claim ## Requires persistence.enabled: true ## If defined, PVC must be created manually before volume will be bound + ## # existingClaim: + ## The path the volume will be mounted at, useful when using different + ## MongoDB images. + ## + mountPath: /bitnami/mongodb + + ## The subdirectory of the volume to mount to, useful in dev environments + ## and one PV for multiple services. + ## + subPath: "" + ## mongodb data Persistent Volume Storage Class ## If defined, storageClassName: ## If set to "-", storageClassName: "", which disables dynamic provisioning diff --git a/upstreamed/mongodb/values.yaml b/upstreamed/mongodb/values.yaml index 179301998..ff0ef0b2b 100644 --- a/upstreamed/mongodb/values.yaml +++ b/upstreamed/mongodb/values.yaml @@ -180,8 +180,19 @@ persistence: ## A manually managed Persistent Volume and Claim ## Requires persistence.enabled: true ## If defined, PVC must be created manually before volume will be bound + ## # existingClaim: + ## The path the volume will be mounted at, useful when using different + ## MongoDB images. + ## + mountPath: /bitnami/mongodb + + ## The subdirectory of the volume to mount to, useful in dev environments + ## and one PV for multiple services. + ## + subPath: "" + ## mongodb data Persistent Volume Storage Class ## If defined, storageClassName: ## If set to "-", storageClassName: "", which disables dynamic provisioning diff --git a/upstreamed/odoo/Chart.yaml b/upstreamed/odoo/Chart.yaml index 457948db9..a83bed62e 100644 --- a/upstreamed/odoo/Chart.yaml +++ b/upstreamed/odoo/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: odoo -version: 6.1.1 +version: 6.2.0 appVersion: 11.0.20190315 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 730fc1c0c..33da0126a 100644 --- a/upstreamed/odoo/README.md +++ b/upstreamed/odoo/README.md @@ -80,6 +80,8 @@ The following table lists the configurable parameters of the Odoo chart and thei | `ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` | | `ingress.secrets[0].key` | TLS Secret Key | `nil` | | `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | +| `persistence.enabled` | Enable persistence using PVC | `true` | +| `persistence.existingClaim` | Enable persistence using an existing PVC | `nil` | | `persistence.storageClass` | PVC Storage Class | `nil` (uses alpha storage class annotation) | | `persistence.accessMode` | PVC Access Mode | `ReadWriteOnce` | | `persistence.size` | PVC Storage Request | `8Gi` | diff --git a/upstreamed/odoo/templates/deployment.yaml b/upstreamed/odoo/templates/deployment.yaml index 8911bc48e..987b36303 100644 --- a/upstreamed/odoo/templates/deployment.yaml +++ b/upstreamed/odoo/templates/deployment.yaml @@ -98,7 +98,7 @@ spec: - name: odoo-data {{- if .Values.persistence.enabled }} persistentVolumeClaim: - claimName: {{ template "odoo.fullname" . }} + claimName: {{ .Values.persistence.existingClaim | default (include "odoo.fullname" .) }} {{- else }} emptyDir: {} {{- end }} diff --git a/upstreamed/odoo/templates/pvc.yaml b/upstreamed/odoo/templates/pvc.yaml index be6345156..58e3b479e 100644 --- a/upstreamed/odoo/templates/pvc.yaml +++ b/upstreamed/odoo/templates/pvc.yaml @@ -1,4 +1,4 @@ -{{- if .Values.persistence.enabled -}} +{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }} kind: PersistentVolumeClaim apiVersion: v1 metadata: diff --git a/upstreamed/odoo/values.yaml b/upstreamed/odoo/values.yaml index 8ea4cbcb3..5b2730035 100644 --- a/upstreamed/odoo/values.yaml +++ b/upstreamed/odoo/values.yaml @@ -66,6 +66,11 @@ postgresql: ## persistence: enabled: true + ## If you want to reuse an existing claim, you can pass the name of the PVC using + ## the existingClaim variable + ## + # existingClaim: your-claim + ## postgresql data Persistent Volume Storage Class ## If defined, storageClassName: ## If set to "-", storageClassName: "", which disables dynamic provisioning diff --git a/upstreamed/postgresql/Chart.yaml b/upstreamed/postgresql/Chart.yaml index 47081febc..980991a7f 100644 --- a/upstreamed/postgresql/Chart.yaml +++ b/upstreamed/postgresql/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: postgresql -version: 3.15.0 +version: 3.16.0 appVersion: 10.7.0 description: Chart for PostgreSQL, an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance. keywords: diff --git a/upstreamed/postgresql/README.md b/upstreamed/postgresql/README.md index bb2d7c467..326ff5c6e 100644 --- a/upstreamed/postgresql/README.md +++ b/upstreamed/postgresql/README.md @@ -48,13 +48,13 @@ The following tables lists the configurable parameters of the PostgreSQL chart a | Parameter | Description | Default | | --------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------- | | `global.imageRegistry` | Global Docker Image registry | `nil` | -| `global.postgresql.postgresqlDatabase` | PostgreSQL database (overrides `postgresqlDatabase`) | `nil` | -| `global.postgresql.postgresqlUsername` | PostgreSQL username (overrides `postgresqlUsername`) | `nil` | -| `global.postgresql.existingSecret` | Name of existing secret to use for PostgreSQL passwords (overrides `existingSecret`) | `nil` | -| `global.postgresql.postgresqlPassword` | Name of existing secret to use for PostgreSQL passwords (overrides `postgresqlPassword`) | `nil` | -| `global.postgresql.servicePort` | PostgreSQL port (overrides `service.port`) | `nil` | -| `global.postgresql.replicationPassword` | Replication user password (overrides `replication.password`) | `nil` | -| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `global.postgresql.postgresqlDatabase` | PostgreSQL database (overrides `postgresqlDatabase`) | `nil` | +| `global.postgresql.postgresqlUsername` | PostgreSQL username (overrides `postgresqlUsername`) | `nil` | +| `global.postgresql.existingSecret` | Name of existing secret to use for PostgreSQL passwords (overrides `existingSecret`) | `nil` | +| `global.postgresql.postgresqlPassword` | Name of existing secret to use for PostgreSQL passwords (overrides `postgresqlPassword`) | `nil` | +| `global.postgresql.servicePort` | PostgreSQL port (overrides `service.port`) | `nil` | +| `global.postgresql.replicationPassword` | Replication user password (overrides `replication.password`) | `nil` | +| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | | `image.registry` | PostgreSQL Image registry | `docker.io` | | `image.repository` | PostgreSQL Image name | `bitnami/postgresql` | | `image.tag` | PostgreSQL Image tag | `{VERSION}` | @@ -88,7 +88,7 @@ The following tables lists the configurable parameters of the PostgreSQL chart a | `extendedConfConfigMap` | ConfigMap with the extended PostgreSQL configuration files | `nil` | | `initdbScripts` | List of initdb scripts | `nil` | | `initdbScriptsConfigMap` | ConfigMap with the initdb scripts (Note: Overrides `initdbScripts`) | `nil` | -| `initdbScriptsSecret` | Secret with initdb scripts that contain sensitive information (Note: can be used with `initdbScriptsConfigMap` or `initdbScripts`) | `nil` | +| `initdbScriptsSecret` | Secret with initdb scripts that contain sensitive information (Note: can be used with `initdbScriptsConfigMap` or `initdbScripts`) | `nil` | | `service.type` | Kubernetes Service type | `ClusterIP` | | `service.port` | PostgreSQL port | `5432` | | `service.nodePort` | Kubernetes Service nodePort | `nil` | @@ -97,6 +97,7 @@ The following tables lists the configurable parameters of the PostgreSQL chart a | `persistence.enabled` | Enable persistence using PVC | `true` | | `persistence.existingClaim` | Provide an existing `PersistentVolumeClaim`, the value is evaluated as a template. | `nil` | | `persistence.mountPath` | Path to mount the volume at | `/bitnami/postgresql` | +| `persistence.subPath` | Subdirectory of the volume to mount at | `""` | | `persistence.storageClass` | PVC Storage Class for PostgreSQL volume | `nil` | | `persistence.accessMode` | PVC Access Mode for PostgreSQL volume | `ReadWriteOnce` | | `persistence.size` | PVC Storage Request for PostgreSQL volume | `8Gi` | diff --git a/upstreamed/postgresql/templates/statefulset-slaves.yaml b/upstreamed/postgresql/templates/statefulset-slaves.yaml index a92754900..09d181640 100644 --- a/upstreamed/postgresql/templates/statefulset-slaves.yaml +++ b/upstreamed/postgresql/templates/statefulset-slaves.yaml @@ -73,6 +73,7 @@ spec: volumeMounts: - name: data mountPath: {{ .Values.persistence.mountPath }} + subPath: {{ .Values.persistence.subPath }} {{- end }} containers: - name: {{ template "postgresql.fullname" . }} @@ -160,6 +161,7 @@ spec: {{- if .Values.persistence.enabled }} - name: data mountPath: {{ .Values.persistence.mountPath }} + subPath: {{ .Values.persistence.subPath }} {{ end }} {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }} - name: postgresql-extended-config diff --git a/upstreamed/postgresql/templates/statefulset.yaml b/upstreamed/postgresql/templates/statefulset.yaml index ed5a51978..3052d5c28 100644 --- a/upstreamed/postgresql/templates/statefulset.yaml +++ b/upstreamed/postgresql/templates/statefulset.yaml @@ -77,6 +77,7 @@ spec: volumeMounts: - name: data mountPath: {{ .Values.persistence.mountPath }} + subPath: {{ .Values.persistence.subPath }} {{- end }} containers: - name: {{ template "postgresql.fullname" . }} @@ -207,6 +208,7 @@ spec: {{- if .Values.persistence.enabled }} - name: data mountPath: {{ .Values.persistence.mountPath }} + subPath: {{ .Values.persistence.subPath }} {{- end }} {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap }} - name: postgresql-config diff --git a/upstreamed/postgresql/values-production.yaml b/upstreamed/postgresql/values-production.yaml index 3ab4ce72b..c3e3bd661 100644 --- a/upstreamed/postgresql/values-production.yaml +++ b/upstreamed/postgresql/values-production.yaml @@ -192,8 +192,19 @@ persistence: ## A manually managed Persistent Volume and Claim ## If defined, PVC must be created manually before volume will be bound ## The value is evaluated as a template, so, for example, the name can depend on .Release or .Chart + ## # existingClaim: + + ## The path the volume will be mounted at, useful when using different + ## PostgreSQL images. + ## mountPath: /bitnami/postgresql + + ## The subdirectory of the volume to mount to, useful in dev environments + ## and one PV for multiple services. + ## + subPath: "" + # storageClass: "-" accessModes: - ReadWriteOnce diff --git a/upstreamed/postgresql/values.yaml b/upstreamed/postgresql/values.yaml index 824bd8d8c..e35328312 100644 --- a/upstreamed/postgresql/values.yaml +++ b/upstreamed/postgresql/values.yaml @@ -199,8 +199,19 @@ persistence: ## A manually managed Persistent Volume and Claim ## If defined, PVC must be created manually before volume will be bound ## The value is evaluated as a template, so, for example, the name can depend on .Release or .Chart + ## # existingClaim: + + ## The path the volume will be mounted at, useful when using different + ## PostgreSQL images. + ## mountPath: /bitnami/postgresql + + ## The subdirectory of the volume to mount to, useful in dev environments + ## and one PV for multiple services. + ## + subPath: "" + # storageClass: "-" accessModes: - ReadWriteOnce