Merge pull request #111 from camptocamp/update_1_0_rc29

Update GSCloud to 1_0_RC29
camptocamp · Feb 7, 2023 · c654f84 · c654f84
2 parents 2345499 + e1589a9
commit c654f84
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 53 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: '1.0-RC28'
+appVersion: '1.0-RC29'
 #appVersion: '1.0-SNAPSHOT'
 description: A Helm chart for Geoserver-cloud
 name: geoservercloud
-version: 0.0.47
+version: 0.0.48
 dependencies:
   - name: 'rabbitmq'
     version: 11.3.0

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Helm chart for geoserver-cloud
 
-![Version: 0.0.47](https://img.shields.io/badge/Version-0.0.47-informational?style=flat-square) ![AppVersion: 1.0-RC28](https://img.shields.io/badge/AppVersion-1.0--RC28-informational?style=flat-square)
+![Version: 0.0.48](https://img.shields.io/badge/Version-0.0.48-informational?style=flat-square) ![AppVersion: 1.0-RC29](https://img.shields.io/badge/AppVersion-1.0--RC29-informational?style=flat-square)
 
 A Helm chart for Geoserver
 

diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -73,6 +73,18 @@ Create the name of the service account to use
 - name: GEOSERVER_DEBUG_INSTANCEID
   value: "true"
 {{- end }}
+{{- if .Values.geoserver.adminCredentials }}
+- name: GEOSERVER_ADMIN_USERNAME
+  valueFrom:
+    secretKeyRef:
+      name: {{ .Values.geoserver.adminCredentials.secretConfig }}
+      key: {{ .Values.geoserver.adminCredentials.userKey }}
+- name: GEOSERVER_ADMIN_PASSWORD
+  valueFrom:
+    secretKeyRef:
+      name: {{ .Values.geoserver.adminCredentials.secretConfig }}
+      key: {{ .Values.geoserver.adminCredentials.passKey }}
+{{- end }}
 - name: BACKEND_CATALOG
   value: {{ has "catalog" $profiles | quote}}
 - name: BACKEND_DATA_DIRECTORY

diff --git a/tests/chart/Chart.yaml b/tests/chart/Chart.yaml
@@ -6,4 +6,4 @@ version: 0.1.0
 dependencies:
   - name: geoservercloud
     repository: file://../..
-    version: 0.0.47
+    version: 0.0.48