From 1ed0ad61af8817be9b6b28ff877e4c6fb6f637ba Mon Sep 17 00:00:00 2001 From: Alessio Cruciani Date: Wed, 10 Jul 2024 22:13:36 +0200 Subject: [PATCH] Fixes PYCSW server url composition (#200) Co-authored-by: Alessio Cruciani --- charts/geonode/README.md | 4 ++-- charts/geonode/templates/pycsw/pycsw-deploy.yaml | 2 +- charts/geonode/values.yaml | 2 +- docs/minikube-installation.md | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/charts/geonode/README.md b/charts/geonode/README.md index 72aa56b..578099e 100644 --- a/charts/geonode/README.md +++ b/charts/geonode/README.md @@ -206,7 +206,7 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.3.0, Geoserver: 2.24.3-v1 | pycsw.config | string | based of pycsw example.cfg: https://github.com/geopython/pycsw/blob/master/docker/pycsw.cfg | pycsw config file parameters, see docs: https://docs.pycsw.org/_/downloads/en/latest/pdf/ | | pycsw.container_name | string | `"pycsw"` | pycsw container name | | pycsw.enabled | bool | `true` | enable single pycsw pod | -| pycsw.endpoint | string | `"/catalogue/csw"` | pycsw url below geonode.ingress.externalDomain | +| pycsw.endpoint | string | `"/catalogue/csw"` | pycsw url below geonode.general.externalDomain | | pycsw.image.name | string | `"geopython/pycsw"` | pycsw docker image | | pycsw.image.tag | string | `"2.6.1"` | pycsw docker image tag | | pycsw.imagePullPolicy | string | `"IfNotPresent"` | pycsw image pull policy | @@ -236,4 +236,4 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.3.0, Geoserver: 2.24.3-v1 | rabbitmq.requests.memory | string | `"1Gi"` | requested memory as in resource.requests.memory (https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/geonode/templates/pycsw/pycsw-deploy.yaml b/charts/geonode/templates/pycsw/pycsw-deploy.yaml index a43dfdb..5e11346 100644 --- a/charts/geonode/templates/pycsw/pycsw-deploy.yaml +++ b/charts/geonode/templates/pycsw/pycsw-deploy.yaml @@ -47,7 +47,7 @@ spec: name: {{ include "pycsw_pod_name" . }}-env env: - name: PYCSW_SERVER_URL - value: "{{ .Values.geonode.ingress.externalScheme}}://{{ .Values.geonode.ingress.externalDomain }}{{ .Values.pycsw.endpoint }}" + value: "{{ include "public_url" . }}{{ .Values.pycsw.endpoint }}" - name: GEONODE_DATABASE_PASSWORD valueFrom: secretKeyRef: diff --git a/charts/geonode/values.yaml b/charts/geonode/values.yaml index 698c29c..3722ff8 100644 --- a/charts/geonode/values.yaml +++ b/charts/geonode/values.yaml @@ -442,7 +442,7 @@ pycsw: imagePullSecret: "" # -- pycsw endpoint port port: 8000 - # -- pycsw url below geonode.ingress.externalDomain + # -- pycsw url below geonode.general.externalDomain endpoint: /catalogue/csw resources: requests: diff --git a/docs/minikube-installation.md b/docs/minikube-installation.md index a738d2e..cac1e7c 100644 --- a/docs/minikube-installation.md +++ b/docs/minikube-installation.md @@ -19,6 +19,7 @@ View and edit the predefined minikube values under /minikube-values.yaml ## Run Installation To run the installation on minikube run: + ```bash helm upgrade --cleanup-on-fail --install --namespace geonode --create-namespace --values minikube-values.yaml geonode charts/geonode ``` @@ -82,7 +83,7 @@ kubectl -n geonode logs pod/geonode-geonode-0 -f ## Expose Service to outside world -This installation requires to access geonode via "geonode" (or the value in .Values.geonode.ingress.externalDomain) dns entry. So, add an entry to your /etc/hosts. First of all find the related ip addr from kubernetes service like: +This installation requires to access geonode via "geonode" (or the value in .Values.geonode.general.externalDomain) dns entry. So, add an entry to your /etc/hosts. First of all find the related ip addr from kubernetes service like: ```bash # list all services in geonode namespace