From 12cd5352c05f01534e0a2294613fdace79eb323d Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Fri, 15 Oct 2021 18:38:21 +0200 Subject: [PATCH] chore(common): add varlog storage and streamline db urls again --- charts/library/common/Chart.yaml | 2 +- .../lib/dependencies/_postgresInjector.tpl | 4 +++- charts/library/common/values.yaml | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml index 0fd8a0f6b7b..405b9270c41 100644 --- a/charts/library/common/Chart.yaml +++ b/charts/library/common/Chart.yaml @@ -15,4 +15,4 @@ maintainers: name: common sources: null type: library -version: 8.3.8 +version: 8.3.9 diff --git a/charts/library/common/templates/lib/dependencies/_postgresInjector.tpl b/charts/library/common/templates/lib/dependencies/_postgresInjector.tpl index 171d6ae62e6..c7467c6dba4 100644 --- a/charts/library/common/templates/lib/dependencies/_postgresInjector.tpl +++ b/charts/library/common/templates/lib/dependencies/_postgresInjector.tpl @@ -27,11 +27,13 @@ data: urlnossl: {{ ( printf "postgresql://%v:%v@%v-postgresql:5432/%v?sslmode=disable" .Values.postgresql.postgresqlUsername $dbPass .Release.Name .Values.postgresql.postgresqlDatabase ) | b64enc | quote }} plainporthost: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }} plainhost: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }} - jdbc: {{ ( printf "postgresql://%v-postgresql:5432/%v" .Release.Name .Values.postgresql.postgresqlDatabase ) | b64enc | quote }} + jdbc: {{ ( printf "jdbc:postgresql://%v-postgresql:5432/%v" .Release.Name .Values.postgresql.postgresqlDatabase ) | b64enc | quote }} type: Opaque {{- $_ := set .Values.postgresql "postgresqlPassword" ( $dbPass | quote ) }} {{- $_ := set .Values.postgresql.url "plain" ( ( printf "%v-%v" .Release.Name "postgresql" ) | quote ) }} +{{- $_ := set .Values.postgresql.url "plainhost" ( ( printf "%v-%v" .Release.Name "postgresql" ) | quote ) }} {{- $_ := set .Values.postgresql.url "plainport" ( ( printf "%v-%v:5432" .Release.Name "postgresql" ) | quote ) }} +{{- $_ := set .Values.postgresql.url "plainporthost" ( ( printf "%v-%v:5432" .Release.Name "postgresql" ) | quote ) }} {{- $_ := set .Values.postgresql.url "complete" ( ( printf "postgresql://%v:%v@%v-postgresql:5432/%v" .Values.postgresql.postgresqlUsername $dbPass .Release.Name .Values.postgresql.postgresqlDatabase ) | quote ) }} {{- $_ := set .Values.postgresql.url "jdbc" ( ( printf "jdbc:postgresql://%v-postgresql:5432/%v" .Release.Name .Values.postgresql.postgresqlDatabase ) | quote ) }} diff --git a/charts/library/common/values.yaml b/charts/library/common/values.yaml index e1f6dbc7230..94f592ffe09 100644 --- a/charts/library/common/values.yaml +++ b/charts/library/common/values.yaml @@ -619,6 +619,22 @@ persistence: # specify a size for memory backed volumes. sizeLimit: # 1Gi + # -- Create an emptyDir volume to share between all containers + # [[ref]]https://kubernetes.io/docs/concepts/storage/volumes/#emptydir) + # @default -- See below + varlogs: + enabled: true + type: emptyDir + mountPath: /var/logs + + # -- Set the medium to "Memory" to mount a tmpfs (RAM-backed filesystem) instead + # of the storage medium that backs the node. + medium: # Memory + + # -- If the `SizeMemoryBackedVolumes` feature gate is enabled, you can + # specify a size for memory backed volumes. + sizeLimit: # 1Gi + # -- Create an emptyDir volume to share between all containers for temporary storage # @default -- See below temp: