From f652f16596ca794fd91ccfea3d4ba59a5ef5e72c Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Mon, 11 Jul 2016 20:22:43 +0530 Subject: [PATCH] use the `default` sprig function to set default values --- drupal/charts/mariadb/templates/mariadb-rc.yaml | 4 ++-- .../charts/mariadb/templates/mariadb-secrets.yaml | 4 ++-- drupal/templates/drupal-rc.yaml | 4 ++-- drupal/templates/drupal-secrets.yaml | 2 +- ghost/templates/ghost-rc.yaml | 14 +++++++------- ghost/templates/ghost-secrets.yaml | 4 ++-- joomla/charts/mariadb/templates/mariadb-rc.yaml | 4 ++-- .../charts/mariadb/templates/mariadb-secrets.yaml | 4 ++-- joomla/templates/joomla-rc.yaml | 12 ++++++------ joomla/templates/joomla-secrets.yaml | 4 ++-- mariadb-cluster/templates/mariadb-master-rc.yaml | 6 +++--- mariadb-cluster/templates/mariadb-secrets.yaml | 6 +++--- mariadb-cluster/templates/mariadb-slave-rc.yaml | 8 ++++---- mariadb/templates/mariadb-rc.yaml | 4 ++-- mariadb/templates/mariadb-secrets.yaml | 4 ++-- mediawiki/charts/mariadb/templates/mariadb-rc.yaml | 4 ++-- .../charts/mariadb/templates/mariadb-secrets.yaml | 4 ++-- mediawiki/templates/mediawiki-rc.yaml | 14 +++++++------- mediawiki/templates/mediawiki-secrets.yaml | 4 ++-- memcached/templates/memcached-rc.yaml | 2 +- memcached/templates/memcached-secrets.yaml | 2 +- mongodb/templates/mongodb-rc.yaml | 4 ++-- mongodb/templates/mongodb-secrets.yaml | 4 ++-- phpbb/charts/mariadb/templates/mariadb-rc.yaml | 4 ++-- .../charts/mariadb/templates/mariadb-secrets.yaml | 4 ++-- phpbb/templates/phpbb-rc.yaml | 12 ++++++------ phpbb/templates/phpbb-secrets.yaml | 4 ++-- postgresql/templates/postgresql-rc.yaml | 4 ++-- postgresql/templates/postgresql-secrets.yaml | 2 +- rabbitmq/templates/rabbitmq-rc.yaml | 14 +++++++------- redis/templates/redis-secrets.yaml | 2 +- redmine/charts/mariadb/templates/mariadb-rc.yaml | 4 ++-- .../charts/mariadb/templates/mariadb-secrets.yaml | 4 ++-- redmine/templates/redmine-rc.yaml | 14 +++++++------- redmine/templates/redmine-secrets.yaml | 4 ++-- testlink/charts/mariadb/templates/mariadb-rc.yaml | 4 ++-- .../charts/mariadb/templates/mariadb-secrets.yaml | 4 ++-- tomcat/templates/tomcat-rc.yaml | 2 +- tomcat/templates/tomcat-secrets.yaml | 2 +- wildfly/templates/wildfly-rc.yaml | 2 +- wildfly/templates/wildfly-secrets.yaml | 2 +- 41 files changed, 105 insertions(+), 105 deletions(-) diff --git a/drupal/charts/mariadb/templates/mariadb-rc.yaml b/drupal/charts/mariadb/templates/mariadb-rc.yaml index 1334a9ae1..f1d96c1dc 100644 --- a/drupal/charts/mariadb/templates/mariadb-rc.yaml +++ b/drupal/charts/mariadb/templates/mariadb-rc.yaml @@ -30,14 +30,14 @@ spec: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-root-password - name: MARIADB_USER - value: {{ .Values.mariadbUser | quote }} + value: {{ default "" .Values.mariadbUser | quote }} - name: MARIADB_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-password - name: MARIADB_DATABASE - value: {{ .Values.mariadbDatabase | quote }} + value: {{ default "" .Values.mariadbDatabase | quote }} ports: - name: mysql containerPort: 3306 diff --git a/drupal/charts/mariadb/templates/mariadb-secrets.yaml b/drupal/charts/mariadb/templates/mariadb-secrets.yaml index 33e6e8784..725dc3c8a 100644 --- a/drupal/charts/mariadb/templates/mariadb-secrets.yaml +++ b/drupal/charts/mariadb/templates/mariadb-secrets.yaml @@ -8,5 +8,5 @@ metadata: heritage: bitnami type: Opaque data: - mariadb-root-password: {{ .Values.mariadbRootPassword | quote | b64enc | quote }} - mariadb-password: {{ .Values.mariadbPassword | quote | b64enc | quote }} + mariadb-root-password: {{ default "" .Values.mariadbRootPassword | b64enc | quote }} + mariadb-password: {{ default "" .Values.mariadbPassword | b64enc | quote }} diff --git a/drupal/templates/drupal-rc.yaml b/drupal/templates/drupal-rc.yaml index d6cef3681..90920a9bd 100644 --- a/drupal/templates/drupal-rc.yaml +++ b/drupal/templates/drupal-rc.yaml @@ -37,14 +37,14 @@ spec: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-root-password - name: DRUPAL_USERNAME - value: {{ .Values.drupalUser | quote }} + value: {{ default "" .Values.drupalUser | quote }} - name: DRUPAL_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "drupal" | trunc 24 }} key: drupal-password - name: DRUPAL_EMAIL - value: {{ .Values.drupalEmail | quote }} + value: {{ default "" .Values.drupalEmail | quote }} ports: - name: http containerPort: 80 diff --git a/drupal/templates/drupal-secrets.yaml b/drupal/templates/drupal-secrets.yaml index e67390931..b5cf24003 100644 --- a/drupal/templates/drupal-secrets.yaml +++ b/drupal/templates/drupal-secrets.yaml @@ -8,4 +8,4 @@ metadata: heritage: bitnami type: Opaque data: - drupal-password: {{ .Values.drupalPassword | quote | b64enc | quote }} + drupal-password: {{ default "" .Values.drupalPassword | b64enc | quote }} diff --git a/ghost/templates/ghost-rc.yaml b/ghost/templates/ghost-rc.yaml index 18561c6d6..8f7681f49 100644 --- a/ghost/templates/ghost-rc.yaml +++ b/ghost/templates/ghost-rc.yaml @@ -28,29 +28,29 @@ spec: image: bitnami/ghost:{{ .Values.imageTag }} env: - name: GHOST_USERNAME - value: {{ .Values.ghostUser | quote }} + value: {{ default "" .Values.ghostUser | quote }} - name: GHOST_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "ghost" | trunc 24 }} key: ghost-password - name: GHOST_EMAIL - value: {{ .Values.ghostEmail | quote }} + value: {{ default "" .Values.ghostEmail | quote }} - name: BLOG_TITLE - value: {{ .Values.blogTitle | quote }} + value: {{ default "" .Values.blogTitle | quote }} - name: SMTP_HOST - value: {{ .Values.smtpHost | quote }} + value: {{ default "" .Values.smtpHost | quote }} - name: SMTP_PORT - value: {{ .Values.smtpPort | quote }} + value: {{ default "" .Values.smtpPort | quote }} - name: SMTP_USER - value: {{ .Values.smtpUser | quote }} + value: {{ default "" .Values.smtpUser | quote }} - name: SMTP_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "ghost" | trunc 24 }} key: smtp-password - name: SMTP_SERVICE - value: {{ .Values.smtpService | quote }} + value: {{ default "" .Values.smtpService | quote }} ports: - name: http containerPort: 2368 diff --git a/ghost/templates/ghost-secrets.yaml b/ghost/templates/ghost-secrets.yaml index a19c2299b..5e0c19eca 100644 --- a/ghost/templates/ghost-secrets.yaml +++ b/ghost/templates/ghost-secrets.yaml @@ -8,5 +8,5 @@ metadata: heritage: bitnami type: Opaque data: - ghost-password: {{ .Values.ghostPassword | quote | b64enc | quote }} - smtp-password: {{ .Values.smtpPassword | quote | b64enc | quote }} + ghost-password: {{ default "" .Values.ghostPassword | b64enc | quote }} + smtp-password: {{ default "" .Values.smtpPassword | b64enc | quote }} diff --git a/joomla/charts/mariadb/templates/mariadb-rc.yaml b/joomla/charts/mariadb/templates/mariadb-rc.yaml index 1334a9ae1..f1d96c1dc 100644 --- a/joomla/charts/mariadb/templates/mariadb-rc.yaml +++ b/joomla/charts/mariadb/templates/mariadb-rc.yaml @@ -30,14 +30,14 @@ spec: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-root-password - name: MARIADB_USER - value: {{ .Values.mariadbUser | quote }} + value: {{ default "" .Values.mariadbUser | quote }} - name: MARIADB_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-password - name: MARIADB_DATABASE - value: {{ .Values.mariadbDatabase | quote }} + value: {{ default "" .Values.mariadbDatabase | quote }} ports: - name: mysql containerPort: 3306 diff --git a/joomla/charts/mariadb/templates/mariadb-secrets.yaml b/joomla/charts/mariadb/templates/mariadb-secrets.yaml index 33e6e8784..725dc3c8a 100644 --- a/joomla/charts/mariadb/templates/mariadb-secrets.yaml +++ b/joomla/charts/mariadb/templates/mariadb-secrets.yaml @@ -8,5 +8,5 @@ metadata: heritage: bitnami type: Opaque data: - mariadb-root-password: {{ .Values.mariadbRootPassword | quote | b64enc | quote }} - mariadb-password: {{ .Values.mariadbPassword | quote | b64enc | quote }} + mariadb-root-password: {{ default "" .Values.mariadbRootPassword | b64enc | quote }} + mariadb-password: {{ default "" .Values.mariadbPassword | b64enc | quote }} diff --git a/joomla/templates/joomla-rc.yaml b/joomla/templates/joomla-rc.yaml index 3da8cc33a..a4895eea7 100644 --- a/joomla/templates/joomla-rc.yaml +++ b/joomla/templates/joomla-rc.yaml @@ -37,27 +37,27 @@ spec: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-root-password - name: JOOMLA_USERNAME - value: {{ .Values.joomlaUser | quote }} + value: {{ default "" .Values.joomlaUser | quote }} - name: JOOMLA_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "joomla" | trunc 24 }} key: joomla-password - name: JOOMLA_EMAIL - value: {{ .Values.joomlaEmail | quote }} + value: {{ default "" .Values.joomlaEmail | quote }} - name: SMTP_HOST - value: {{ .Values.smtpHost | quote }} + value: {{ default "" .Values.smtpHost | quote }} - name: SMTP_PORT - value: {{ .Values.smtpPort | quote }} + value: {{ default "" .Values.smtpPort | quote }} - name: SMTP_USER - value: {{ .Values.smtpUser | quote }} + value: {{ default "" .Values.smtpUser | quote }} - name: SMTP_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "joomla" | trunc 24 }} key: smtp-password - name: SMTP_PROTOCOL - value: {{ .Values.smtpProtocol | quote }} + value: {{ default "" .Values.smtpProtocol | quote }} ports: - name: http containerPort: 80 diff --git a/joomla/templates/joomla-secrets.yaml b/joomla/templates/joomla-secrets.yaml index 1831e1109..a00c0dbfb 100644 --- a/joomla/templates/joomla-secrets.yaml +++ b/joomla/templates/joomla-secrets.yaml @@ -8,5 +8,5 @@ metadata: heritage: bitnami type: Opaque data: - joomla-password: {{ .Values.joomlaPassword | quote | b64enc | quote }} - smtp-password: {{ .Values.smtpPassword | quote | b64enc | quote }} + joomla-password: {{ default "" .Values.joomlaPassword | b64enc | quote }} + smtp-password: {{ default "" .Values.smtpPassword | b64enc | quote }} diff --git a/mariadb-cluster/templates/mariadb-master-rc.yaml b/mariadb-cluster/templates/mariadb-master-rc.yaml index 86ed994c4..a373407e0 100644 --- a/mariadb-cluster/templates/mariadb-master-rc.yaml +++ b/mariadb-cluster/templates/mariadb-master-rc.yaml @@ -33,18 +33,18 @@ spec: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-root-password - name: MARIADB_USER - value: {{ .Values.mariadbUser | quote }} + value: {{ default "" .Values.mariadbUser | quote }} - name: MARIADB_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-password - name: MARIADB_DATABASE - value: {{ .Values.mariadbDatabase | quote }} + value: {{ default "" .Values.mariadbDatabase | quote }} - name: MARIADB_REPLICATION_MODE value: "master" - name: MARIADB_REPLICATION_USER - value: {{ .Values.mariadbReplicationUser | quote }} + value: {{ default "" .Values.mariadbReplicationUser | quote }} - name: MARIADB_REPLICATION_PASSWORD valueFrom: secretKeyRef: diff --git a/mariadb-cluster/templates/mariadb-secrets.yaml b/mariadb-cluster/templates/mariadb-secrets.yaml index ded86fd44..5852a3e9d 100644 --- a/mariadb-cluster/templates/mariadb-secrets.yaml +++ b/mariadb-cluster/templates/mariadb-secrets.yaml @@ -8,6 +8,6 @@ metadata: heritage: bitnami type: Opaque data: - mariadb-root-password: {{ .Values.mariadbRootPassword | quote | b64enc | quote }} - mariadb-password: {{ .Values.mariadbPassword | quote | b64enc | quote }} - mariadb-replication-password: {{ .Values.mariadbReplicationPassword | quote | b64enc | quote }} + mariadb-root-password: {{ default "" .Values.mariadbRootPassword | b64enc | quote }} + mariadb-password: {{ default "" .Values.mariadbPassword | b64enc | quote }} + mariadb-replication-password: {{ default "" .Values.mariadbReplicationPassword | b64enc | quote }} diff --git a/mariadb-cluster/templates/mariadb-slave-rc.yaml b/mariadb-cluster/templates/mariadb-slave-rc.yaml index 5ead627e9..e2dae05c8 100644 --- a/mariadb-cluster/templates/mariadb-slave-rc.yaml +++ b/mariadb-cluster/templates/mariadb-slave-rc.yaml @@ -32,14 +32,14 @@ spec: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-root-password - name: MARIADB_USER - value: {{ .Values.mariadbUser | quote }} + value: {{ default "" .Values.mariadbUser | quote }} - name: MARIADB_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-password - name: MARIADB_DATABASE - value: {{ .Values.mariadbDatabase | quote }} + value: {{ default "" .Values.mariadbDatabase | quote }} - name: MARIADB_REPLICATION_MODE value: "slave" - name: MARIADB_MASTER_HOST @@ -47,14 +47,14 @@ spec: - name: MARIADB_MASTER_PORT value: "3306" - name: MARIADB_MASTER_USER - value: {{ .Values.mariadbUser | quote }} + value: {{ default "" .Values.mariadbUser | quote }} - name: MARIADB_MASTER_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-password - name: MARIADB_REPLICATION_USER - value: {{ .Values.mariadbReplicationUser | quote }} + value: {{ default "" .Values.mariadbReplicationUser | quote }} - name: MARIADB_REPLICATION_PASSWORD valueFrom: secretKeyRef: diff --git a/mariadb/templates/mariadb-rc.yaml b/mariadb/templates/mariadb-rc.yaml index 1334a9ae1..f1d96c1dc 100644 --- a/mariadb/templates/mariadb-rc.yaml +++ b/mariadb/templates/mariadb-rc.yaml @@ -30,14 +30,14 @@ spec: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-root-password - name: MARIADB_USER - value: {{ .Values.mariadbUser | quote }} + value: {{ default "" .Values.mariadbUser | quote }} - name: MARIADB_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-password - name: MARIADB_DATABASE - value: {{ .Values.mariadbDatabase | quote }} + value: {{ default "" .Values.mariadbDatabase | quote }} ports: - name: mysql containerPort: 3306 diff --git a/mariadb/templates/mariadb-secrets.yaml b/mariadb/templates/mariadb-secrets.yaml index 33e6e8784..725dc3c8a 100644 --- a/mariadb/templates/mariadb-secrets.yaml +++ b/mariadb/templates/mariadb-secrets.yaml @@ -8,5 +8,5 @@ metadata: heritage: bitnami type: Opaque data: - mariadb-root-password: {{ .Values.mariadbRootPassword | quote | b64enc | quote }} - mariadb-password: {{ .Values.mariadbPassword | quote | b64enc | quote }} + mariadb-root-password: {{ default "" .Values.mariadbRootPassword | b64enc | quote }} + mariadb-password: {{ default "" .Values.mariadbPassword | b64enc | quote }} diff --git a/mediawiki/charts/mariadb/templates/mariadb-rc.yaml b/mediawiki/charts/mariadb/templates/mariadb-rc.yaml index 1334a9ae1..f1d96c1dc 100644 --- a/mediawiki/charts/mariadb/templates/mariadb-rc.yaml +++ b/mediawiki/charts/mariadb/templates/mariadb-rc.yaml @@ -30,14 +30,14 @@ spec: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-root-password - name: MARIADB_USER - value: {{ .Values.mariadbUser | quote }} + value: {{ default "" .Values.mariadbUser | quote }} - name: MARIADB_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-password - name: MARIADB_DATABASE - value: {{ .Values.mariadbDatabase | quote }} + value: {{ default "" .Values.mariadbDatabase | quote }} ports: - name: mysql containerPort: 3306 diff --git a/mediawiki/charts/mariadb/templates/mariadb-secrets.yaml b/mediawiki/charts/mariadb/templates/mariadb-secrets.yaml index 33e6e8784..725dc3c8a 100644 --- a/mediawiki/charts/mariadb/templates/mariadb-secrets.yaml +++ b/mediawiki/charts/mariadb/templates/mariadb-secrets.yaml @@ -8,5 +8,5 @@ metadata: heritage: bitnami type: Opaque data: - mariadb-root-password: {{ .Values.mariadbRootPassword | quote | b64enc | quote }} - mariadb-password: {{ .Values.mariadbPassword | quote | b64enc | quote }} + mariadb-root-password: {{ default "" .Values.mariadbRootPassword | b64enc | quote }} + mariadb-password: {{ default "" .Values.mariadbPassword | b64enc | quote }} diff --git a/mediawiki/templates/mediawiki-rc.yaml b/mediawiki/templates/mediawiki-rc.yaml index 4682a5b54..3e415a609 100644 --- a/mediawiki/templates/mediawiki-rc.yaml +++ b/mediawiki/templates/mediawiki-rc.yaml @@ -37,24 +37,24 @@ spec: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-root-password - name: MEDIAWIKI_USERNAME - value: {{ .Values.mediawikiUser | quote }} + value: {{ default "" .Values.mediawikiUser | quote }} - name: MEDIAWIKI_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "mediawiki" | trunc 24 }} key: mediawiki-password - name: MEDIAWIKI_EMAIL - value: {{ .Values.mediawikiEmail | quote }} + value: {{ default "" .Values.mediawikiEmail | quote }} - name: MEDIAWIKI_WIKI_NAME - value: {{ .Values.mediawikiName | quote }} + value: {{ default "" .Values.mediawikiName | quote }} - name: SMTP_HOST_ID - value: {{ .Values.smtpHostID | quote }} + value: {{ default "" .Values.smtpHostID | quote }} - name: SMTP_HOST - value: {{ .Values.smtpHost | quote }} + value: {{ default "" .Values.smtpHost | quote }} - name: SMTP_PORT - value: {{ .Values.smtpPort | quote }} + value: {{ default "" .Values.smtpPort | quote }} - name: SMTP_USER - value: {{ .Values.smtpUser | quote }} + value: {{ default "" .Values.smtpUser | quote }} - name: SMTP_Password valueFrom: secretKeyRef: diff --git a/mediawiki/templates/mediawiki-secrets.yaml b/mediawiki/templates/mediawiki-secrets.yaml index faf6a6c22..19e82da14 100644 --- a/mediawiki/templates/mediawiki-secrets.yaml +++ b/mediawiki/templates/mediawiki-secrets.yaml @@ -8,5 +8,5 @@ metadata: heritage: bitnami type: Opaque data: - mediawiki-password: {{ .Values.mediawikiPassword | quote | b64enc | quote }} - smtp-password: {{ .Values.smtpPassword | quote | b64enc | quote }} + mediawiki-password: {{ default "" .Values.mediawikiPassword | b64enc | quote }} + smtp-password: {{ default "" .Values.smtpPassword | b64enc | quote }} diff --git a/memcached/templates/memcached-rc.yaml b/memcached/templates/memcached-rc.yaml index 008705b41..e8184933f 100644 --- a/memcached/templates/memcached-rc.yaml +++ b/memcached/templates/memcached-rc.yaml @@ -25,7 +25,7 @@ spec: image: bitnami/memcached:{{ .Values.imageTag }} env: - name: MEMCACHED_USER - value: {{ .Values.memcachedUser | quote }} + value: {{ default "" .Values.memcachedUser | quote }} - name: MEMCACHED_PASSWORD valueFrom: secretKeyRef: diff --git a/memcached/templates/memcached-secrets.yaml b/memcached/templates/memcached-secrets.yaml index 8b3c584c5..a4119d654 100644 --- a/memcached/templates/memcached-secrets.yaml +++ b/memcached/templates/memcached-secrets.yaml @@ -8,4 +8,4 @@ metadata: heritage: bitnami type: Opaque data: - memcached-password: {{ .Values.memcachedPassword | quote | b64enc | quote }} + memcached-password: {{ default "" .Values.memcachedPassword | b64enc | quote }} diff --git a/mongodb/templates/mongodb-rc.yaml b/mongodb/templates/mongodb-rc.yaml index f2ee0c548..5dfcb0803 100644 --- a/mongodb/templates/mongodb-rc.yaml +++ b/mongodb/templates/mongodb-rc.yaml @@ -30,14 +30,14 @@ spec: name: {{ printf "%s-%s" .Release.Name "mongodb" | trunc 24 }} key: mongodb-root-password - name: MONGODB_USER - value: {{ .Values.mongodbUser | quote }} + value: {{ default "" .Values.mongodbUser | quote }} - name: MONGODB_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "mongodb" | trunc 24 }} key: mongodb-password - name: MONGODB_DATABASE - value: {{ .Values.mongodbDatabase | quote }} + value: {{ default "" .Values.mongodbDatabase | quote }} ports: - name: mongodb containerPort: 27017 diff --git a/mongodb/templates/mongodb-secrets.yaml b/mongodb/templates/mongodb-secrets.yaml index 8b6164fd0..68c724051 100644 --- a/mongodb/templates/mongodb-secrets.yaml +++ b/mongodb/templates/mongodb-secrets.yaml @@ -8,5 +8,5 @@ metadata: heritage: bitnami type: Opaque data: - mongodb-root-password: {{ .Values.mongodbRootPassword | quote | b64enc | quote }} - mongodb-password: {{ .Values.mongodbPassword | quote | b64enc | quote }} + mongodb-root-password: {{ default "" .Values.mongodbRootPassword | b64enc | quote }} + mongodb-password: {{ default "" .Values.mongodbPassword | b64enc | quote }} diff --git a/phpbb/charts/mariadb/templates/mariadb-rc.yaml b/phpbb/charts/mariadb/templates/mariadb-rc.yaml index 1334a9ae1..f1d96c1dc 100644 --- a/phpbb/charts/mariadb/templates/mariadb-rc.yaml +++ b/phpbb/charts/mariadb/templates/mariadb-rc.yaml @@ -30,14 +30,14 @@ spec: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-root-password - name: MARIADB_USER - value: {{ .Values.mariadbUser | quote }} + value: {{ default "" .Values.mariadbUser | quote }} - name: MARIADB_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-password - name: MARIADB_DATABASE - value: {{ .Values.mariadbDatabase | quote }} + value: {{ default "" .Values.mariadbDatabase | quote }} ports: - name: mysql containerPort: 3306 diff --git a/phpbb/charts/mariadb/templates/mariadb-secrets.yaml b/phpbb/charts/mariadb/templates/mariadb-secrets.yaml index 33e6e8784..725dc3c8a 100644 --- a/phpbb/charts/mariadb/templates/mariadb-secrets.yaml +++ b/phpbb/charts/mariadb/templates/mariadb-secrets.yaml @@ -8,5 +8,5 @@ metadata: heritage: bitnami type: Opaque data: - mariadb-root-password: {{ .Values.mariadbRootPassword | quote | b64enc | quote }} - mariadb-password: {{ .Values.mariadbPassword | quote | b64enc | quote }} + mariadb-root-password: {{ default "" .Values.mariadbRootPassword | b64enc | quote }} + mariadb-password: {{ default "" .Values.mariadbPassword | b64enc | quote }} diff --git a/phpbb/templates/phpbb-rc.yaml b/phpbb/templates/phpbb-rc.yaml index 0c7ffd1ba..ca6063503 100644 --- a/phpbb/templates/phpbb-rc.yaml +++ b/phpbb/templates/phpbb-rc.yaml @@ -37,27 +37,27 @@ spec: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-root-password - name: PHPBB_USERNAME - value: {{ .Values.phpbbUser | quote }} + value: {{ default "" .Values.phpbbUser | quote }} - name: PHPBB_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "phpbb" | trunc 24 }} key: phpbb-password - name: PHPBB_EMAIL - value: {{ .Values.phpbbEmail | quote }} + value: {{ default "" .Values.phpbbEmail | quote }} - name: SMTP_HOST - value: {{ .Values.smtpHost | quote }} + value: {{ default "" .Values.smtpHost | quote }} - name: SMTP_PORT - value: {{ .Values.smtpPort | quote }} + value: {{ default "" .Values.smtpPort | quote }} - name: SMTP_USER - value: {{ .Values.smtpUser | quote }} + value: {{ default "" .Values.smtpUser | quote }} - name: SMTP_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "phpbb" | trunc 24 }} key: smtp-password - name: SMTP_PROTOCOL - value: {{ .Values.smtpProtocol | quote }} + value: {{ default "" .Values.smtpProtocol | quote }} ports: - name: http containerPort: 80 diff --git a/phpbb/templates/phpbb-secrets.yaml b/phpbb/templates/phpbb-secrets.yaml index 62a249474..5a362b6af 100644 --- a/phpbb/templates/phpbb-secrets.yaml +++ b/phpbb/templates/phpbb-secrets.yaml @@ -8,5 +8,5 @@ metadata: heritage: bitnami type: Opaque data: - phpbb-password: {{ .Values.phpbbPassword | quote | b64enc | quote }} - smtp-password: {{ .Values.smtpPassword | quote | b64enc | quote }} + phpbb-password: {{ default "" .Values.phpbbPassword | b64enc | quote }} + smtp-password: {{ default "" .Values.smtpPassword | b64enc | quote }} diff --git a/postgresql/templates/postgresql-rc.yaml b/postgresql/templates/postgresql-rc.yaml index 3cff8db69..4f66415c9 100644 --- a/postgresql/templates/postgresql-rc.yaml +++ b/postgresql/templates/postgresql-rc.yaml @@ -25,14 +25,14 @@ spec: image: bitnami/postgresql:{{ .Values.imageTag }} env: - name: POSTGRES_USER - value: {{ .Values.postgresUser | quote }} + value: {{ default "" .Values.postgresUser | quote }} - name: POSTGRES_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "postgresql" | trunc 24 }} key: postgres-password - name: POSTGRES_DB - value: {{ .Values.postgresDb | quote }} + value: {{ default "" .Values.postgresDb | quote }} ports: - name: postgresql containerPort: 5432 diff --git a/postgresql/templates/postgresql-secrets.yaml b/postgresql/templates/postgresql-secrets.yaml index b8e4aa499..671eccbd0 100644 --- a/postgresql/templates/postgresql-secrets.yaml +++ b/postgresql/templates/postgresql-secrets.yaml @@ -8,4 +8,4 @@ metadata: heritage: bitnami type: Opaque data: - postgres-password: {{ .Values.postgresPassword | quote | b64enc | quote }} + postgres-password: {{ default "" .Values.postgresPassword | b64enc | quote }} diff --git a/rabbitmq/templates/rabbitmq-rc.yaml b/rabbitmq/templates/rabbitmq-rc.yaml index af329b428..1b2c3702e 100644 --- a/rabbitmq/templates/rabbitmq-rc.yaml +++ b/rabbitmq/templates/rabbitmq-rc.yaml @@ -25,7 +25,7 @@ spec: image: bitnami/rabbitmq:{{ .Values.imageTag }} env: - name: RABBITMQ_USERNAME - value: {{ .Values.rabbitmqUsername | quote }} + value: {{ default "" .Values.rabbitmqUsername | quote }} - name: RABBITMQ_PASSWORD valueFrom: secretKeyRef: @@ -37,17 +37,17 @@ spec: name: {{ printf "%s-%s" .Release.Name "rabbitmq" | trunc 24 }} key: rabbitmq-erlangcookie - name: RABBITMQ_NODEPORT - value: {{ .Values.rabbitmqNodeport | quote }} + value: {{ default "" .Values.rabbitmqNodeport | quote }} - name: RABBITMQ_NODETYPE - value: {{ .Values.rabbitmqNodetype | quote }} + value: {{ default "" .Values.rabbitmqNodetype | quote }} - name: RABBITMQ_NODENAME - value: {{ .Values.rabbitmqNodename | quote }} + value: {{ default "" .Values.rabbitmqNodename | quote }} - name: RABBITMQ_CLUSTERNODENAME - value: {{ .Values.rabbitmqClusternodename | quote }} + value: {{ default "" .Values.rabbitmqClusternodename | quote }} - name: RABBITMQ_VHOST - value: {{ .Values.rabbitmqVhost | quote }} + value: {{ default "" .Values.rabbitmqVhost | quote }} - name: RABBITMQ_MANAGERBINDIP - value: {{ .Values.rabbitmqManagerbindip | quote }} + value: {{ default "" .Values.rabbitmqManagerbindip | quote }} ports: - name: rabbitmq containerPort: 15672 diff --git a/redis/templates/redis-secrets.yaml b/redis/templates/redis-secrets.yaml index df026e44f..677dae193 100644 --- a/redis/templates/redis-secrets.yaml +++ b/redis/templates/redis-secrets.yaml @@ -8,4 +8,4 @@ metadata: heritage: bitnami type: Opaque data: - redis-password: {{ .Values.redisPassword | quote | b64enc | quote }} + redis-password: {{ default "" .Values.redisPassword | b64enc | quote }} diff --git a/redmine/charts/mariadb/templates/mariadb-rc.yaml b/redmine/charts/mariadb/templates/mariadb-rc.yaml index 1334a9ae1..f1d96c1dc 100644 --- a/redmine/charts/mariadb/templates/mariadb-rc.yaml +++ b/redmine/charts/mariadb/templates/mariadb-rc.yaml @@ -30,14 +30,14 @@ spec: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-root-password - name: MARIADB_USER - value: {{ .Values.mariadbUser | quote }} + value: {{ default "" .Values.mariadbUser | quote }} - name: MARIADB_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-password - name: MARIADB_DATABASE - value: {{ .Values.mariadbDatabase | quote }} + value: {{ default "" .Values.mariadbDatabase | quote }} ports: - name: mysql containerPort: 3306 diff --git a/redmine/charts/mariadb/templates/mariadb-secrets.yaml b/redmine/charts/mariadb/templates/mariadb-secrets.yaml index 33e6e8784..725dc3c8a 100644 --- a/redmine/charts/mariadb/templates/mariadb-secrets.yaml +++ b/redmine/charts/mariadb/templates/mariadb-secrets.yaml @@ -8,5 +8,5 @@ metadata: heritage: bitnami type: Opaque data: - mariadb-root-password: {{ .Values.mariadbRootPassword | quote | b64enc | quote }} - mariadb-password: {{ .Values.mariadbPassword | quote | b64enc | quote }} + mariadb-root-password: {{ default "" .Values.mariadbRootPassword | b64enc | quote }} + mariadb-password: {{ default "" .Values.mariadbPassword | b64enc | quote }} diff --git a/redmine/templates/redmine-rc.yaml b/redmine/templates/redmine-rc.yaml index ed7933cdc..f287f3c11 100644 --- a/redmine/templates/redmine-rc.yaml +++ b/redmine/templates/redmine-rc.yaml @@ -37,29 +37,29 @@ spec: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-root-password - name: REDMINE_USERNAME - value: {{ .Values.redmineUser | quote }} + value: {{ default "" .Values.redmineUser | quote }} - name: REDMINE_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "redmine" | trunc 24 }} key: redmine-password - name: REDMINE_EMAIL - value: {{ .Values.redmineEmail | quote }} + value: {{ default "" .Values.redmineEmail | quote }} - name: REDMINE_LANG - value: {{ .Values.redmineLanguage | quote }} + value: {{ default "" .Values.redmineLanguage | quote }} - name: SMTP_HOST - value: {{ .Values.smtpHost | quote }} + value: {{ default "" .Values.smtpHost | quote }} - name: SMTP_PORT - value: {{ .Values.smtpPort | quote }} + value: {{ default "" .Values.smtpPort | quote }} - name: SMTP_USER - value: {{ .Values.smtpUser | quote }} + value: {{ default "" .Values.smtpUser | quote }} - name: SMTP_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "redmine" | trunc 24 }} key: smtp-password - name: SMTP_TLS - value: {{ .Values.smtpTls | quote }} + value: {{ default "" .Values.smtpTls | quote }} ports: - name: http containerPort: 3000 diff --git a/redmine/templates/redmine-secrets.yaml b/redmine/templates/redmine-secrets.yaml index 249c28702..615191049 100644 --- a/redmine/templates/redmine-secrets.yaml +++ b/redmine/templates/redmine-secrets.yaml @@ -8,5 +8,5 @@ metadata: heritage: bitnami type: Opaque data: - redmine-password: {{ .Values.redminePassword | quote | b64enc | quote }} - smtp-password: {{ .Values.smtpPassword | quote | b64enc | quote }} + redmine-password: {{ default "" .Values.redminePassword | b64enc | quote }} + smtp-password: {{ default "" .Values.smtpPassword | b64enc | quote }} diff --git a/testlink/charts/mariadb/templates/mariadb-rc.yaml b/testlink/charts/mariadb/templates/mariadb-rc.yaml index 1334a9ae1..f1d96c1dc 100644 --- a/testlink/charts/mariadb/templates/mariadb-rc.yaml +++ b/testlink/charts/mariadb/templates/mariadb-rc.yaml @@ -30,14 +30,14 @@ spec: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-root-password - name: MARIADB_USER - value: {{ .Values.mariadbUser | quote }} + value: {{ default "" .Values.mariadbUser | quote }} - name: MARIADB_PASSWORD valueFrom: secretKeyRef: name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }} key: mariadb-password - name: MARIADB_DATABASE - value: {{ .Values.mariadbDatabase | quote }} + value: {{ default "" .Values.mariadbDatabase | quote }} ports: - name: mysql containerPort: 3306 diff --git a/testlink/charts/mariadb/templates/mariadb-secrets.yaml b/testlink/charts/mariadb/templates/mariadb-secrets.yaml index 33e6e8784..725dc3c8a 100644 --- a/testlink/charts/mariadb/templates/mariadb-secrets.yaml +++ b/testlink/charts/mariadb/templates/mariadb-secrets.yaml @@ -8,5 +8,5 @@ metadata: heritage: bitnami type: Opaque data: - mariadb-root-password: {{ .Values.mariadbRootPassword | quote | b64enc | quote }} - mariadb-password: {{ .Values.mariadbPassword | quote | b64enc | quote }} + mariadb-root-password: {{ default "" .Values.mariadbRootPassword | b64enc | quote }} + mariadb-password: {{ default "" .Values.mariadbPassword | b64enc | quote }} diff --git a/tomcat/templates/tomcat-rc.yaml b/tomcat/templates/tomcat-rc.yaml index 174415f91..cc3e63bb4 100644 --- a/tomcat/templates/tomcat-rc.yaml +++ b/tomcat/templates/tomcat-rc.yaml @@ -25,7 +25,7 @@ spec: image: bitnami/tomcat:{{ .Values.imageTag }} env: - name: TOMCAT_USER - value: {{ .Values.tomcatUser | quote }} + value: {{ default "" .Values.tomcatUser | quote }} - name: TOMCAT_PASSWORD valueFrom: secretKeyRef: diff --git a/tomcat/templates/tomcat-secrets.yaml b/tomcat/templates/tomcat-secrets.yaml index 91e68135d..e77a45340 100644 --- a/tomcat/templates/tomcat-secrets.yaml +++ b/tomcat/templates/tomcat-secrets.yaml @@ -8,4 +8,4 @@ metadata: heritage: bitnami type: Opaque data: - tomcat-password: {{ .Values.tomcatPassword | quote | b64enc | quote }} + tomcat-password: {{ default "" .Values.tomcatPassword | b64enc | quote }} diff --git a/wildfly/templates/wildfly-rc.yaml b/wildfly/templates/wildfly-rc.yaml index 2cb4eee9a..0a432e851 100644 --- a/wildfly/templates/wildfly-rc.yaml +++ b/wildfly/templates/wildfly-rc.yaml @@ -25,7 +25,7 @@ spec: image: bitnami/wildfly:{{ .Values.imageTag }} env: - name: WILDFLY_USER - value: {{ .Values.wildflyUser | quote }} + value: {{ default "" .Values.wildflyUser | quote }} - name: WILDFLY_PASSWORD valueFrom: secretKeyRef: diff --git a/wildfly/templates/wildfly-secrets.yaml b/wildfly/templates/wildfly-secrets.yaml index 753b097b1..2223e8be6 100644 --- a/wildfly/templates/wildfly-secrets.yaml +++ b/wildfly/templates/wildfly-secrets.yaml @@ -8,4 +8,4 @@ metadata: heritage: bitnami type: Opaque data: - wildfly-password: {{ .Values.wildflyPassword | quote | b64enc | quote }} + wildfly-password: {{ {{ default "" .Values.wildflyPassword | b64enc | quote }}