diff --git a/Chart.lock b/Chart.lock index ce4e88d..fd607c9 100644 --- a/Chart.lock +++ b/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: postgresql repository: https://charts.bitnami.com/bitnami - version: 10.3.17 + version: 10.4.8 - name: redis repository: https://charts.bitnami.com/bitnami - version: 13.0.1 -digest: sha256:ef9c8ed96cc70ed6d6c6fc0e83a166e46ce1a8c29fe03b6164b361e78782cb46 -generated: "2021-04-16T16:13:30.720115202-04:00" + version: 14.2.1 +digest: sha256:400dc8c7d3450f4f2cb2e7be70688092634a00c177771988bd03c0ec13d290d8 +generated: "2021-05-27T11:09:15.228491774-04:00" diff --git a/Chart.yaml b/Chart.yaml index bd485f0..f4ef842 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -22,10 +22,10 @@ appVersion: 1.0.0 dependencies: - name: postgresql - version: 10.3.17 + version: ~10.4.8 repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: redis - version: 13.0.1 + version: ~14.2.1 repository: https://charts.bitnami.com/bitnami condition: redis.enabled diff --git a/charts/postgresql-10.3.17.tgz b/charts/postgresql-10.3.17.tgz deleted file mode 100644 index 2f71763..0000000 Binary files a/charts/postgresql-10.3.17.tgz and /dev/null differ diff --git a/charts/postgresql-10.4.8.tgz b/charts/postgresql-10.4.8.tgz new file mode 100644 index 0000000..3b4c421 Binary files /dev/null and b/charts/postgresql-10.4.8.tgz differ diff --git a/charts/redis-13.0.1.tgz b/charts/redis-13.0.1.tgz deleted file mode 100644 index 7b7267d..0000000 Binary files a/charts/redis-13.0.1.tgz and /dev/null differ diff --git a/charts/redis-14.2.1.tgz b/charts/redis-14.2.1.tgz new file mode 100644 index 0000000..3f287f5 Binary files /dev/null and b/charts/redis-14.2.1.tgz differ diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 8bb6d7c..9c466b7 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -78,15 +78,16 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{- end -}} {{- end -}} {{- end -}} + {{- define "django.redis.fullname" -}} {{- if .Values.redis.fullnameOverride -}} {{- .Values.redis.fullnameOverride | trunc 63 | trimSuffix "-" -}} {{- else -}} -{{- $name := default .Chart.Name .Values.redis.nameOverride -}} +{{- $name := default .Chart.Name -}} {{- if contains $name .Release.Name -}} {{- .Release.Name | trunc 63 | trimSuffix "-" -}} {{- else -}} -{{- printf "%s-%s" .Release.Name "django-redis" | trunc 63 | trimSuffix "-" -}} +{{- printf "%s-%s" .Release.Name "redis-master" | trunc 63 | trimSuffix "-" -}} {{- end -}} {{- end -}} {{- end -}} @@ -116,7 +117,7 @@ Set redis url */}} {{- define "django.redis.url" -}} {{- if .Values.redis.enabled -}} -redis://:{{ .Values.redis.password }}@{{- template "django.redis.fullname" . -}}-redis-master:{{- template "django.redis.port" . -}}/0 +redis://:{{ .Values.redis.auth.password }}@{{- template "django.redis.fullname" . -}}:{{- template "django.redis.port" . -}}/0 {{- end -}} {{- end -}} diff --git a/values.yaml b/values.yaml index cd449b2..dc72eff 100644 --- a/values.yaml +++ b/values.yaml @@ -107,12 +107,10 @@ redis: master: persistence: enabled: false - slave: + replica: + replicaCount: 1 persistence: enabled: false - cluster: - enabled: false - slaveCount: 1 # Default to disabled, use a managed database service. But can be enabled here. postgresql: