From 57281d9587b843d729fb23b2ed80aea748b638ff Mon Sep 17 00:00:00 2001 From: mwallschlaeger Date: Fri, 28 Jun 2024 18:03:41 +0200 Subject: [PATCH] [Fixes #184] Bug: running geonode 4.3.0 changed the default memcached backend --- charts/geonode/README.md | 1 + charts/geonode/templates/geonode/geonode-env.yaml | 4 ++++ charts/geonode/values.yaml | 2 ++ 3 files changed, 7 insertions(+) diff --git a/charts/geonode/README.md b/charts/geonode/README.md index 8cf6a05..fcedd2a 100644 --- a/charts/geonode/README.md +++ b/charts/geonode/README.md @@ -143,6 +143,7 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.3.0, Geoserver: 2.24.3-v1 | geonode.uwsgi.processes | int | `128` | Maximum number of workers allowed | | geonode.uwsgi.reload_on_rss | int | `2048` | Restart workers after this much resident memory | | geonode.uwsgi.worker_reload_mercy | int | `60` | How long to wait before forcefully killing workers | +| geonode.version | string | `"4.3.0"` | geonode version, used for some distinguassion between version of GeoNode | | geonodeFixtures | map of fixture files | `{"somefixture.json":"[\n {\n \"pk\": 0,\n \"model\": \"myapp.sample\"\n \"description\": \"nice little content\"\n }\n]\n"}` | Fixture files which shall be made available under /usr/src/geonode/geonode/fixtures (refer to https://docs.djangoproject.com/en/4.2/howto/initial-data/) | | geoserver.container_name | string | `"geoserver"` | geoserver container name | | geoserver.force_reinit | bool | `true` | set force reinit true so that changing passwords etc. in Values.yaml will take effect after restarting the pod this on the other hand will increase pod initializing time, only change if you know what you are doing | diff --git a/charts/geonode/templates/geonode/geonode-env.yaml b/charts/geonode/templates/geonode/geonode-env.yaml index 1edaa94..7f5fbc9 100644 --- a/charts/geonode/templates/geonode/geonode-env.yaml +++ b/charts/geonode/templates/geonode/geonode-env.yaml @@ -134,7 +134,11 @@ data: HAYSTACK_SEARCH_RESULTS_PER_PAGE: {{ .Values.geonode.haystack.search_results_per_page | quote }} MEMCACHED_ENABLED: {{ include "boolean2str" .Values.geonode.memcached.enabled | quote }} + {{ if semverCompare ">=4.3.0" .Values.geonode.version }} + MEMCACHED_BACKEND: django.core.cache.backends.memcached.PyLibMCCache + {{ else }} MEMCACHED_BACKEND: django.core.cache.backends.memcached.MemcachedCache + {{ end }} MEMCACHED_LOCATION: {{ .Release.Name }}-memcached MEMCACHED_LOCK_EXPIRE: {{ .Values.geonode.memcached.lock_expire | quote }} MEMCACHED_LOCK_TIMEOUT: {{ .Values.geonode.memcached.lock_timeout | quote }} diff --git a/charts/geonode/values.yaml b/charts/geonode/values.yaml index 8f69720..698c29c 100644 --- a/charts/geonode/values.yaml +++ b/charts/geonode/values.yaml @@ -6,6 +6,8 @@ global: # geonode configuration geonode: + # -- geonode version, used for some distinguassion between version of GeoNode + version: 4.3.0 # -- container name container_name: geonode # -- number of geonode replicas (! not working properly yet)