Merge pull request #439 from joachimBurket/fix/support-sslrootcert-op…

…tion Improve database client options templating
netbox-community · Dec 18, 2024 · ab76db1 · ab76db1
2 parents 1e2ee30 + b75ef57
commit ab76db1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/charts/netbox/Chart.yaml b/charts/netbox/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: netbox
-version: 5.0.0-beta.173
+version: 5.0.0-beta.174
 appVersion: "v4.1.8"
 type: application
 kubeVersion: ^1.25.0-0

diff --git a/charts/netbox/README.md b/charts/netbox/README.md
@@ -208,10 +208,9 @@ The following table lists the configurable parameters for this chart and their d
 | `externalDatabase.password`                     | Password for external PostgreSQL (see also `existingSecret`)        | `""`                                         |
 | `externalDatabase.existingSecretName`           | Fetch password for external PostgreSQL from a different `Secret`    | `""`                                         |
 | `externalDatabase.existingSecretKey`            | Key to fetch the password in the above `Secret`                     | `postgresql-password`                        |
-| `externalDatabase.sslMode`                      | PostgreSQL client SSL Mode setting                                  | `prefer`                                     |
 | `externalDatabase.connMaxAge`                   | The lifetime of a database connection, as an integer of seconds     | `300`                                        |
 | `externalDatabase.disableServerSideCursors`     | Disable the use of server-side cursors transaction pooling          | `false`                                      |
-| `externalDatabase.targetSessionAttrs`           | Determines whether the session must have certain properties         | `read-write`                                 |
+| `externalDatabase.options`                      | Additional PostgreSQL client parameters             | `{}`                                            |
 | `redis.enabled`                                 | Deploy Redis using bundled Bitnami Redis chart                      | `true`                                       |
 | `redis.*`                                       | Values under this key are passed to the bundled Redis chart         | n/a                                          |
 | `tasksRedis.database`                           | Redis database number used for NetBox task queue                    | `0`                                          |

diff --git a/charts/netbox/templates/configmap.yaml b/charts/netbox/templates/configmap.yaml
@@ -27,9 +27,7 @@ data:
       NAME: {{ .Values.externalDatabase.database | quote }}
       PORT: {{ .Values.externalDatabase.port | int }}
       {{- end }}
-      OPTIONS:
-        sslmode: {{ .Values.externalDatabase.sslMode | quote }}
-        target_session_attrs: {{ .Values.externalDatabase.targetSessionAttrs | default "read-write" | quote }}
+      OPTIONS: {{- include "common.tplvalues.render" (dict "value" .Values.externalDatabase.options "context" $) | nindent 8 }}
       CONN_MAX_AGE: {{ .Values.externalDatabase.connMaxAge | int }}
       DISABLE_SERVER_SIDE_CURSORS: {{ toJson .Values.externalDatabase.disableServerSideCursors }}
 

diff --git a/charts/netbox/values.schema.json b/charts/netbox/values.schema.json
@@ -394,11 +394,8 @@
         "port": {
           "type": "integer"
         },
-        "sslMode": {
-          "type": "string"
-        },
-        "targetSessionAttrs": {
-          "type": "string"
+        "options": {
+          "type": "object"
         },
         "username": {
           "type": "string"

diff --git a/charts/netbox/values.yaml b/charts/netbox/values.yaml
@@ -1027,10 +1027,14 @@ externalDatabase:
   existingSecretKey: postgresql-password
 
   # The following settings also apply when using the bundled PostgreSQL chart:
-  sslMode: prefer
   connMaxAge: 300
   disableServerSideCursors: false
-  targetSessionAttrs: read-write
+  ## @param externalDatabase.options Additional PostgreSQL client parameters
+  ## Ref: https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-PARAMKEYWORDS
+  ##
+  options:
+    sslmode: "prefer"
+    target_session_attrs: "read-write"
 
 ## Redis chart configuration
 ## https://github.com/bitnami/charts/blob/main/bitnami/redis/values.yaml