From d58fdb33b3b3e16427d1880af8f33d411aeb6005 Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Tue, 9 Oct 2018 10:37:16 +0000 Subject: [PATCH 01/11] Synchronize upstreamed folder to 6a34a2e --- upstreamed/nats/Chart.yaml | 2 +- upstreamed/nats/templates/_helpers.tpl | 8 ++++++++ upstreamed/nats/templates/configmap.yaml | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/upstreamed/nats/Chart.yaml b/upstreamed/nats/Chart.yaml index b32f199ad5..1c68b4bfd1 100644 --- a/upstreamed/nats/Chart.yaml +++ b/upstreamed/nats/Chart.yaml @@ -1,5 +1,5 @@ name: nats -version: 1.0.2 +version: 1.0.3 appVersion: 1.3.0 description: An open-source, cloud-native messaging system keywords: diff --git a/upstreamed/nats/templates/_helpers.tpl b/upstreamed/nats/templates/_helpers.tpl index c3ed4c5ec8..32e67f4151 100644 --- a/upstreamed/nats/templates/_helpers.tpl +++ b/upstreamed/nats/templates/_helpers.tpl @@ -28,6 +28,14 @@ Return the proper image name {{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository $tag -}} {{- end -}} +{{/* +Create a random alphanumeric password string. +We prepend a random letter to the string to avoid password validation errors +*/}} +{{- define "nats.randomPassword" -}} +{{- randAlpha 1 -}}{{- randAlphaNum 9 -}} +{{- end -}} + {{/* Return the appropriate apiVersion for networkpolicy. */}} diff --git a/upstreamed/nats/templates/configmap.yaml b/upstreamed/nats/templates/configmap.yaml index c1052a6bf3..2391d68ee6 100644 --- a/upstreamed/nats/templates/configmap.yaml +++ b/upstreamed/nats/templates/configmap.yaml @@ -1,5 +1,5 @@ {{- $authPwd := default (randAlphaNum 10) .Values.auth.password -}} -{{- $clusterAuthPwd := default (randAlphaNum 10) .Values.clusterAuth.password -}} +{{- $clusterAuthPwd := default (include "nats.randomPassword" .) .Values.clusterAuth.password -}} apiVersion: v1 kind: ConfigMap metadata: From 633ce190b7c4135aa433209c6ea6d296c9472910 Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Wed, 10 Oct 2018 10:37:15 +0000 Subject: [PATCH 02/11] Synchronize upstreamed folder to adea94f --- upstreamed/magento/Chart.yaml | 2 +- upstreamed/magento/templates/NOTES.txt | 5 +-- upstreamed/mariadb/Chart.yaml | 2 +- upstreamed/mariadb/README.md | 31 ++++++++++--------- .../mariadb/templates/master-statefulset.yaml | 6 ++-- .../mariadb/templates/slave-statefulset.yaml | 6 ++-- upstreamed/mariadb/values-production.yaml | 8 +++++ upstreamed/mariadb/values.yaml | 8 +++++ upstreamed/mongodb/Chart.yaml | 2 +- upstreamed/mongodb/README.md | 8 ++++- .../docker-entrypoint-initdb.d/README.md | 3 ++ .../templates/deployment-standalone.yaml | 9 ++++++ .../templates/initialization-configmap.yaml | 13 ++++++++ .../templates/statefulset-primary-rs.yaml | 17 +++++++--- upstreamed/opencart/Chart.yaml | 2 +- upstreamed/opencart/templates/NOTES.txt | 5 +-- upstreamed/osclass/Chart.yaml | 2 +- upstreamed/osclass/templates/NOTES.txt | 7 +++-- upstreamed/phabricator/Chart.yaml | 4 +-- upstreamed/phabricator/requirements.lock | 4 +-- upstreamed/phabricator/values.yaml | 2 +- 21 files changed, 106 insertions(+), 40 deletions(-) create mode 100644 upstreamed/mongodb/files/docker-entrypoint-initdb.d/README.md create mode 100644 upstreamed/mongodb/templates/initialization-configmap.yaml diff --git a/upstreamed/magento/Chart.yaml b/upstreamed/magento/Chart.yaml index bdf8304ea4..1e3fbf74e0 100644 --- a/upstreamed/magento/Chart.yaml +++ b/upstreamed/magento/Chart.yaml @@ -1,5 +1,5 @@ name: magento -version: 3.0.3 +version: 3.0.4 appVersion: 2.2.6 description: A feature-rich flexible e-commerce solution. It includes transaction options, multi-store functionality, loyalty programs, product categorization and shopper filtering, promotion rules, and more. keywords: diff --git a/upstreamed/magento/templates/NOTES.txt b/upstreamed/magento/templates/NOTES.txt index 1a1705a4a0..6f0a4ab2e4 100644 --- a/upstreamed/magento/templates/NOTES.txt +++ b/upstreamed/magento/templates/NOTES.txt @@ -23,16 +23,17 @@ host. To configure Magento with the URL of your service: export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "magento.fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") export APP_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "magento.fullname" . }} -o jsonpath="{.data.magento-password}" | base64 --decode) {{- if .Values.mariadb.mariadbRootPassword }} - export APP_DATABASE_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "magento.mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode) + export DATABASE_ROOT_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "magento.mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode) {{- end }} {{- end }} + export APP_DATABASE_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "magento.mariadb.fullname" . }} -o jsonpath="{.data.mariadb-password}" | base64 --decode) 2. Complete your Magento deployment by running: {{- if .Values.mariadb.enabled }} helm upgrade {{ .Release.Name }} stable/magento \ - --set magentoHost=$APP_HOST,magentoPassword=$APP_PASSWORD{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$APP_DATABASE_PASSWORD{{ end }} + --set magentoHost=$APP_HOST,magentoPassword=$APP_PASSWORD{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$DATABASE_ROOT_PASSWORD{{ end }},mariadb.db.password=$APP_DATABASE_PASSWORD {{- else }} ## PLEASE UPDATE THE EXTERNAL DATABASE CONNECTION PARAMETERS IN THE FOLLOWING COMMAND AS NEEDED ## diff --git a/upstreamed/mariadb/Chart.yaml b/upstreamed/mariadb/Chart.yaml index 9c928037fc..2007bd608d 100644 --- a/upstreamed/mariadb/Chart.yaml +++ b/upstreamed/mariadb/Chart.yaml @@ -1,5 +1,5 @@ name: mariadb -version: 5.0.9 +version: 5.1.0 appVersion: 10.1.36 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 7228af167e..71f9a15aaf 100644 --- a/upstreamed/mariadb/README.md +++ b/upstreamed/mariadb/README.md @@ -55,24 +55,27 @@ The following table lists the configurable parameters of the MariaDB chart and t | `image.pullPolicy` | MariaDB image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | | `image.pullSecrets` | Specify image pull secrets | `nil` (does not add image pull secrets to deployed pods) | | `service.type` | Kubernetes service type | `ClusterIP` | -| `service.clusterIp` | Specific cluster IP when service type is cluster IP. Use None for headless service | `nil` | -| `service.port` | MySQL service port | `3306` | +| `service.clusterIp` | Specific cluster IP when service type is cluster IP. Use None for headless service | `nil` | +| `service.port` | MySQL service port | `3306` | +| `securityContext.enabled` | Enable security context | `true` | +| `securityContext.fsGroup` | Group ID for the container | `1001` | +| `securityContext.runAsUser` | User ID for the container | `1001` | | `rootUser.password` | Password for the `root` user | _random 10 character alphanumeric string_ | | `rootUser.forcePassword` | Force users to specify a password | `false` | | `db.user` | Username of new user to create | `nil` | | `db.password` | Password for the new user | _random 10 character alphanumeric string if `db.user` is defined_ | | `db.name` | Name for new database to create | `my_database` | -| `replication.enabled` | MariaDB replication enabled | `true` | -| `replication.user` | MariaDB replication user | `replicator` | +| `replication.enabled` | MariaDB replication enabled | `true` | +| `replication.user` | MariaDB replication user | `replicator` | | `replication.password` | MariaDB replication user password | _random 10 character alphanumeric string_ | -| `master.annotations[].key` | key for the the annotation list item | `nil` | -| `master.annotations[].value` | value for the the annotation list item | `nil` | +| `master.annotations[].key` | key for the the annotation list item | `nil` | +| `master.annotations[].value` | value for the the annotation list item | `nil` | | `master.affinity` | Master affinity (in addition to master.antiAffinity when set) | `{}` | | `master.antiAffinity` | Master pod anti-affinity policy | `soft` | | `master.tolerations` | List of node taints to tolerate (master) | `[]` | | `master.persistence.enabled` | Enable persistence using a `PersistentVolumeClaim` | `true` | -| `master.persistence.existingClaim` | Provide an existing `PersistentVolumeClaim` | `nil` -| `master.persistence.mountPath` | Configure existing `PersistentVolumeClaim` mount path | `""` +| `master.persistence.existingClaim` | Provide an existing `PersistentVolumeClaim` | `nil` | +| `master.persistence.mountPath` | Configure existing `PersistentVolumeClaim` mount path | `""` | | `master.persistence.annotations` | Persistent Volume Claim annotations | `{}` | | `master.persistence.storageClass` | Persistent Volume Storage Class | `` | | `master.persistence.accessModes` | Persistent Volume Access Modes | `[ReadWriteOnce]` | @@ -92,8 +95,8 @@ The following table lists the configurable parameters of the MariaDB chart and t | `master.readinessProbe.successThreshold` | Minimum consecutive successes for the probe (master)| `1` | | `master.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe (master) | `3` | | `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.annotations[].key` | key for the the annotation list item | `nil` | +| `slave.annotations[].value` | value for the the annotation list item | `nil` | | `slave.affinity` | Slave affinity (in addition to slave.antiAffinity when set) | `{}` | | `slave.antiAffinity` | Slave pod anti-affinity policy | `soft` | | `slave.tolerations` | List of node taints to tolerate for (slave) | `[]` | @@ -117,10 +120,10 @@ The following table lists the configurable parameters of the MariaDB chart and t | `slave.readinessProbe.successThreshold` | Minimum consecutive successes for the probe (slave) | `1` | | `slave.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe (slave) | `3` | | `metrics.enabled` | Start a side-car prometheus exporter | `false` | -| `metrics.image.registry` | Exporter image registry | `docker.io` | -`metrics.image.repository` | Exporter image name | `prom/mysqld-exporter` | -| `metrics.image.tag` | Exporter image tag | `v0.10.0` | -| `metrics.image.pullPolicy` | Exporter image pull policy | `IfNotPresent` | +| `metrics.image.registry` | Exporter image registry | `docker.io` | +| `metrics.image.repository` | Exporter image name | `prom/mysqld-exporter` | +| `metrics.image.tag` | Exporter image tag | `v0.10.0` | +| `metrics.image.pullPolicy` | Exporter image pull policy | `IfNotPresent` | | `metrics.resources` | Exporter resource requests/limit | `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. diff --git a/upstreamed/mariadb/templates/master-statefulset.yaml b/upstreamed/mariadb/templates/master-statefulset.yaml index e08962cc77..35b7e9f7ad 100644 --- a/upstreamed/mariadb/templates/master-statefulset.yaml +++ b/upstreamed/mariadb/templates/master-statefulset.yaml @@ -32,9 +32,11 @@ spec: release: "{{ .Release.Name }}" chart: {{ template "mariadb.chart" . }} spec: + {{- if .Values.securityContext.enabled }} securityContext: - runAsUser: 1001 - fsGroup: 1001 + fsGroup: {{ .Values.securityContext.fsGroup }} + runAsUser: {{ .Values.securityContext.runAsUser }} + {{- end }} {{- if eq .Values.master.antiAffinity "hard" }} affinity: {{- with .Values.master.affinity }} diff --git a/upstreamed/mariadb/templates/slave-statefulset.yaml b/upstreamed/mariadb/templates/slave-statefulset.yaml index b2b00e4b26..bb4aaccf9c 100644 --- a/upstreamed/mariadb/templates/slave-statefulset.yaml +++ b/upstreamed/mariadb/templates/slave-statefulset.yaml @@ -33,9 +33,11 @@ spec: release: "{{ .Release.Name }}" chart: {{ template "mariadb.chart" . }} spec: + {{- if .Values.securityContext.enabled }} securityContext: - runAsUser: 1001 - fsGroup: 1001 + fsGroup: {{ .Values.securityContext.fsGroup }} + runAsUser: {{ .Values.securityContext.runAsUser }} + {{- end }} {{- if eq .Values.slave.antiAffinity "hard" }} affinity: {{- with .Values.slave.affinity }} diff --git a/upstreamed/mariadb/values-production.yaml b/upstreamed/mariadb/values-production.yaml index f5fbc373f5..38f65df4cd 100644 --- a/upstreamed/mariadb/values-production.yaml +++ b/upstreamed/mariadb/values-production.yaml @@ -29,6 +29,14 @@ service: # master: 30001 # slave: 30002 +## Pod Security Context +## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ +## +securityContext: + enabled: true + fsGroup: 1001 + runAsUser: 1001 + rootUser: ## MariaDB admin password ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-the-root-password-on-first-run diff --git a/upstreamed/mariadb/values.yaml b/upstreamed/mariadb/values.yaml index 2ecc5d26e8..0bdec13f3d 100644 --- a/upstreamed/mariadb/values.yaml +++ b/upstreamed/mariadb/values.yaml @@ -29,6 +29,14 @@ service: # master: 30001 # slave: 30002 +## Pod Security Context +## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ +## +securityContext: + enabled: true + fsGroup: 1001 + runAsUser: 1001 + rootUser: ## MariaDB admin password ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-the-root-password-on-first-run diff --git a/upstreamed/mongodb/Chart.yaml b/upstreamed/mongodb/Chart.yaml index 6193ad6117..4d42f80403 100644 --- a/upstreamed/mongodb/Chart.yaml +++ b/upstreamed/mongodb/Chart.yaml @@ -1,5 +1,5 @@ name: mongodb -version: 4.3.10 +version: 4.4.0 appVersion: 4.0.3 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 3b429988ec..1f4107d7c8 100644 --- a/upstreamed/mongodb/README.md +++ b/upstreamed/mongodb/README.md @@ -86,7 +86,7 @@ The following table lists the configurable parameters of the MongoDB chart and t | `persistence.accessMode` | Use volume as ReadOnly or ReadWrite | `ReadWriteOnce` | | `persistence.size` | Size of data volume | `8Gi` | | `persistence.annotations` | Persistent Volume annotations | `{}` | -| `persistence.existingClaim` | Name of an existing PVC to use (avoids creating one if this is given) | `nil` | +| `persistence.existingClaim` | Name of an existing PVC to use (avoids creating one if this is given) | `nil` | | `livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated | `30` | | `livenessProbe.periodSeconds` | How often to perform the probe | `10` | | `livenessProbe.timeoutSeconds` | When the probe times out | `5` | @@ -144,6 +144,12 @@ Some characteristics of this chart are: * The number of secondary and arbiter nodes can be scaled out independently. * Easy to move an application from using a standalone MongoDB server to use a replica set. +## Initialize a fresh instance + +The [Bitnami MongoDB](https://github.com/bitnami/bitnami-docker-mongodb) 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 allowed extensions are `.sh`, and `.js`. + ## Persistence The [Bitnami MongoDB](https://github.com/bitnami/bitnami-docker-mongodb) image stores the MongoDB data and configurations at the `/bitnami/mongodb` path of the container. diff --git a/upstreamed/mongodb/files/docker-entrypoint-initdb.d/README.md b/upstreamed/mongodb/files/docker-entrypoint-initdb.d/README.md new file mode 100644 index 0000000000..a9299905d0 --- /dev/null +++ b/upstreamed/mongodb/files/docker-entrypoint-initdb.d/README.md @@ -0,0 +1,3 @@ +You can copy here your custom .sh, or .js file so they are executed during the first boot of the image. + +More info in the [bitnami-docker-mongodb](https://github.com/bitnami/bitnami-docker-mongodb#initializing-a-new-instance) repository. \ No newline at end of file diff --git a/upstreamed/mongodb/templates/deployment-standalone.yaml b/upstreamed/mongodb/templates/deployment-standalone.yaml index b5165dbb28..d8ff01be35 100644 --- a/upstreamed/mongodb/templates/deployment-standalone.yaml +++ b/upstreamed/mongodb/templates/deployment-standalone.yaml @@ -110,6 +110,10 @@ spec: volumeMounts: - name: data mountPath: /bitnami/mongodb + {{- if (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js]") }} + - name: custom-init-scripts + mountPath: /docker-entrypoint-initdb.d + {{- end }} {{- if .Values.configmap }} - name: config mountPath: /opt/bitnami/mongodb/conf/mongodb.conf @@ -118,6 +122,11 @@ spec: resources: {{ toYaml .Values.resources | indent 10 }} volumes: + {{- if (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js]") }} + - name: custom-init-scripts + configMap: + name: {{ template "mongodb.fullname" . }}-init-scripts + {{- end }} - name: data {{- if .Values.persistence.enabled }} persistentVolumeClaim: diff --git a/upstreamed/mongodb/templates/initialization-configmap.yaml b/upstreamed/mongodb/templates/initialization-configmap.yaml new file mode 100644 index 0000000000..840e77ccfa --- /dev/null +++ b/upstreamed/mongodb/templates/initialization-configmap.yaml @@ -0,0 +1,13 @@ +{{ if (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js]") }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ template "mongodb.fullname" . }}-init-scripts + labels: + app: {{ template "mongodb.name" . }} + chart: {{ template "mongodb.chart" . }} + release: {{ .Release.Name | quote }} + heritage: {{ .Release.Service | quote }} +data: +{{ (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js]").AsConfig | indent 2 }} +{{ end }} \ No newline at end of file diff --git a/upstreamed/mongodb/templates/statefulset-primary-rs.yaml b/upstreamed/mongodb/templates/statefulset-primary-rs.yaml index ca5bae1047..8dcb004715 100644 --- a/upstreamed/mongodb/templates/statefulset-primary-rs.yaml +++ b/upstreamed/mongodb/templates/statefulset-primary-rs.yaml @@ -124,17 +124,26 @@ spec: volumeMounts: - name: datadir mountPath: /bitnami/mongodb - {{- if .Values.configmap }} + {{- if (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js]") }} + - name: custom-init-scripts + mountPath: /docker-entrypoint-initdb.d + {{- end }} + {{- if .Values.configmap }} - name: config mountPath: /opt/bitnami/mongodb/conf/mongodb.conf subPath: mongodb.conf - {{- end }} + {{- end }} volumes: - {{- if .Values.configmap }} + {{- if (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js]") }} + - name: custom-init-scripts + configMap: + name: {{ template "mongodb.fullname" . }}-init-scripts + {{- end }} + {{- if .Values.configmap }} - name: config configMap: name: {{ template "mongodb.fullname" . }} - {{- end }} + {{- end }} {{- if .Values.persistence.enabled }} volumeClaimTemplates: - metadata: diff --git a/upstreamed/opencart/Chart.yaml b/upstreamed/opencart/Chart.yaml index c0e78aaf56..18939ab6e8 100644 --- a/upstreamed/opencart/Chart.yaml +++ b/upstreamed/opencart/Chart.yaml @@ -1,5 +1,5 @@ name: opencart -version: 3.0.3 +version: 3.0.4 appVersion: 3.0.2-0 description: A free and open source e-commerce platform for online merchants. It provides a professional and reliable foundation for a successful online store. diff --git a/upstreamed/opencart/templates/NOTES.txt b/upstreamed/opencart/templates/NOTES.txt index f1ebf1b569..58c6795b65 100644 --- a/upstreamed/opencart/templates/NOTES.txt +++ b/upstreamed/opencart/templates/NOTES.txt @@ -23,16 +23,17 @@ host. To configure OpenCart with the URL of your service: export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "opencart.fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") export APP_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "opencart.fullname" . }} -o jsonpath="{.data.opencart-password}" | base64 --decode) {{- if .Values.mariadb.mariadbRootPassword }} - export APP_DATABASE_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "opencart.mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode) + export DATABASE_ROOT_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "opencart.mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode) {{- end }} {{- end }} + export APP_DATABASE_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "opencart.mariadb.fullname" . }} -o jsonpath="{.data.mariadb-password}" | base64 --decode) 2. Complete your OpenCart deployment by running: {{- if .Values.mariadb.enabled }} helm upgrade {{ .Release.Name }} stable/opencart \ - --set opencartHost=$APP_HOST,opencartPassword=$APP_PASSWORD{{ if .Values.mariadb.mariadbPassword }},mariadb.mariadbPassword=$APP_DATABASE_PASSWORD{{ end }} + --set opencartHost=$APP_HOST,opencartPassword=$APP_PASSWORD{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$DATABASE_ROOT_PASSWORD{{ end }},mariadb.db.password=$APP_DATABASE_PASSWORD {{- else }} ## PLEASE UPDATE THE EXTERNAL DATABASE CONNECTION PARAMETERS IN THE FOLLOWING COMMAND AS NEEDED ## diff --git a/upstreamed/osclass/Chart.yaml b/upstreamed/osclass/Chart.yaml index d030a71ad8..8d5fac1676 100644 --- a/upstreamed/osclass/Chart.yaml +++ b/upstreamed/osclass/Chart.yaml @@ -1,5 +1,5 @@ name: osclass -version: 3.0.3 +version: 3.0.4 appVersion: 3.7.4 description: Osclass is a php script that allows you to quickly create and manage your own free classifieds site. diff --git a/upstreamed/osclass/templates/NOTES.txt b/upstreamed/osclass/templates/NOTES.txt index c6ac8920e8..a6e2de0896 100644 --- a/upstreamed/osclass/templates/NOTES.txt +++ b/upstreamed/osclass/templates/NOTES.txt @@ -23,16 +23,17 @@ host. To configure Osclass with the URL of your service: export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "osclass.fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") export APP_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "osclass.fullname" . }} -o jsonpath="{.data.osclass-password}" | base64 --decode) {{- if .Values.mariadb.mariadbRootPassword }} - export APP_DATABASE_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "osclass.mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode) + export DATABASE_ROOT_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "osclass.mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode) {{- end }} {{- end }} - + export APP_DATABASE_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "osclass.mariadb.fullname" . }} -o jsonpath="{.data.mariadb-password}" | base64 --decode) + 2. Complete your Osclass deployment by running: {{- if .Values.mariadb.enabled }} helm upgrade {{ .Release.Name }} stable/osclass \ - --set osclassHost=$APP_HOST,osclassPassword=$APP_PASSWORD{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$APP_DATABASE_PASSWORD{{ end }} + --set osclassHost=$APP_HOST,osclassPassword=$APP_PASSWORD{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$DATABASE_ROOT_PASSWORD{{ end }},mariadb.db.password=$APP_DATABASE_PASSWORD {{- else }} ## PLEASE UPDATE THE EXTERNAL DATABASE CONNECTION PARAMETERS IN THE FOLLOWING COMMAND AS NEEDED ## diff --git a/upstreamed/phabricator/Chart.yaml b/upstreamed/phabricator/Chart.yaml index c9808b3d55..aac0f4ca7d 100644 --- a/upstreamed/phabricator/Chart.yaml +++ b/upstreamed/phabricator/Chart.yaml @@ -1,6 +1,6 @@ name: phabricator -version: 3.0.5 -appVersion: 2018.39.0 +version: 3.0.6 +appVersion: 2018.40.0 description: Collection of open source web applications that help software companies build better software. keywords: - phabricator diff --git a/upstreamed/phabricator/requirements.lock b/upstreamed/phabricator/requirements.lock index 229dc9f484..b80cf36fcc 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: 5.0.7 + version: 5.0.9 digest: sha256:e09c8ca7126923a30e39f442c3863b44684d4eb3f7b6dc869f0206da4463f416 -generated: 2018-10-02T16:38:19.210013204Z +generated: 2018-10-09T14:11:47.8079908Z diff --git a/upstreamed/phabricator/values.yaml b/upstreamed/phabricator/values.yaml index c458578c3c..35c6783fac 100644 --- a/upstreamed/phabricator/values.yaml +++ b/upstreamed/phabricator/values.yaml @@ -4,7 +4,7 @@ image: registry: docker.io repository: bitnami/phabricator - tag: 2018.39.0-debian-9 + tag: 2018.40.0-debian-9 ## 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 From 5f2fca9388483ce4f4c268542514b376f1b18b83 Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Wed, 10 Oct 2018 13:44:35 +0000 Subject: [PATCH 03/11] nginx-ingress-controller: update to `0.20.0-debian-9` Signed-off-by: Bitnami Containers --- bitnami/nginx-ingress-controller/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/nginx-ingress-controller/values.yaml b/bitnami/nginx-ingress-controller/values.yaml index e5d149eed7..727aa518d2 100644 --- a/bitnami/nginx-ingress-controller/values.yaml +++ b/bitnami/nginx-ingress-controller/values.yaml @@ -4,7 +4,7 @@ name: controller image: registry: docker.io repository: bitnami/nginx-ingress-controller - tag: 0.19.0-debian-9 + tag: 0.20.0-debian-9 ## 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 From 742681877ea8d8d6ac89a51d2a5b2f84ec5d6d38 Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Wed, 10 Oct 2018 13:44:35 +0000 Subject: [PATCH 04/11] nginx-ingress-controller: bump chart appVersion to `0.20.0` Signed-off-by: Bitnami Containers --- bitnami/nginx-ingress-controller/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/nginx-ingress-controller/Chart.yaml b/bitnami/nginx-ingress-controller/Chart.yaml index fb018fb454..eb15e6e7b4 100644 --- a/bitnami/nginx-ingress-controller/Chart.yaml +++ b/bitnami/nginx-ingress-controller/Chart.yaml @@ -1,6 +1,6 @@ name: nginx-ingress-controller version: 2.0.3 -appVersion: 0.19.0 +appVersion: 0.20.0 description: Chart for the nginx Ingress controller keywords: - ingress From 5f431c7fec52a8ca3e159d53a86fb0510a6fc4ff Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Wed, 10 Oct 2018 13:44:35 +0000 Subject: [PATCH 05/11] nginx-ingress-controller: bump chart version to `2.0.4` Signed-off-by: Bitnami Containers --- bitnami/nginx-ingress-controller/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/nginx-ingress-controller/Chart.yaml b/bitnami/nginx-ingress-controller/Chart.yaml index eb15e6e7b4..4c50e79146 100644 --- a/bitnami/nginx-ingress-controller/Chart.yaml +++ b/bitnami/nginx-ingress-controller/Chart.yaml @@ -1,5 +1,5 @@ name: nginx-ingress-controller -version: 2.0.3 +version: 2.0.4 appVersion: 0.20.0 description: Chart for the nginx Ingress controller keywords: From 29c8250b1dbd9b0a01c2d23bf597cbae1cf3d831 Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Wed, 10 Oct 2018 22:00:49 +0000 Subject: [PATCH 06/11] etcd: update to `3.3.10-debian-9` Signed-off-by: Bitnami Containers --- bitnami/etcd/values-production.yaml | 2 +- bitnami/etcd/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bitnami/etcd/values-production.yaml b/bitnami/etcd/values-production.yaml index a93317457d..e00caf201d 100644 --- a/bitnami/etcd/values-production.yaml +++ b/bitnami/etcd/values-production.yaml @@ -4,7 +4,7 @@ image: registry: docker.io repository: bitnami/etcd - tag: 3.3.9-debian-9 + tag: 3.3.10-debian-9 ## 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/bitnami/etcd/values.yaml b/bitnami/etcd/values.yaml index 562616da4b..edf8ee6ec5 100644 --- a/bitnami/etcd/values.yaml +++ b/bitnami/etcd/values.yaml @@ -4,7 +4,7 @@ image: registry: docker.io repository: bitnami/etcd - tag: 3.3.9-debian-9 + tag: 3.3.10-debian-9 ## 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 From 8ccb0a7a27704cc18956b5b30f8fd6761024351b Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Wed, 10 Oct 2018 22:00:49 +0000 Subject: [PATCH 07/11] etcd: bump chart appVersion to `3.3.10` Signed-off-by: Bitnami Containers --- bitnami/etcd/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/etcd/Chart.yaml b/bitnami/etcd/Chart.yaml index f67e9ed8ca..0c82707ae2 100644 --- a/bitnami/etcd/Chart.yaml +++ b/bitnami/etcd/Chart.yaml @@ -1,6 +1,6 @@ name: etcd version: 1.1.5 -appVersion: 3.3.9 +appVersion: 3.3.10 description: etcd is a distributed key value store that provides a reliable way to store data across a cluster of machines keywords: - etcd From 9109fee781df43b13db5724e5d88bca1455bdb02 Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Wed, 10 Oct 2018 22:00:49 +0000 Subject: [PATCH 08/11] etcd: bump chart version to `1.1.6` Signed-off-by: Bitnami Containers --- bitnami/etcd/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/etcd/Chart.yaml b/bitnami/etcd/Chart.yaml index 0c82707ae2..f6b6513ad9 100644 --- a/bitnami/etcd/Chart.yaml +++ b/bitnami/etcd/Chart.yaml @@ -1,5 +1,5 @@ name: etcd -version: 1.1.5 +version: 1.1.6 appVersion: 3.3.10 description: etcd is a distributed key value store that provides a reliable way to store data across a cluster of machines keywords: From 1dd53c556bb94f5c090c773477ec1c616ed1799d Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Wed, 10 Oct 2018 22:38:41 +0000 Subject: [PATCH 09/11] memcached: update to `1.5.11-debian-9` Signed-off-by: Bitnami Containers --- bitnami/memcached/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/memcached/values.yaml b/bitnami/memcached/values.yaml index a62fbcde3d..20674598b4 100644 --- a/bitnami/memcached/values.yaml +++ b/bitnami/memcached/values.yaml @@ -4,7 +4,7 @@ image: registry: docker.io repository: bitnami/memcached - tag: 1.5.10-debian-9 + tag: 1.5.11-debian-9 ## 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 From dcfc97584df6da743342a3c0804f409377f79413 Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Wed, 10 Oct 2018 22:38:41 +0000 Subject: [PATCH 10/11] memcached: bump chart appVersion to `1.5.11` Signed-off-by: Bitnami Containers --- bitnami/memcached/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/memcached/Chart.yaml b/bitnami/memcached/Chart.yaml index aba6988d7f..9fecc82b04 100644 --- a/bitnami/memcached/Chart.yaml +++ b/bitnami/memcached/Chart.yaml @@ -1,6 +1,6 @@ name: memcached version: 1.0.1 -appVersion: 1.5.10 +appVersion: 1.5.11 description: Chart for Memcached keywords: - memcached From 8786e366502ad91c76739a945a58196a575863de Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Wed, 10 Oct 2018 22:38:41 +0000 Subject: [PATCH 11/11] memcached: bump chart version to `1.0.2` Signed-off-by: Bitnami Containers --- bitnami/memcached/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/memcached/Chart.yaml b/bitnami/memcached/Chart.yaml index 9fecc82b04..ff990d40ff 100644 --- a/bitnami/memcached/Chart.yaml +++ b/bitnami/memcached/Chart.yaml @@ -1,5 +1,5 @@ name: memcached -version: 1.0.1 +version: 1.0.2 appVersion: 1.5.11 description: Chart for Memcached keywords: