From 2f484f684c2b4faa37ce9069ed0dffb47f4aef53 Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Fri, 15 Mar 2019 12:37:34 +0000 Subject: [PATCH] Synchronize upstreamed folder to 3fe797fb7 --- upstreamed/dokuwiki/Chart.yaml | 4 +- upstreamed/dokuwiki/templates/_helpers.tpl | 19 +++++-- upstreamed/dokuwiki/templates/deployment.yaml | 2 +- upstreamed/dokuwiki/values.yaml | 2 +- upstreamed/drupal/Chart.yaml | 4 +- upstreamed/drupal/templates/_helpers.tpl | 19 +++++-- upstreamed/drupal/templates/deployment.yaml | 2 +- upstreamed/drupal/values.yaml | 2 +- upstreamed/ghost/Chart.yaml | 2 +- upstreamed/ghost/templates/NOTES.txt | 4 +- upstreamed/joomla/Chart.yaml | 2 +- upstreamed/joomla/templates/_helpers.tpl | 19 +++++-- upstreamed/joomla/templates/deployment.yaml | 2 +- upstreamed/magento/Chart.yaml | 2 +- upstreamed/magento/templates/NOTES.txt | 12 ++--- upstreamed/magento/templates/_helpers.tpl | 19 +++++-- upstreamed/magento/templates/deployment.yaml | 2 +- upstreamed/mariadb/Chart.yaml | 2 +- upstreamed/mariadb/templates/_helpers.tpl | 19 +++++-- .../mariadb/templates/master-statefulset.yaml | 2 +- .../mariadb/templates/slave-statefulset.yaml | 2 +- upstreamed/mediawiki/Chart.yaml | 2 +- upstreamed/mediawiki/templates/_helpers.tpl | 19 +++++-- .../mediawiki/templates/deployment.yaml | 2 +- upstreamed/mongodb/Chart.yaml | 2 +- upstreamed/mongodb/templates/_helpers.tpl | 19 +++++-- .../templates/deployment-standalone.yaml | 2 +- .../templates/statefulset-primary-rs.yaml | 2 +- .../templates/statefulset-secondary-rs.yaml | 2 +- upstreamed/moodle/Chart.yaml | 2 +- upstreamed/moodle/templates/_helpers.tpl | 19 +++++-- upstreamed/moodle/templates/deployment.yaml | 2 +- upstreamed/nats/Chart.yaml | 2 +- upstreamed/nats/templates/_helpers.tpl | 9 +++- upstreamed/nats/templates/statefulset.yaml | 2 +- upstreamed/opencart/Chart.yaml | 2 +- upstreamed/opencart/templates/NOTES.txt | 12 ++--- upstreamed/opencart/templates/_helpers.tpl | 19 +++++-- upstreamed/opencart/templates/deployment.yaml | 2 +- upstreamed/orangehrm/Chart.yaml | 2 +- upstreamed/orangehrm/templates/_helpers.tpl | 19 +++++-- .../orangehrm/templates/deployment.yaml | 2 +- upstreamed/osclass/Chart.yaml | 2 +- upstreamed/osclass/templates/NOTES.txt | 12 ++--- upstreamed/osclass/templates/_helpers.tpl | 19 +++++-- upstreamed/osclass/templates/deployment.yaml | 2 +- upstreamed/owncloud/Chart.yaml | 2 +- upstreamed/owncloud/templates/NOTES.txt | 12 ++--- upstreamed/owncloud/templates/_helpers.tpl | 19 +++++-- upstreamed/owncloud/templates/deployment.yaml | 2 +- upstreamed/parse/Chart.yaml | 2 +- upstreamed/parse/templates/NOTES.txt | 4 +- upstreamed/parse/templates/_helpers.tpl | 23 -------- upstreamed/parse/values.yaml | 1 - upstreamed/phabricator/Chart.yaml | 2 +- upstreamed/phabricator/templates/_helpers.tpl | 19 +++++-- .../phabricator/templates/deployment.yaml | 2 +- upstreamed/phpbb/Chart.yaml | 2 +- upstreamed/phpbb/templates/_helpers.tpl | 19 +++++-- upstreamed/phpbb/templates/deployment.yaml | 2 +- upstreamed/phpmyadmin/Chart.yaml | 2 +- upstreamed/phpmyadmin/templates/_helpers.tpl | 19 +++++-- .../phpmyadmin/templates/deployment.yaml | 2 +- upstreamed/postgresql/Chart.yaml | 2 +- upstreamed/postgresql/templates/_helpers.tpl | 19 +++++-- .../postgresql/templates/statefulset.yaml | 2 +- upstreamed/prestashop/Chart.yaml | 2 +- upstreamed/prestashop/templates/NOTES.txt | 12 ++--- upstreamed/prestashop/templates/_helpers.tpl | 19 +++++-- .../prestashop/templates/deployment.yaml | 2 +- upstreamed/rabbitmq/Chart.yaml | 2 +- upstreamed/rabbitmq/templates/_helpers.tpl | 48 ++++++++++++++--- .../rabbitmq/templates/statefulset.yaml | 6 +-- upstreamed/rabbitmq/values-production.yaml | 6 +++ upstreamed/rabbitmq/values.yaml | 6 +++ upstreamed/redis/Chart.yaml | 2 +- upstreamed/redis/templates/_helpers.tpl | 54 ++++++++++++++++--- .../redis/templates/metrics-deployment.yaml | 2 +- .../templates/redis-master-statefulset.yaml | 2 +- upstreamed/suitecrm/Chart.yaml | 2 +- upstreamed/suitecrm/templates/_helpers.tpl | 19 +++++-- upstreamed/suitecrm/templates/deployment.yaml | 2 +- upstreamed/testlink/Chart.yaml | 2 +- upstreamed/testlink/templates/_helpers.tpl | 19 +++++-- upstreamed/testlink/templates/deployment.yaml | 2 +- upstreamed/wordpress/Chart.yaml | 2 +- upstreamed/wordpress/templates/_helpers.tpl | 19 +++++-- .../wordpress/templates/deployment.yaml | 2 +- 88 files changed, 518 insertions(+), 193 deletions(-) diff --git a/upstreamed/dokuwiki/Chart.yaml b/upstreamed/dokuwiki/Chart.yaml index f926e4092f..a2805edba4 100644 --- a/upstreamed/dokuwiki/Chart.yaml +++ b/upstreamed/dokuwiki/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: dokuwiki -version: 4.1.0 -appVersion: 0.20180422.201805030840 +version: 4.2.0 +appVersion: 0.20180422.201901061035 description: DokuWiki is a standards-compliant, simple to use wiki optimized for creating documentation. It is targeted at developer teams, workgroups, and small companies. All data is stored in plain text files, so no database is required. diff --git a/upstreamed/dokuwiki/templates/_helpers.tpl b/upstreamed/dokuwiki/templates/_helpers.tpl index 38f3f2bfaf..836064c9a9 100644 --- a/upstreamed/dokuwiki/templates/_helpers.tpl +++ b/upstreamed/dokuwiki/templates/_helpers.tpl @@ -48,11 +48,24 @@ Also, we can't use a single if because lazy evaluation is not an option {{/* Return the proper image name (for the metrics image) */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "dokuwiki.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/dokuwiki/templates/deployment.yaml b/upstreamed/dokuwiki/templates/deployment.yaml index 66d3210cba..e87356ba82 100644 --- a/upstreamed/dokuwiki/templates/deployment.yaml +++ b/upstreamed/dokuwiki/templates/deployment.yaml @@ -99,7 +99,7 @@ spec: mountPath: /bitnami/apache {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "dokuwiki.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} command: [ '/bin/apache_exporter', '-scrape_uri', 'http://status.localhost:80/server-status/?auto'] ports: diff --git a/upstreamed/dokuwiki/values.yaml b/upstreamed/dokuwiki/values.yaml index 3941f7ce86..eba4c762b6 100644 --- a/upstreamed/dokuwiki/values.yaml +++ b/upstreamed/dokuwiki/values.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/dokuwiki - tag: 0.20180422.201805030840 + tag: 0.20180422.201901061035 ## 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/drupal/Chart.yaml b/upstreamed/drupal/Chart.yaml index 70ade76fd4..58ceeb1e0b 100644 --- a/upstreamed/drupal/Chart.yaml +++ b/upstreamed/drupal/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: drupal -version: 3.1.1 -appVersion: 8.6.11 +version: 3.2.0 +appVersion: 8.6.12 description: One of the most versatile open source content management systems. keywords: - drupal diff --git a/upstreamed/drupal/templates/_helpers.tpl b/upstreamed/drupal/templates/_helpers.tpl index 63a94a3927..933ca769eb 100644 --- a/upstreamed/drupal/templates/_helpers.tpl +++ b/upstreamed/drupal/templates/_helpers.tpl @@ -56,11 +56,24 @@ Also, we can't use a single if because lazy evaluation is not an option {{/* Return the proper image name (for the metrics image) */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "drupal.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/drupal/templates/deployment.yaml b/upstreamed/drupal/templates/deployment.yaml index 83d8e6f834..c22aeec8b9 100644 --- a/upstreamed/drupal/templates/deployment.yaml +++ b/upstreamed/drupal/templates/deployment.yaml @@ -114,7 +114,7 @@ spec: {{- end }} {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "drupal.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} command: [ '/bin/apache_exporter', '-scrape_uri', 'http://status.localhost:80/server-status/?auto'] ports: diff --git a/upstreamed/drupal/values.yaml b/upstreamed/drupal/values.yaml index e4cb06a9cb..c9df02d7a7 100644 --- a/upstreamed/drupal/values.yaml +++ b/upstreamed/drupal/values.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/drupal - tag: 8.6.11 + tag: 8.6.12 ## 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/ghost/Chart.yaml b/upstreamed/ghost/Chart.yaml index c852d6b780..72ee6d5618 100644 --- a/upstreamed/ghost/Chart.yaml +++ b/upstreamed/ghost/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: ghost -version: 6.5.0 +version: 6.5.1 appVersion: 2.16.4 description: A simple, powerful publishing platform that allows you to share your stories with the world keywords: diff --git a/upstreamed/ghost/templates/NOTES.txt b/upstreamed/ghost/templates/NOTES.txt index e8bfc24f62..ffcff11dce 100644 --- a/upstreamed/ghost/templates/NOTES.txt +++ b/upstreamed/ghost/templates/NOTES.txt @@ -27,8 +27,8 @@ host. To configure Ghost with the URL of your service: 2. Complete your Ghost deployment by running: - helm upgrade {{ .Release.Name }} stable/ghost\ - --set service.type={{ .Values.service.type }},ghostHost=$APP_HOST,ghostPassword=$APP_PASSWORD,{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$DATABASE_ROOT_PASSWORD{{ end }}mariadb.db.password=$APP_DATABASE_PASSWORD + helm upgrade {{ .Release.Name }} stable/{{ .Chart.Name }} \ + --set service.type={{ .Values.service.type }},ghostHost=$APP_HOST,ghostPassword=$APP_PASSWORD,{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$DATABASE_ROOT_PASSWORD{{ end }}mariadb.db.password=$APP_DATABASE_PASSWORD{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }} {{- else -}} 1. Get the Ghost URL by running: diff --git a/upstreamed/joomla/Chart.yaml b/upstreamed/joomla/Chart.yaml index b3d192cda3..33a1efb90e 100644 --- a/upstreamed/joomla/Chart.yaml +++ b/upstreamed/joomla/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: joomla -version: 4.1.1 +version: 4.2.0 appVersion: 3.9.4 description: PHP content management system (CMS) for publishing web content keywords: diff --git a/upstreamed/joomla/templates/_helpers.tpl b/upstreamed/joomla/templates/_helpers.tpl index 3a82b01c58..9862ea7029 100644 --- a/upstreamed/joomla/templates/_helpers.tpl +++ b/upstreamed/joomla/templates/_helpers.tpl @@ -56,11 +56,24 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{/* Return the proper image name (for the metrics image) */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "joomla.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/joomla/templates/deployment.yaml b/upstreamed/joomla/templates/deployment.yaml index 06a37cdb7c..b75116083a 100644 --- a/upstreamed/joomla/templates/deployment.yaml +++ b/upstreamed/joomla/templates/deployment.yaml @@ -139,7 +139,7 @@ spec: mountPath: /bitnami/apache {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "joomla.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} command: [ '/bin/apache_exporter', '-scrape_uri', 'http://status.localhost:80/server-status/?auto'] ports: diff --git a/upstreamed/magento/Chart.yaml b/upstreamed/magento/Chart.yaml index 3137ceaff1..1ff26c6f40 100644 --- a/upstreamed/magento/Chart.yaml +++ b/upstreamed/magento/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: magento -version: 4.2.0 +version: 4.3.1 appVersion: 2.3.0 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 65486ca547..143f2d8e71 100644 --- a/upstreamed/magento/templates/NOTES.txt +++ b/upstreamed/magento/templates/NOTES.txt @@ -32,14 +32,14 @@ host. To configure Magento with the URL of your service: {{- if .Values.mariadb.enabled }} - helm upgrade {{ .Release.Name }} stable/magento \ - --set magentoHost=$APP_HOST,magentoPassword=$APP_PASSWORD{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$DATABASE_ROOT_PASSWORD{{ end }},mariadb.db.password=$APP_DATABASE_PASSWORD + helm upgrade {{ .Release.Name }} stable/{{ .Chart.Name }} \ + --set magentoHost=$APP_HOST,magentoPassword=$APP_PASSWORD{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$DATABASE_ROOT_PASSWORD{{ end }},mariadb.db.password=$APP_DATABASE_PASSWORD{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }} {{- else }} ## PLEASE UPDATE THE EXTERNAL DATABASE CONNECTION PARAMETERS IN THE FOLLOWING COMMAND AS NEEDED ## - helm upgrade {{ .Release.Name }} stable/magento \ - --set magentoPassword=$APP_PASSWORD,magentoHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.host) }},externalDatabase.host={{ .Values.externalDatabase.host }}{{- end }}{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }} + helm upgrade {{ .Release.Name }} stable/{{ .Chart.Name }} \ + --set magentoPassword=$APP_PASSWORD,magentoHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.host) }},externalDatabase.host={{ .Values.externalDatabase.host }}{{- end }}{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }}{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }} {{- end }} {{- else -}} @@ -93,6 +93,6 @@ host. To configure Magento to use and external database host: ## PLEASE UPDATE THE EXTERNAL DATABASE CONNECTION PARAMETERS IN THE FOLLOWING COMMAND AS NEEDED ## - helm upgrade {{ .Release.Name }} stable/magento \ - --set magentoPassword=$APP_PASSWORD,magentoHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }},externalDatabase.host=YOUR_EXTERNAL_DATABASE_HOST + helm upgrade {{ .Release.Name }} stable/{{ .Chart.Name }} \ + --set magentoPassword=$APP_PASSWORD,magentoHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }},externalDatabase.host=YOUR_EXTERNAL_DATABASE_HOST{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }} {{- end }} diff --git a/upstreamed/magento/templates/_helpers.tpl b/upstreamed/magento/templates/_helpers.tpl index d1b3ec2895..a13e7d8067 100644 --- a/upstreamed/magento/templates/_helpers.tpl +++ b/upstreamed/magento/templates/_helpers.tpl @@ -86,11 +86,24 @@ Also, we can't use a single if because lazy evaluation is not an option {{/* Return the proper image name (for the metrics image) */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "magento.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/magento/templates/deployment.yaml b/upstreamed/magento/templates/deployment.yaml index 4c5e25ae4c..b62122bc64 100644 --- a/upstreamed/magento/templates/deployment.yaml +++ b/upstreamed/magento/templates/deployment.yaml @@ -135,7 +135,7 @@ spec: mountPath: /bitnami/apache {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "magento.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} command: [ '/bin/apache_exporter', '-scrape_uri', 'http://status.localhost:80/server-status/?auto'] ports: diff --git a/upstreamed/mariadb/Chart.yaml b/upstreamed/mariadb/Chart.yaml index bfd1763088..4cfbecc97e 100644 --- a/upstreamed/mariadb/Chart.yaml +++ b/upstreamed/mariadb/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mariadb -version: 5.9.0 +version: 5.10.0 appVersion: 10.1.38 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/templates/_helpers.tpl b/upstreamed/mariadb/templates/_helpers.tpl index a84f59d946..dcc3c83f84 100644 --- a/upstreamed/mariadb/templates/_helpers.tpl +++ b/upstreamed/mariadb/templates/_helpers.tpl @@ -66,11 +66,24 @@ Also, we can't use a single if because lazy evaluation is not an option {{/* Return the proper metrics image name */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "mariadb.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{ template "mariadb.initdbScriptsCM" . }} diff --git a/upstreamed/mariadb/templates/master-statefulset.yaml b/upstreamed/mariadb/templates/master-statefulset.yaml index b311b27a84..6b830d77c4 100644 --- a/upstreamed/mariadb/templates/master-statefulset.yaml +++ b/upstreamed/mariadb/templates/master-statefulset.yaml @@ -166,7 +166,7 @@ spec: {{- end }} {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "mariadb.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} env: - name: MARIADB_ROOT_PASSWORD diff --git a/upstreamed/mariadb/templates/slave-statefulset.yaml b/upstreamed/mariadb/templates/slave-statefulset.yaml index 0a350fd312..0ff1167dca 100644 --- a/upstreamed/mariadb/templates/slave-statefulset.yaml +++ b/upstreamed/mariadb/templates/slave-statefulset.yaml @@ -152,7 +152,7 @@ spec: {{- end }} {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "mariadb.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} env: - name: MARIADB_MASTER_ROOT_PASSWORD diff --git a/upstreamed/mediawiki/Chart.yaml b/upstreamed/mediawiki/Chart.yaml index e0d3873cf8..613713fc8a 100644 --- a/upstreamed/mediawiki/Chart.yaml +++ b/upstreamed/mediawiki/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mediawiki -version: 6.1.0 +version: 6.2.0 appVersion: 1.32.0 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/templates/_helpers.tpl b/upstreamed/mediawiki/templates/_helpers.tpl index 8f89d63abb..57adf0e7ec 100644 --- a/upstreamed/mediawiki/templates/_helpers.tpl +++ b/upstreamed/mediawiki/templates/_helpers.tpl @@ -56,11 +56,24 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{/* Return the proper image name (for the metrics image) */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "mediawiki.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/mediawiki/templates/deployment.yaml b/upstreamed/mediawiki/templates/deployment.yaml index 4442a85d9e..25cd107d36 100644 --- a/upstreamed/mediawiki/templates/deployment.yaml +++ b/upstreamed/mediawiki/templates/deployment.yaml @@ -148,7 +148,7 @@ spec: subPath: mediawiki {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "mediawiki.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} command: [ '/bin/apache_exporter', '-scrape_uri', 'http://status.localhost:80/server-status/?auto'] ports: diff --git a/upstreamed/mongodb/Chart.yaml b/upstreamed/mongodb/Chart.yaml index 4b52804253..92b2e0082a 100644 --- a/upstreamed/mongodb/Chart.yaml +++ b/upstreamed/mongodb/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mongodb -version: 5.11.0 +version: 5.12.0 appVersion: 4.0.6 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/templates/_helpers.tpl b/upstreamed/mongodb/templates/_helpers.tpl index 64207cb748..26f739d604 100644 --- a/upstreamed/mongodb/templates/_helpers.tpl +++ b/upstreamed/mongodb/templates/_helpers.tpl @@ -79,11 +79,24 @@ Also, we can't use a single if because lazy evaluation is not an option {{/* Return the proper image name (for the metrics image) */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "mongodb.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} diff --git a/upstreamed/mongodb/templates/deployment-standalone.yaml b/upstreamed/mongodb/templates/deployment-standalone.yaml index d61abaa486..ceced2c7f8 100644 --- a/upstreamed/mongodb/templates/deployment-standalone.yaml +++ b/upstreamed/mongodb/templates/deployment-standalone.yaml @@ -161,7 +161,7 @@ spec: {{ toYaml .Values.resources | indent 10 }} {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "mongodb.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} env: {{- if .Values.usePassword }} diff --git a/upstreamed/mongodb/templates/statefulset-primary-rs.yaml b/upstreamed/mongodb/templates/statefulset-primary-rs.yaml index 4f8ebc4e8f..6fc5f2865e 100644 --- a/upstreamed/mongodb/templates/statefulset-primary-rs.yaml +++ b/upstreamed/mongodb/templates/statefulset-primary-rs.yaml @@ -182,7 +182,7 @@ spec: {{ toYaml .Values.resources | indent 12 }} {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "mongodb.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} env: {{- if .Values.usePassword }} diff --git a/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml b/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml index 66ccbbd079..bd4f7b514c 100644 --- a/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml +++ b/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml @@ -166,7 +166,7 @@ spec: {{ toYaml .Values.resources | indent 12 }} {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "mongodb.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} env: {{- if .Values.usePassword }} diff --git a/upstreamed/moodle/Chart.yaml b/upstreamed/moodle/Chart.yaml index 7218d1e359..1951cd4959 100644 --- a/upstreamed/moodle/Chart.yaml +++ b/upstreamed/moodle/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: moodle -version: 4.1.0 +version: 4.2.0 appVersion: 3.6.3 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/templates/_helpers.tpl b/upstreamed/moodle/templates/_helpers.tpl index cc115b388a..ae6ee9a05d 100644 --- a/upstreamed/moodle/templates/_helpers.tpl +++ b/upstreamed/moodle/templates/_helpers.tpl @@ -64,11 +64,24 @@ Also, we can't use a single if because lazy evaluation is not an option {{/* Return the proper image name (for the metrics image) */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "moodle.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/moodle/templates/deployment.yaml b/upstreamed/moodle/templates/deployment.yaml index 94a7fe5e29..b8b3a1559b 100644 --- a/upstreamed/moodle/templates/deployment.yaml +++ b/upstreamed/moodle/templates/deployment.yaml @@ -129,7 +129,7 @@ spec: mountPath: /bitnami {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "moodle.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} command: [ '/bin/apache_exporter', '-scrape_uri', 'http://status.localhost:80/server-status/?auto'] ports: diff --git a/upstreamed/nats/Chart.yaml b/upstreamed/nats/Chart.yaml index 0c3bc22c85..df1943b16d 100644 --- a/upstreamed/nats/Chart.yaml +++ b/upstreamed/nats/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: nats -version: 2.2.0 +version: 2.3.0 appVersion: 1.4.1 description: An open-source, cloud-native messaging system keywords: diff --git a/upstreamed/nats/templates/_helpers.tpl b/upstreamed/nats/templates/_helpers.tpl index adffe94f68..fd2f84067a 100644 --- a/upstreamed/nats/templates/_helpers.tpl +++ b/upstreamed/nats/templates/_helpers.tpl @@ -65,10 +65,15 @@ Return the appropriate apiVersion for networkpolicy. {{/* Return the proper image name (for the metrics image) */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "nats.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} {{- if .Values.global }} {{- if .Values.global.imageRegistry }} {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} diff --git a/upstreamed/nats/templates/statefulset.yaml b/upstreamed/nats/templates/statefulset.yaml index 685691bc07..a74f0c100f 100644 --- a/upstreamed/nats/templates/statefulset.yaml +++ b/upstreamed/nats/templates/statefulset.yaml @@ -129,7 +129,7 @@ spec: {{- end }} {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "nats.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} args: {{ toYaml .Values.metrics.args | indent 10 -}} diff --git a/upstreamed/opencart/Chart.yaml b/upstreamed/opencart/Chart.yaml index 13daec9203..650ec6bd6e 100644 --- a/upstreamed/opencart/Chart.yaml +++ b/upstreamed/opencart/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: opencart -version: 4.1.0 +version: 4.3.0 appVersion: 3.0.3-1 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/templates/NOTES.txt b/upstreamed/opencart/templates/NOTES.txt index a2c81846e8..6df42bd3a7 100644 --- a/upstreamed/opencart/templates/NOTES.txt +++ b/upstreamed/opencart/templates/NOTES.txt @@ -32,14 +32,14 @@ host. To configure OpenCart with the URL of your service: {{- if .Values.mariadb.enabled }} - helm upgrade {{ .Release.Name }} stable/opencart \ - --set opencartHost=$APP_HOST,opencartPassword=$APP_PASSWORD{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$DATABASE_ROOT_PASSWORD{{ end }},mariadb.db.password=$APP_DATABASE_PASSWORD + helm upgrade {{ .Release.Name }} stable/{{ .Chart.Name }} \ + --set opencartHost=$APP_HOST,opencartPassword=$APP_PASSWORD{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$DATABASE_ROOT_PASSWORD{{ end }},mariadb.db.password=$APP_DATABASE_PASSWORD{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }} {{- else }} ## PLEASE UPDATE THE EXTERNAL DATABASE CONNECTION PARAMETERS IN THE FOLLOWING COMMAND AS NEEDED ## - helm upgrade {{ .Release.Name }} stable/opencart \ - --set opencartPassword=$APP_PASSWORD,opencartHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.host) }},externalDatabase.host={{ .Values.externalDatabase.host }}{{- end }}{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }} + helm upgrade {{ .Release.Name }} stable/{{ .Chart.Name }} \ + --set opencartPassword=$APP_PASSWORD,opencartHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.host) }},externalDatabase.host={{ .Values.externalDatabase.host }}{{- end }}{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }}{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }} {{- end }} {{- else -}} @@ -91,6 +91,6 @@ host. To configure OpenCart to use and external database host: ## PLEASE UPDATE THE EXTERNAL DATABASE CONNECTION PARAMETERS IN THE FOLLOWING COMMAND AS NEEDED ## - helm upgrade {{ .Release.Name }} stable/opencart \ - --set opencartPassword=$APP_PASSWORD,opencartHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }},externalDatabase.host=YOUR_EXTERNAL_DATABASE_HOST + helm upgrade {{ .Release.Name }} stable/{{ .Chart.Name }} \ + --set opencartPassword=$APP_PASSWORD,opencartHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }},externalDatabase.host=YOUR_EXTERNAL_DATABASE_HOST{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }} {{- end }} diff --git a/upstreamed/opencart/templates/_helpers.tpl b/upstreamed/opencart/templates/_helpers.tpl index d2e13f73e2..cccd57823e 100644 --- a/upstreamed/opencart/templates/_helpers.tpl +++ b/upstreamed/opencart/templates/_helpers.tpl @@ -70,11 +70,24 @@ Also, we can't use a single if because lazy evaluation is not an option {{/* Return the proper image name (for the metrics image) */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "opencart.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/opencart/templates/deployment.yaml b/upstreamed/opencart/templates/deployment.yaml index acc8460513..1488b0e2ee 100644 --- a/upstreamed/opencart/templates/deployment.yaml +++ b/upstreamed/opencart/templates/deployment.yaml @@ -128,7 +128,7 @@ spec: mountPath: /bitnami/apache {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "opencart.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} command: [ '/bin/apache_exporter', '-scrape_uri', 'http://status.localhost:80/server-status/?auto'] ports: diff --git a/upstreamed/orangehrm/Chart.yaml b/upstreamed/orangehrm/Chart.yaml index edf1a54406..e2c460da4c 100644 --- a/upstreamed/orangehrm/Chart.yaml +++ b/upstreamed/orangehrm/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: orangehrm -version: 4.1.0 +version: 4.2.0 appVersion: 4.3.0-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/templates/_helpers.tpl b/upstreamed/orangehrm/templates/_helpers.tpl index 8a6bd292db..309d9ab8f9 100644 --- a/upstreamed/orangehrm/templates/_helpers.tpl +++ b/upstreamed/orangehrm/templates/_helpers.tpl @@ -49,11 +49,24 @@ Also, we can't use a single if because lazy evaluation is not an option {{/* Return the proper image name (for the metrics image) */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "orangehrm.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/orangehrm/templates/deployment.yaml b/upstreamed/orangehrm/templates/deployment.yaml index c4538e1303..7bbfe09e05 100644 --- a/upstreamed/orangehrm/templates/deployment.yaml +++ b/upstreamed/orangehrm/templates/deployment.yaml @@ -113,7 +113,7 @@ spec: mountPath: /bitnami/apache {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "orangehrm.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} command: [ '/bin/apache_exporter', '-scrape_uri', 'http://status.localhost:80/server-status/?auto'] ports: diff --git a/upstreamed/osclass/Chart.yaml b/upstreamed/osclass/Chart.yaml index 2c23b59731..30cc0dabb1 100644 --- a/upstreamed/osclass/Chart.yaml +++ b/upstreamed/osclass/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: osclass -version: 4.1.0 +version: 4.2.1 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 389d059064..c239fdda93 100644 --- a/upstreamed/osclass/templates/NOTES.txt +++ b/upstreamed/osclass/templates/NOTES.txt @@ -32,14 +32,14 @@ host. To configure Osclass with the URL of your service: {{- if .Values.mariadb.enabled }} - helm upgrade {{ .Release.Name }} stable/osclass \ - --set osclassHost=$APP_HOST,osclassPassword=$APP_PASSWORD{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$DATABASE_ROOT_PASSWORD{{ end }},mariadb.db.password=$APP_DATABASE_PASSWORD + helm upgrade {{ .Release.Name }} stable/{{ .Chart.Name }} \ + --set osclassHost=$APP_HOST,osclassPassword=$APP_PASSWORD{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$DATABASE_ROOT_PASSWORD{{ end }},mariadb.db.password=$APP_DATABASE_PASSWORD{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }} {{- else }} ## PLEASE UPDATE THE EXTERNAL DATABASE CONNECTION PARAMETERS IN THE FOLLOWING COMMAND AS NEEDED ## - helm upgrade {{ .Release.Name }} stable/osclass \ - --set osclassPassword=$APP_PASSWORD,osclassHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.host) }},externalDatabase.host={{ .Values.externalDatabase.host }}{{- end }}{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }} + helm upgrade {{ .Release.Name }} stable/{{ .Chart.Name }} \ + --set osclassPassword=$APP_PASSWORD,osclassHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.host) }},externalDatabase.host={{ .Values.externalDatabase.host }}{{- end }}{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }}{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }} {{- end }} {{- else -}} @@ -94,6 +94,6 @@ host. To configure Osclass to use and external database host: ## PLEASE UPDATE THE EXTERNAL DATABASE CONNECTION PARAMETERS IN THE FOLLOWING COMMAND AS NEEDED ## - helm upgrade {{ .Release.Name }} stable/osclass \ - --set osclassPassword=$APP_PASSWORD,osclassHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }},externalDatabase.host=YOUR_EXTERNAL_DATABASE_HOST + helm upgrade {{ .Release.Name }} stable/{{ .Chart.Name }} \ + --set osclassPassword=$APP_PASSWORD,osclassHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }},externalDatabase.host=YOUR_EXTERNAL_DATABASE_HOST{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }} {{- end }} diff --git a/upstreamed/osclass/templates/_helpers.tpl b/upstreamed/osclass/templates/_helpers.tpl index 1b7b23fb57..a60c101e06 100644 --- a/upstreamed/osclass/templates/_helpers.tpl +++ b/upstreamed/osclass/templates/_helpers.tpl @@ -70,11 +70,24 @@ Also, we can't use a single if because lazy evaluation is not an option {{/* Return the proper image name (for the metrics image) */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "osclass.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/osclass/templates/deployment.yaml b/upstreamed/osclass/templates/deployment.yaml index 53feccf736..4b1a328e7d 100644 --- a/upstreamed/osclass/templates/deployment.yaml +++ b/upstreamed/osclass/templates/deployment.yaml @@ -135,7 +135,7 @@ spec: mountPath: /bitnami/apache {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "osclass.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} command: [ '/bin/apache_exporter', '-scrape_uri', 'http://status.localhost:80/server-status/?auto'] ports: diff --git a/upstreamed/owncloud/Chart.yaml b/upstreamed/owncloud/Chart.yaml index 8885bffaa6..765163a993 100644 --- a/upstreamed/owncloud/Chart.yaml +++ b/upstreamed/owncloud/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: owncloud -version: 4.1.0 +version: 4.2.1 appVersion: 10.1.0 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/templates/NOTES.txt b/upstreamed/owncloud/templates/NOTES.txt index d87222fe8c..89250d4b2f 100644 --- a/upstreamed/owncloud/templates/NOTES.txt +++ b/upstreamed/owncloud/templates/NOTES.txt @@ -32,14 +32,14 @@ host. To configure ownCloud with the URL of your service: {{- if .Values.mariadb.enabled }} - helm upgrade {{ .Release.Name }} stable/owncloud \ - --set owncloudHost=$APP_HOST,owncloudPassword=$APP_PASSWORD{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$DATABASE_ROOT_PASSWORD{{ end }},mariadb.db.password=$APP_DATABASE_PASSWORD + helm upgrade {{ .Release.Name }} stable/{{ .Chart.Name }} \ + --set owncloudHost=$APP_HOST,owncloudPassword=$APP_PASSWORD{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$DATABASE_ROOT_PASSWORD{{ end }},mariadb.db.password=$APP_DATABASE_PASSWORD{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }} {{- else }} ## PLEASE UPDATE THE EXTERNAL DATABASE CONNECTION PARAMETERS IN THE FOLLOWING COMMAND AS NEEDED ## - helm upgrade {{ .Release.Name }} stable/owncloud \ - --set owncloudPassword=$APP_PASSWORD,owncloudHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.host) }},externalDatabase.host={{ .Values.externalDatabase.host }}{{- end }}{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }} + helm upgrade {{ .Release.Name }} stable/{{ .Chart.Name }} \ + --set owncloudPassword=$APP_PASSWORD,owncloudHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.host) }},externalDatabase.host={{ .Values.externalDatabase.host }}{{- end }}{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }}{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }} {{- end }} {{- else -}} @@ -91,6 +91,6 @@ host. To configure ownCloud to use and external database host: ## PLEASE UPDATE THE EXTERNAL DATABASE CONNECTION PARAMETERS IN THE FOLLOWING COMMAND AS NEEDED ## - helm upgrade {{ .Release.Name }} stable/owncloud \ - --set owncloudPassword=$APP_PASSWORD,owncloudHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }},externalDatabase.host=YOUR_EXTERNAL_DATABASE_HOST + helm upgrade {{ .Release.Name }} stable/{{ .Chart.Name }} \ + --set owncloudPassword=$APP_PASSWORD,owncloudHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }},externalDatabase.host=YOUR_EXTERNAL_DATABASE_HOST{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }} {{- end }} diff --git a/upstreamed/owncloud/templates/_helpers.tpl b/upstreamed/owncloud/templates/_helpers.tpl index 31c92efbee..1e3ad787d9 100644 --- a/upstreamed/owncloud/templates/_helpers.tpl +++ b/upstreamed/owncloud/templates/_helpers.tpl @@ -77,11 +77,24 @@ Also, we can't use a single if because lazy evaluation is not an option {{/* Return the proper image name (for the metrics image) */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "owncloud.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/owncloud/templates/deployment.yaml b/upstreamed/owncloud/templates/deployment.yaml index a4a996f9d2..adf11b3c16 100644 --- a/upstreamed/owncloud/templates/deployment.yaml +++ b/upstreamed/owncloud/templates/deployment.yaml @@ -115,7 +115,7 @@ spec: mountPath: /bitnami/apache {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "owncloud.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} command: [ '/bin/apache_exporter', '-scrape_uri', 'http://status.localhost:80/server-status/?auto'] ports: diff --git a/upstreamed/parse/Chart.yaml b/upstreamed/parse/Chart.yaml index d18d72ecd0..e2d68ad924 100644 --- a/upstreamed/parse/Chart.yaml +++ b/upstreamed/parse/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: parse -version: 6.1.0 +version: 6.1.2 appVersion: 3.1.3 description: Parse is a platform that enables users to add a scalable and powerful backend to launch a full-featured app for iOS, Android, JavaScript, Windows, Unity, and more. keywords: diff --git a/upstreamed/parse/templates/NOTES.txt b/upstreamed/parse/templates/NOTES.txt index 79e9b7fa15..d448136ecd 100644 --- a/upstreamed/parse/templates/NOTES.txt +++ b/upstreamed/parse/templates/NOTES.txt @@ -59,8 +59,8 @@ service: 2. Complete your Parse Dashboard deployment by running: - helm upgrade {{ .Release.Name }} \ - --set server.host=$APP_HOST,server.port={{ .Values.server.port }},server.masterKey=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "parse.fullname" . }} -o jsonpath="{.data.master-key}" | base64 --decode),dashboard.username={{ .Values.dashboard.username }},dashboard.password=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "parse.fullname" . }} -o jsonpath="{.data.parse-dashboard-password}" | base64 --decode) stable/parse + helm upgrade {{ .Release.Name }} stable/{{ .Chart.Name }} \ + --set server.host=$APP_HOST,server.port={{ .Values.server.port }},server.masterKey=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "parse.fullname" . }} -o jsonpath="{.data.master-key}" | base64 --decode),dashboard.username={{ .Values.dashboard.username }},dashboard.password=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "parse.fullname" . }} -o jsonpath="{.data.parse-dashboard-password}" | base64 --decode){{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }} {{ else }} 1. Get the Parse Dashboard URL by running: diff --git a/upstreamed/parse/templates/_helpers.tpl b/upstreamed/parse/templates/_helpers.tpl index 9c3f8c139d..b7a1a5352a 100644 --- a/upstreamed/parse/templates/_helpers.tpl +++ b/upstreamed/parse/templates/_helpers.tpl @@ -44,29 +44,6 @@ If not using ClusterIP, or if a host or LoadBalancerIP is not defined, the value {{- default (include "parse.serviceIP" .) $host -}} {{- end -}} -{{/* -Return the proper Parse image name -*/}} -{{- define "parse.image" -}} -{{- $registryName := .Values.image.registry -}} -{{- $repositoryName := .Values.image.repository -}} -{{- $tag := .Values.image.tag | toString -}} -{{/* -Helm 2.11 supports the assignment of a value to a variable defined in a different scope, -but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. -Also, we can't use a single if because lazy evaluation is not an option -*/}} -{{- if .Values.global }} - {{- if .Values.global.imageRegistry }} - {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} - {{- else -}} - {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} - {{- end -}} -{{- else -}} - {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} -{{- end -}} -{{- end -}} - {{/* Return the proper Parse dashboard image name */}} diff --git a/upstreamed/parse/values.yaml b/upstreamed/parse/values.yaml index f9dfd981d2..966a327484 100644 --- a/upstreamed/parse/values.yaml +++ b/upstreamed/parse/values.yaml @@ -29,7 +29,6 @@ service: ## ref: http://kubernetes.io/docs/user-guide/services/#type-loadbalancer ## # - server: ## Bitnami Parse image version ## ref: https://hub.docker.com/r/bitnami/parse/tags/ diff --git a/upstreamed/phabricator/Chart.yaml b/upstreamed/phabricator/Chart.yaml index b929016ba4..dd9fa4d413 100644 --- a/upstreamed/phabricator/Chart.yaml +++ b/upstreamed/phabricator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: phabricator -version: 4.1.0 +version: 4.2.0 appVersion: 2019.10.0 description: Collection of open source web applications that help software companies build better software. keywords: diff --git a/upstreamed/phabricator/templates/_helpers.tpl b/upstreamed/phabricator/templates/_helpers.tpl index 54a718aaab..2c9d214c9f 100644 --- a/upstreamed/phabricator/templates/_helpers.tpl +++ b/upstreamed/phabricator/templates/_helpers.tpl @@ -70,11 +70,24 @@ Also, we can't use a single if because lazy evaluation is not an option {{/* Return the proper image name (for the metrics image) */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "phabricator.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/phabricator/templates/deployment.yaml b/upstreamed/phabricator/templates/deployment.yaml index 9939e09010..84ace050d2 100644 --- a/upstreamed/phabricator/templates/deployment.yaml +++ b/upstreamed/phabricator/templates/deployment.yaml @@ -131,7 +131,7 @@ spec: mountPath: /bitnami/apache {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "phabricator.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} command: [ '/bin/apache_exporter', '-scrape_uri', 'http://status.localhost:80/server-status/?auto'] ports: diff --git a/upstreamed/phpbb/Chart.yaml b/upstreamed/phpbb/Chart.yaml index ddb5107112..744e60ec2d 100644 --- a/upstreamed/phpbb/Chart.yaml +++ b/upstreamed/phpbb/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: phpbb -version: 4.1.0 +version: 4.2.0 appVersion: 3.2.5 description: Community forum that supports the notion of users and groups, file attachments, full-text search, notifications and more. keywords: diff --git a/upstreamed/phpbb/templates/_helpers.tpl b/upstreamed/phpbb/templates/_helpers.tpl index 5159316be6..fa1476b58d 100644 --- a/upstreamed/phpbb/templates/_helpers.tpl +++ b/upstreamed/phpbb/templates/_helpers.tpl @@ -56,11 +56,24 @@ Also, we can't use a single if because lazy evaluation is not an option {{/* Return the proper image name (for the metrics image) */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "phpbb.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/phpbb/templates/deployment.yaml b/upstreamed/phpbb/templates/deployment.yaml index f9ef2726ee..8b2500e0bc 100644 --- a/upstreamed/phpbb/templates/deployment.yaml +++ b/upstreamed/phpbb/templates/deployment.yaml @@ -132,7 +132,7 @@ spec: mountPath: /bitnami/apache {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "phpbb.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} command: [ '/bin/apache_exporter', '-scrape_uri', 'http://status.localhost:80/server-status/?auto'] ports: diff --git a/upstreamed/phpmyadmin/Chart.yaml b/upstreamed/phpmyadmin/Chart.yaml index a1adb18f77..765b48ed1d 100644 --- a/upstreamed/phpmyadmin/Chart.yaml +++ b/upstreamed/phpmyadmin/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: phpmyadmin -version: 2.1.0 +version: 2.2.0 appVersion: 4.8.5 description: phpMyAdmin is an mysql administration frontend keywords: diff --git a/upstreamed/phpmyadmin/templates/_helpers.tpl b/upstreamed/phpmyadmin/templates/_helpers.tpl index 4f87efbb93..14537cfb12 100644 --- a/upstreamed/phpmyadmin/templates/_helpers.tpl +++ b/upstreamed/phpmyadmin/templates/_helpers.tpl @@ -73,11 +73,24 @@ Also, we can't use a single if because lazy evaluation is not an option {{/* Return the proper image name (for the metrics image) */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "phpmyadmin.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/phpmyadmin/templates/deployment.yaml b/upstreamed/phpmyadmin/templates/deployment.yaml index 805188ff5d..87e2f4cb6b 100644 --- a/upstreamed/phpmyadmin/templates/deployment.yaml +++ b/upstreamed/phpmyadmin/templates/deployment.yaml @@ -81,7 +81,7 @@ spec: {{ toYaml .Values.resources | indent 12 }} {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "phpmyadmin.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} command: [ '/bin/apache_exporter', '-scrape_uri', 'http://status.localhost:80/server-status/?auto'] ports: diff --git a/upstreamed/postgresql/Chart.yaml b/upstreamed/postgresql/Chart.yaml index 9a322e0a35..0082387dc7 100644 --- a/upstreamed/postgresql/Chart.yaml +++ b/upstreamed/postgresql/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: postgresql -version: 3.13.1 +version: 3.14.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/templates/_helpers.tpl b/upstreamed/postgresql/templates/_helpers.tpl index ca050222a1..4bc8287657 100644 --- a/upstreamed/postgresql/templates/_helpers.tpl +++ b/upstreamed/postgresql/templates/_helpers.tpl @@ -97,14 +97,27 @@ Also, we can't use a single if because lazy evaluation is not an option {{- end -}} {{- end -}} - {{/* Return the proper PostgreSQL metrics image name */}} -{{- define "metrics.image" -}} +{{- define "postgresql.metrics.image" -}} {{- $registryName := default "docker.io" .Values.metrics.image.registry -}} +{{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := default "latest" .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName .Values.metrics.image.repository $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/postgresql/templates/statefulset.yaml b/upstreamed/postgresql/templates/statefulset.yaml index f9040ec1de..62b5604058 100644 --- a/upstreamed/postgresql/templates/statefulset.yaml +++ b/upstreamed/postgresql/templates/statefulset.yaml @@ -211,7 +211,7 @@ spec: {{- end }} {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "postgresql.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} env: {{- $database := required "In order to enable metrics you need to specify a database (.Values.postgresqlDatabase)" .Values.postgresqlDatabase }} diff --git a/upstreamed/prestashop/Chart.yaml b/upstreamed/prestashop/Chart.yaml index f94aa022d2..8ad813423f 100644 --- a/upstreamed/prestashop/Chart.yaml +++ b/upstreamed/prestashop/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: prestashop -version: 6.3.0 +version: 6.5.0 appVersion: 1.7.5-1 description: A popular open source ecommerce solution. Professional tools are easily accessible to increase online sales including instant guest checkout, abandoned cart reminders and automated Email marketing. keywords: diff --git a/upstreamed/prestashop/templates/NOTES.txt b/upstreamed/prestashop/templates/NOTES.txt index d8e2205c5b..fd08a3f2d2 100644 --- a/upstreamed/prestashop/templates/NOTES.txt +++ b/upstreamed/prestashop/templates/NOTES.txt @@ -32,14 +32,14 @@ host. To configure PrestaShop with the URL of your service: {{- if .Values.mariadb.enabled }} - helm upgrade {{ .Release.Name }} stable/prestashop \ - --set prestashopHost=$APP_HOST,prestashopPassword=$APP_PASSWORD{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$DATABASE_ROOT_PASSWORD{{ end }},mariadb.db.password=$APP_DATABASE_PASSWORD + helm upgrade {{ .Release.Name }} stable/{{ .Chart.Name }} \ + --set prestashopHost=$APP_HOST,prestashopPassword=$APP_PASSWORD{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$DATABASE_ROOT_PASSWORD{{ end }},mariadb.db.password=$APP_DATABASE_PASSWORD{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }} {{- else }} ## PLEASE UPDATE THE EXTERNAL DATABASE CONNECTION PARAMETERS IN THE FOLLOWING COMMAND AS NEEDED ## - helm upgrade {{ .Release.Name }} stable/prestashop \ - --set prestashopPassword=$APP_PASSWORD,prestashopHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.host) }},externalDatabase.host={{ .Values.externalDatabase.host }}{{- end }}{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }} + helm upgrade {{ .Release.Name }} stable/{{ .Chart.Name }} \ + --set prestashopPassword=$APP_PASSWORD,prestashopHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.host) }},externalDatabase.host={{ .Values.externalDatabase.host }}{{- end }}{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }}{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }} {{- end }} {{- else -}} @@ -95,6 +95,6 @@ host. To configure PrestaShop to use and external database host: ## PLEASE UPDATE THE EXTERNAL DATABASE CONNECTION PARAMETERS IN THE FOLLOWING COMMAND AS NEEDED ## - helm upgrade {{ .Release.Name }} stable/prestashop \ - --set prestashopPassword=$APP_PASSWORD,prestashopHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }},externalDatabase.host=YOUR_EXTERNAL_DATABASE_HOST + helm upgrade {{ .Release.Name }} stable/{{ .Chart.Name }} \ + --set prestashopPassword=$APP_PASSWORD,prestashopHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }},externalDatabase.host=YOUR_EXTERNAL_DATABASE_HOST{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }} {{- end }} diff --git a/upstreamed/prestashop/templates/_helpers.tpl b/upstreamed/prestashop/templates/_helpers.tpl index f384e218ee..86a67622f4 100644 --- a/upstreamed/prestashop/templates/_helpers.tpl +++ b/upstreamed/prestashop/templates/_helpers.tpl @@ -83,11 +83,24 @@ Also, we can't use a single if because lazy evaluation is not an option {{/* Return the proper image name (for the metrics image) */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "prestashop.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/prestashop/templates/deployment.yaml b/upstreamed/prestashop/templates/deployment.yaml index 98a77a5ed7..6c60ebd45f 100644 --- a/upstreamed/prestashop/templates/deployment.yaml +++ b/upstreamed/prestashop/templates/deployment.yaml @@ -165,7 +165,7 @@ spec: subPath: prestashop {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "prestashop.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} command: [ '/bin/apache_exporter', '-scrape_uri', 'http://status.localhost:80/server-status/?auto'] ports: diff --git a/upstreamed/rabbitmq/Chart.yaml b/upstreamed/rabbitmq/Chart.yaml index 01025ea08a..b01a3b198a 100644 --- a/upstreamed/rabbitmq/Chart.yaml +++ b/upstreamed/rabbitmq/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: rabbitmq -version: 4.7.1 +version: 4.8.0 appVersion: 3.7.13 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP) keywords: diff --git a/upstreamed/rabbitmq/templates/_helpers.tpl b/upstreamed/rabbitmq/templates/_helpers.tpl index fae4f4c7c0..9c0dc648cb 100644 --- a/upstreamed/rabbitmq/templates/_helpers.tpl +++ b/upstreamed/rabbitmq/templates/_helpers.tpl @@ -57,11 +57,24 @@ Also, we can't use a single if because lazy evaluation is not an option {{/* Return the proper metrics image name */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "rabbitmq.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* @@ -101,7 +114,7 @@ imagePullSecrets: {{- range .Values.global.imagePullSecrets }} - name: {{ . }} {{- end }} -{{- else if or .Values.image.pullSecrets .Values.metrics.image.pullSecrets }} +{{- else if or .Values.image.pullSecrets .Values.metrics.image.pullSecrets .Values.volumePermissions.image.pullSecrets }} imagePullSecrets: {{- range .Values.image.pullSecrets }} - name: {{ . }} @@ -109,8 +122,11 @@ imagePullSecrets: {{- range .Values.metrics.image.pullSecrets }} - name: {{ . }} {{- end }} +{{- range .Values.volumePermissions.image.pullSecrets }} + - name: {{ . }} +{{- end }} {{- end -}} -{{- else if or .Values.image.pullSecrets .Values.metrics.image.pullSecrets }} +{{- else if or .Values.image.pullSecrets .Values.metrics.image.pullSecrets .Values.volumePermissions.image.pullSecrets }} imagePullSecrets: {{- range .Values.image.pullSecrets }} - name: {{ . }} @@ -118,15 +134,31 @@ imagePullSecrets: {{- range .Values.metrics.image.pullSecrets }} - name: {{ . }} {{- end }} +{{- range .Values.volumePermissions.image.pullSecrets }} + - name: {{ . }} +{{- end }} {{- end -}} {{- end -}} {{/* Return the proper image name (for the init container volume-permissions image) */}} -{{- define "volumePermissions.image" -}} -{{- $registryName := .Values.volumePermissions.image.registry -}} +{{- define "rabbitmq.volumePermissions.image" -}} +{{- $registryName := .Values.volumePermissions.image.registry -}} {{- $repositoryName := .Values.volumePermissions.image.repository -}} {{- $tag := .Values.volumePermissions.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} diff --git a/upstreamed/rabbitmq/templates/statefulset.yaml b/upstreamed/rabbitmq/templates/statefulset.yaml index ca29b0f473..16d7354ac0 100644 --- a/upstreamed/rabbitmq/templates/statefulset.yaml +++ b/upstreamed/rabbitmq/templates/statefulset.yaml @@ -51,7 +51,7 @@ spec: {{- if and .Values.volumePermissions.enabled .Values.persistence.enabled .Values.securityContext.enabled }} initContainers: - name: volume-permissions - image: "{{ template "volumePermissions.image" . }}" + image: "{{ template "rabbitmq.volumePermissions.image" . }}" imagePullPolicy: {{ default "" .Values.volumePermissions.image.pullPolicy | quote }} command: ["/bin/chown", "-R", "{{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }}", "{{ .Values.persistence.path }}"] securityContext: @@ -61,7 +61,7 @@ spec: volumeMounts: - name: data mountPath: "{{ .Values.persistence.path }}" - {{- end }} + {{- end }} containers: - name: rabbitmq image: {{ template "rabbitmq.image" . }} @@ -178,7 +178,7 @@ spec: key: rabbitmq-password {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "rabbitmq.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} env: - name: RABBIT_PASSWORD diff --git a/upstreamed/rabbitmq/values-production.yaml b/upstreamed/rabbitmq/values-production.yaml index 8b1d86dd0b..e3892b3d4d 100644 --- a/upstreamed/rabbitmq/values-production.yaml +++ b/upstreamed/rabbitmq/values-production.yaml @@ -256,4 +256,10 @@ volumePermissions: repository: bitnami/minideb tag: latest pullPolicy: IfNotPresent + ## Optionally specify an array of imagePullSecrets. + ## Secrets must be manually created in the namespace. + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ + ## + # pullSecrets: + # - myRegistryKeySecretName resources: {} diff --git a/upstreamed/rabbitmq/values.yaml b/upstreamed/rabbitmq/values.yaml index c99c773778..99bb6e79c2 100644 --- a/upstreamed/rabbitmq/values.yaml +++ b/upstreamed/rabbitmq/values.yaml @@ -252,4 +252,10 @@ volumePermissions: repository: bitnami/minideb tag: latest pullPolicy: IfNotPresent + ## Optionally specify an array of imagePullSecrets. + ## Secrets must be manually created in the namespace. + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ + ## + # pullSecrets: + # - myRegistryKeySecretName resources: {} diff --git a/upstreamed/redis/Chart.yaml b/upstreamed/redis/Chart.yaml index 9547326d16..93211f54be 100644 --- a/upstreamed/redis/Chart.yaml +++ b/upstreamed/redis/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: redis -version: 6.3.1 +version: 6.4.0 appVersion: 4.0.13 description: Open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets. keywords: diff --git a/upstreamed/redis/templates/_helpers.tpl b/upstreamed/redis/templates/_helpers.tpl index d6a4d18944..afd318ada6 100644 --- a/upstreamed/redis/templates/_helpers.tpl +++ b/upstreamed/redis/templates/_helpers.tpl @@ -68,21 +68,47 @@ Also, we can't use a single if because lazy evaluation is not an option {{/* Return the proper image name (for the metrics image) */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "redis.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* Return the proper image name (for the init container volume-permissions image) */}} -{{- define "volumePermissions.image" -}} -{{- $registryName := .Values.volumePermissions.image.registry -}} +{{- define "redis.volumePermissions.image" -}} +{{- $registryName := .Values.volumePermissions.image.registry -}} {{- $repositoryName := .Values.volumePermissions.image.repository -}} {{- $tag := .Values.volumePermissions.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* @@ -170,8 +196,22 @@ Return sysctl image */}} {{- define "redis.sysctl.image" -}} {{- $registryName := default "docker.io" .Values.sysctlImage.registry -}} +{{- $repositoryName := .Values.sysctlImage.repository -}} {{- $tag := default "latest" .Values.sysctlImage.tag | toString -}} -{{- printf "%s/%s:%s" $registryName .Values.sysctlImage.repository $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/redis/templates/metrics-deployment.yaml b/upstreamed/redis/templates/metrics-deployment.yaml index c9d9e542e8..ef98aca702 100644 --- a/upstreamed/redis/templates/metrics-deployment.yaml +++ b/upstreamed/redis/templates/metrics-deployment.yaml @@ -45,7 +45,7 @@ spec: {{- end }} containers: - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "redis.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} args: {{- range $key, $value := .Values.metrics.extraArgs }} diff --git a/upstreamed/redis/templates/redis-master-statefulset.yaml b/upstreamed/redis/templates/redis-master-statefulset.yaml index a2abb7671a..2fe3a7af0f 100644 --- a/upstreamed/redis/templates/redis-master-statefulset.yaml +++ b/upstreamed/redis/templates/redis-master-statefulset.yaml @@ -155,7 +155,7 @@ spec: initContainers: {{- if $needsVolumePermissions }} - name: volume-permissions - image: "{{ template "volumePermissions.image" . }}" + image: "{{ template "redis.volumePermissions.image" . }}" imagePullPolicy: {{ default "" .Values.volumePermissions.image.pullPolicy | quote }} command: ["/bin/chown", "-R", "{{ .Values.master.securityContext.runAsUser }}:{{ .Values.master.securityContext.fsGroup }}", "{{ .Values.master.persistence.path }}"] securityContext: diff --git a/upstreamed/suitecrm/Chart.yaml b/upstreamed/suitecrm/Chart.yaml index dcae59eb95..8fff125e75 100644 --- a/upstreamed/suitecrm/Chart.yaml +++ b/upstreamed/suitecrm/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: suitecrm -version: 5.1.0 +version: 5.2.0 appVersion: 7.11.2 description: SuiteCRM is a completely open source enterprise-grade Customer Relationship Management (CRM) application. SuiteCRM is a software fork of the popular customer relationship management (CRM) system SugarCRM. keywords: diff --git a/upstreamed/suitecrm/templates/_helpers.tpl b/upstreamed/suitecrm/templates/_helpers.tpl index 762c0829ad..60c8bb179e 100644 --- a/upstreamed/suitecrm/templates/_helpers.tpl +++ b/upstreamed/suitecrm/templates/_helpers.tpl @@ -70,11 +70,24 @@ Also, we can't use a single if because lazy evaluation is not an option {{/* Return the proper image name (for the metrics image) */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "suitecrm.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/suitecrm/templates/deployment.yaml b/upstreamed/suitecrm/templates/deployment.yaml index 094ad6eb51..deea2f961f 100644 --- a/upstreamed/suitecrm/templates/deployment.yaml +++ b/upstreamed/suitecrm/templates/deployment.yaml @@ -131,7 +131,7 @@ spec: subPath: apache {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "suitecrm.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} command: [ '/bin/apache_exporter', '-scrape_uri', 'http://status.localhost:80/server-status/?auto'] ports: diff --git a/upstreamed/testlink/Chart.yaml b/upstreamed/testlink/Chart.yaml index 0177082646..2ce287407b 100644 --- a/upstreamed/testlink/Chart.yaml +++ b/upstreamed/testlink/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: testlink -version: 4.1.0 +version: 4.2.0 appVersion: 1.9.19 description: Web-based test management system that facilitates software quality assurance. icon: https://bitnami.com/assets/stacks/testlink/img/testlink-stack-220x234.png diff --git a/upstreamed/testlink/templates/_helpers.tpl b/upstreamed/testlink/templates/_helpers.tpl index 83589f665b..d2ebf73456 100644 --- a/upstreamed/testlink/templates/_helpers.tpl +++ b/upstreamed/testlink/templates/_helpers.tpl @@ -56,11 +56,24 @@ Also, we can't use a single if because lazy evaluation is not an option {{/* Return the proper image name (for the metrics image) */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "testlink.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/testlink/templates/deployment.yaml b/upstreamed/testlink/templates/deployment.yaml index 261970e0b9..b5c085ba61 100644 --- a/upstreamed/testlink/templates/deployment.yaml +++ b/upstreamed/testlink/templates/deployment.yaml @@ -134,7 +134,7 @@ spec: mountPath: /bitnami/apache {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "testlink.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} command: [ '/bin/apache_exporter', '-scrape_uri', 'http://status.localhost:80/server-status/?auto'] ports: diff --git a/upstreamed/wordpress/Chart.yaml b/upstreamed/wordpress/Chart.yaml index 13d771f0a3..3abd8953cc 100644 --- a/upstreamed/wordpress/Chart.yaml +++ b/upstreamed/wordpress/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: wordpress -version: 5.6.1 +version: 5.7.0 appVersion: 5.1.1 description: Web publishing platform for building blogs and websites. icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png diff --git a/upstreamed/wordpress/templates/_helpers.tpl b/upstreamed/wordpress/templates/_helpers.tpl index 4ac220d262..fe4bd97a29 100644 --- a/upstreamed/wordpress/templates/_helpers.tpl +++ b/upstreamed/wordpress/templates/_helpers.tpl @@ -63,11 +63,24 @@ Create chart name and version as used by the chart label. {{/* Return the proper image name (for the metrics image) */}} -{{- define "metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} +{{- define "wordpress.metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} {{- $repositoryName := .Values.metrics.image.repository -}} {{- $tag := .Values.metrics.image.tag | toString -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} {{- end -}} {{/* diff --git a/upstreamed/wordpress/templates/deployment.yaml b/upstreamed/wordpress/templates/deployment.yaml index 8ba0c32ee5..bdf7cac14f 100644 --- a/upstreamed/wordpress/templates/deployment.yaml +++ b/upstreamed/wordpress/templates/deployment.yaml @@ -177,7 +177,7 @@ spec: {{ toYaml .Values.resources | indent 10 }} {{- if .Values.metrics.enabled }} - name: metrics - image: {{ template "metrics.image" . }} + image: {{ template "wordpress.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} command: [ '/bin/apache_exporter', '-scrape_uri', 'http://status.localhost:80/server-status/?auto'] ports: