From 9f9f1c381ff895a2d49cbba196fc83e45e41da37 Mon Sep 17 00:00:00 2001 From: Iain Sproat <68657+iainsproat@users.noreply.github.com> Date: Fri, 9 Sep 2022 11:10:46 +0100 Subject: [PATCH] Only create configmap for DB certificate if certificate is provided in helm chart (#999) - otherwise, we should expect the configmap to already be in the namespace --- .../helm/speckle-server/templates/configmap-db-certificate.yml | 2 +- utils/helm/speckle-server/values.yaml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/utils/helm/speckle-server/templates/configmap-db-certificate.yml b/utils/helm/speckle-server/templates/configmap-db-certificate.yml index 2ab13eaea..a522aaf6a 100644 --- a/utils/helm/speckle-server/templates/configmap-db-certificate.yml +++ b/utils/helm/speckle-server/templates/configmap-db-certificate.yml @@ -1,4 +1,4 @@ -{{ if .Values.db.useCertificate }} +{{ if ( and .Values.db.useCertificate .Values.db.certificate ) }} apiVersion: v1 kind: ConfigMap diff --git a/utils/helm/speckle-server/values.yaml b/utils/helm/speckle-server/values.yaml index 14ca85382..59fdf4c77 100644 --- a/utils/helm/speckle-server/values.yaml +++ b/utils/helm/speckle-server/values.yaml @@ -117,8 +117,7 @@ db: ## @param db.maxConnectionsServer The number of connections to the Postgres database to provide in the connection pool ## maxConnectionsServer: 4 - ## @param db.certificate The x509 public certificate for SSL connections to the Postgres database - ## Use of this certificate requires db.useCertificate to be enabled and an appropriate value for db.PGSSLMODE provided. + ## @param db.certificate The x509 public certificate for SSL connections to the Postgres database. Use of this certificate requires db.useCertificate to be enabled and an appropriate value for db.PGSSLMODE provided. ## The value must be formatted as a multi-line string. We recommend using the pipe-symbol and taking care to ## indent all lines of the value correctly. ## ref: https://helm.sh/docs/chart_template_guide/yaml_techniques/#strings-in-yaml