Merge pull request #23 from lucernae/geonode

[geonode] add support for internal GeoServer URL and fix ingress
kartoza · Oct 3, 2020 · f2f257b · f2f257b
2 parents c7400db + fec47a8
commit f2f257b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/charts/geonode/v0.3.0/templates/_helpers.tpl b/charts/geonode/v0.3.0/templates/_helpers.tpl
@@ -105,9 +105,9 @@ Return GeoServer Base URL to be used
 {{- if not .Values.geoserver.enabled -}}
 	{{- (tpl .Values.global.geoserverURL $) -}}
 {{- else if (and .Values.ingress.enabled .Values.ingress.tls.enabled) -}}
-	{{- printf "https://%s/geoserver" .Values.global.geonodeSiteName -}}
+	{{- printf "https://%s/geoserver/" .Values.global.geonodeSiteName -}}
 {{- else if .Values.ingress.enabled -}}
-	{{- printf "http://%s/geoserver" .Values.global.geonodeSiteName -}}
+	{{- printf "http://%s/geoserver/" .Values.global.geonodeSiteName -}}
 {{- else if (tpl .Values.global.geoserverURL $) -}}
 	{{- (tpl .Values.global.geoserverURL $) -}}
 {{- else -}}
@@ -119,7 +119,9 @@ Return GeoServer Base URL to be used
 Return Internal GeoServer Base URL to be used
 */}}
 {{- define "geonode.internalGeoserverURL" -}}
-{{- if not .Values.geoserver.enabled -}}
+{{- if (tpl .Values.global.internalGeoserverURL $) -}}
+	{{- (tpl .Values.global.internalGeoserverURL $) -}}
+{{- else if not .Values.geoserver.enabled -}}
 	{{- (tpl .Values.global.geoserverURL $) -}}
 {{- else -}}
 	{{- printf "http://%s-geoserver/geoserver/" (include "geonode.fullname" .) -}}

diff --git a/charts/geonode/v0.3.0/values.yaml b/charts/geonode/v0.3.0/values.yaml
@@ -47,6 +47,7 @@ global:
   mediaRoot: /opt/geonode/media
   # geoserverURL must end with slash
   geoserverURL: |
+  internalGeoserverURL: |
   # geoserver specific values
   geoserverAdminUser: admin
   geoserverAdminPassword: