Skip to content

Commit

Permalink
Merge branch 'master' into feat-ckan-updates
Browse files Browse the repository at this point in the history
* master:
  feat(ckan): Don't enforce SSLMode
  feat(ckan): Use ckan fullname for redis
  • Loading branch information
sylus committed Nov 5, 2024
2 parents 3575473 + 9cb3d91 commit 347a00d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion stable/ckan/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: ckan
apiVersion: v2
type: application
version: 0.0.29
version: 0.0.31
appVersion: 2.9.5
description: CKAN Helm Chart for Kubernetes.
keywords:
Expand Down
2 changes: 1 addition & 1 deletion stable/ckan/conf/pgbouncer/pgbouncer.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions stable/ckan/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,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:
Expand Down

0 comments on commit 347a00d

Please sign in to comment.