diff --git a/Chart.lock b/Chart.lock index 1ae1dd2..b65da54 100644 --- a/Chart.lock +++ b/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: postgresql repository: https://charts.bitnami.com/bitnami - version: 11.6.17 + version: 11.7.2 - name: redis repository: https://charts.bitnami.com/bitnami - version: 17.0.2 -digest: sha256:48a640246413abb68ab975288b8b60e30b1555852a4b6dbbe22e900dc25c8ab5 -generated: "2022-07-19T20:55:16.152996462-04:00" + version: 17.0.11 +digest: sha256:9f48089bf27f97be3c626a50ba70cd089f42e8b3f0c04a5d529752379b2cbc5b +generated: "2022-08-17T15:47:13.072704997-04:00" diff --git a/Chart.yaml b/Chart.yaml index 2962e72..b0ac7ce 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -22,10 +22,10 @@ appVersion: 1.0.0 dependencies: - name: postgresql - version: ~11.6.17 + version: ~11.7.2 repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: redis - version: ~17.0.2 + version: ~17.0.11 repository: https://charts.bitnami.com/bitnami condition: redis.enabled diff --git a/charts/postgresql-11.6.17.tgz b/charts/postgresql-11.6.17.tgz deleted file mode 100644 index 7264175..0000000 Binary files a/charts/postgresql-11.6.17.tgz and /dev/null differ diff --git a/charts/postgresql-11.7.2.tgz b/charts/postgresql-11.7.2.tgz new file mode 100644 index 0000000..86f451a Binary files /dev/null and b/charts/postgresql-11.7.2.tgz differ diff --git a/charts/redis-17.0.11.tgz b/charts/redis-17.0.11.tgz new file mode 100644 index 0000000..7012ccd Binary files /dev/null and b/charts/redis-17.0.11.tgz differ diff --git a/charts/redis-17.0.2.tgz b/charts/redis-17.0.2.tgz deleted file mode 100644 index 45394a3..0000000 Binary files a/charts/redis-17.0.2.tgz and /dev/null differ diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 34ed73c..a84dda8 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -72,7 +72,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{- else -}} {{- $name := default .Chart.Name .Values.postgresql.nameOverride -}} {{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}}-postgresql {{- else -}} {{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" -}} {{- end -}} diff --git a/templates/web/deployment.yaml b/templates/web/deployment.yaml index eb6f45b..43b0479 100644 --- a/templates/web/deployment.yaml +++ b/templates/web/deployment.yaml @@ -68,7 +68,7 @@ spec: - name: DATABASE_PASSWORD valueFrom: secretKeyRef: - name: {{ include "django.postgresql.fullname" . }} + name: {{ default (include "django.postgresql.fullname" .) .Values.postgresql.auth.existingSecret }} key: postgres-password {{- end }} envFrom: diff --git a/values.yaml b/values.yaml index db14851..51cc6f2 100644 --- a/values.yaml +++ b/values.yaml @@ -127,4 +127,5 @@ redis: # Default to disabled, use a managed database service. But can be enabled here. postgresql: enabled: false - postgresqlPassword: # Must be set + #auth: + # postgresqlPassword: # Must be set