From 87a5180e0fb719eb0d391a58a8804d21f76576d0 Mon Sep 17 00:00:00 2001 From: William H Date: Mon, 4 Nov 2024 16:13:20 -0500 Subject: [PATCH 1/2] feat(ckan): Use ckan fullname for redis --- stable/ckan/Chart.yaml | 2 +- stable/ckan/templates/deploy/ckan.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stable/ckan/Chart.yaml b/stable/ckan/Chart.yaml index 17a733de..88bdf5f4 100644 --- a/stable/ckan/Chart.yaml +++ b/stable/ckan/Chart.yaml @@ -1,7 +1,7 @@ name: ckan apiVersion: v2 type: application -version: 0.0.29 +version: 0.0.30 appVersion: 2.9.5 description: CKAN Helm Chart for Kubernetes. keywords: diff --git a/stable/ckan/templates/deploy/ckan.yaml b/stable/ckan/templates/deploy/ckan.yaml index 535d0c26..62781b4c 100644 --- a/stable/ckan/templates/deploy/ckan.yaml +++ b/stable/ckan/templates/deploy/ckan.yaml @@ -364,7 +364,7 @@ spec: {{- end }} {{- if .Values.redis.enabled }} - name: CKAN_REDIS_URL - value: redis://ckan-redis-headless:6379/0 + value: redis://{{ include "ckan.fullname" . }}-redis-headless:6379/0 {{- end }} - name: CKANEXT_SPATIAL_SEARCH_BACKEND value: {{ .Values.ckan.spatialBackend }} From 9cb3d91d96b6d9631ff518c66ee167d411ae15d0 Mon Sep 17 00:00:00 2001 From: William H Date: Mon, 4 Nov 2024 17:13:56 -0500 Subject: [PATCH 2/2] feat(ckan): Don't enforce SSLMode --- stable/ckan/Chart.yaml | 2 +- stable/ckan/conf/pgbouncer/pgbouncer.ini | 2 +- stable/ckan/values.yaml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stable/ckan/Chart.yaml b/stable/ckan/Chart.yaml index 88bdf5f4..1af4201e 100644 --- a/stable/ckan/Chart.yaml +++ b/stable/ckan/Chart.yaml @@ -1,7 +1,7 @@ name: ckan apiVersion: v2 type: application -version: 0.0.30 +version: 0.0.31 appVersion: 2.9.5 description: CKAN Helm Chart for Kubernetes. keywords: diff --git a/stable/ckan/conf/pgbouncer/pgbouncer.ini b/stable/ckan/conf/pgbouncer/pgbouncer.ini index 7b5506c2..f1d42010 100644 --- a/stable/ckan/conf/pgbouncer/pgbouncer.ini +++ b/stable/ckan/conf/pgbouncer/pgbouncer.ini @@ -7,7 +7,7 @@ listen_addr = 0.0.0.0 auth_file = /etc/pgbouncer/userlist.txt auth_type = trust -server_tls_sslmode = verify-ca +server_tls_sslmode = {{ .Values.pgbouncer.sslmode }} server_tls_ca_file = /etc/root.crt.pem # These are defaults and can be configured # please leave them as defaults if you are diff --git a/stable/ckan/values.yaml b/stable/ckan/values.yaml index 274dc69a..226b3c36 100644 --- a/stable/ckan/values.yaml +++ b/stable/ckan/values.yaml @@ -260,6 +260,8 @@ pgbouncer: image: repository: mcr.microsoft.com/azure-oss-db-tools/pgbouncer-sidecar tag: latest + sslmode: prefer + # Specify an external database # Useful for managed offerings from your Cloud Provider external: