From 300c208c161539543fb3e43fc30cf0cb897e7cae Mon Sep 17 00:00:00 2001
From: AlexGacon <alexandre.gacon@gmail.com>
Date: Thu, 8 Aug 2024 11:55:03 +0200
Subject: [PATCH] feature: allow to provide custom secrets/env var to geoserver

---
 .../templates/geoserver/geoserver-deploy.yaml    |  3 +++
 .../templates/geoserver/geoserver-env.yaml       |  4 ++++
 .../templates/geoserver/geoserver-secret.yaml    |  3 +++
 charts/geonode/values.yaml                       | 16 ++++++++++++++++
 4 files changed, 26 insertions(+)

diff --git a/charts/geonode/templates/geoserver/geoserver-deploy.yaml b/charts/geonode/templates/geoserver/geoserver-deploy.yaml
index 224df9a..72655a2 100644
--- a/charts/geonode/templates/geoserver/geoserver-deploy.yaml
+++ b/charts/geonode/templates/geoserver/geoserver-deploy.yaml
@@ -73,6 +73,9 @@ spec:
               secretKeyRef:
                 name: {{ include "database_geodata_password_secret_key_ref" . }}
                 key: {{ include "database_geodata_password_key_ref" . }}
+          {{- with .Values.geoserver.extraPodEnv }}
+          {{- tpl . $ | nindent 10 }}
+          {{- end }}
 
         volumeMounts:
         - name: "{{ include "persistant_volume_name" . }}"
diff --git a/charts/geonode/templates/geoserver/geoserver-env.yaml b/charts/geonode/templates/geoserver/geoserver-env.yaml
index f3fd4f8..8c65b54 100644
--- a/charts/geonode/templates/geoserver/geoserver-env.yaml
+++ b/charts/geonode/templates/geoserver/geoserver-env.yaml
@@ -20,3 +20,7 @@ data:
   GEONODE_GEODATABASE: {{ .Values.postgres.geodata_databasename_and_username | quote  }}
   GEONODE_GEODATABASE_SCHEMA: {{ .Values.postgres.schema | quote }}
   FORCE_REINIT: {{ .Values.geoserver.force_reinit | quote }}
+
+  {{- with .Values.geoserver.extraConfigMap }}
+  {{- tpl . $ | nindent 2 }}
+  {{- end }}
diff --git a/charts/geonode/templates/geoserver/geoserver-secret.yaml b/charts/geonode/templates/geoserver/geoserver-secret.yaml
index cba15f6..e3e92b8 100644
--- a/charts/geonode/templates/geoserver/geoserver-secret.yaml
+++ b/charts/geonode/templates/geoserver/geoserver-secret.yaml
@@ -14,4 +14,7 @@ data:
   OAUTH2_API_KEY: ""
   OAUTH2_CLIENT_ID: {{ .Values.geonode.secret.oauth2.clientId | b64enc}}
   OAUTH2_CLIENT_SECRET: {{ .Values.geonode.secret.oauth2.clientSecret | b64enc }}
+  {{- with .Values.geoserver.secret.extraSecrets }}
+  {{- tpl . $ | nindent 2 }}
+  {{- end }}
 {{ end }}
\ No newline at end of file
diff --git a/charts/geonode/values.yaml b/charts/geonode/values.yaml
index 1407344..158eebc 100644
--- a/charts/geonode/values.yaml
+++ b/charts/geonode/values.yaml
@@ -364,6 +364,22 @@ geoserver:
     admin_username: admin
     # -- geoserver admin password, respect admin_factory_password, if you gonna change the password from not factory password
     admin_password: geoserver
+    # -- additional elements to include in the secret provided to GeoServer, if not using an existing secret
+    extraSecrets: |
+#  key_1: value_1
+
+  # -- additional elements to include in the config map provided to GeoServer
+  extraConfigMap: |
+# file_1: conf content
+  
+  # -- Define this for extra GeoServer environment variables
+  # Format:
+  # extraPodEnv: |
+  #   - name: KEY_1
+  #     value: "VALUE_1"
+  #   - name: KEY_2
+  #     value: "VALUE_2"
+  extraPodEnv: |
 
   resources:
     requests: