[Fixes #144] Task: use official geonode docker images (#147)

zalf-rdm · Feb 28, 2024 · ac7efe4 · ac7efe4
1 parent ae2119c
commit ac7efe4
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 24 deletions.
diff --git a/charts/geonode/README.md b/charts/geonode/README.md
@@ -65,8 +65,8 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.1.3, Geoserver: 2.23.0, p
 | geonode.haystack.engine_index_name | string | `"haystack"` | hystack index name |
 | geonode.haystack.engine_url | string | `"http://elasticsearch:9200/"` | hystack url |
 | geonode.haystack.search_results_per_page | string | `"200"` | hystack results per page |
-| geonode.image.name | string | `"52north/geonode"` | used geonode image |
-| geonode.image.tag | string | `"4.1.3"` | tag of used geonode image |
+| geonode.image.name | string | `"geonode/geonode"` | used geonode image |
+| geonode.image.tag | string | `"4.2.2"` | tag of used geonode image |
 | geonode.imagePullSecret | string | `""` | pull secret to use for geonode image |
 | geonode.ingress.annotations | object | `{}` | adds ingress annotations for nginx ingress class |
 | geonode.ingress.enabled | bool | `true` | enables external access |
@@ -139,7 +139,7 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.1.3, Geoserver: 2.23.0, p
 | 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.image.name | string | `"geonode/geoserver"` | geoserver image docker image (default in zalf namespace because geonode one was not up to date) |
-| geoserver.image.tag | string | `"2.23.0"` | geoserver docker image tag |
+| geoserver.image.tag | string | `"2.23.3-v2"` | geoserver docker image tag |
 | geoserver.imagePullSecret | string | `""` | pull secret to use for geoserver image |
 | geoserver.port | int | `8080` | geoserver port |
 | geoserver.resources.limits.cpu | int | `2` | limit cpu as in resource.requests.cpu (https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) |
@@ -149,6 +149,9 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.1.3, Geoserver: 2.23.0, p
 | geoserver.secret.admin_password | string | `"geoserver"` | geoserver admin password |
 | geoserver.secret.admin_username | string | `"admin"` | geoserver admin username |
 | geoserver.secret.existingSecretName | string | `""` | name of an existing Secret to use. Set, if you want to separately maintain the Secret. |
+| geoserver_data.container_name | string | `"geoserver-data-dir"` |  |
+| geoserver_data.image.name | string | `"geonode/geoserver_data"` | geoserver image docker image (default in zalf namespace because geonode one was not up to date) |
+| geoserver_data.image.tag | string | `"2.23.3-v1"` | geoserver docker image tag |
 | global.accessMode | string | `"ReadWriteMany"` | storage access mode used by helm dependency pvc |
 | global.storageClass | string | `nil` | storageClass used by helm dependencies pvc |
 | memcached.architecture | string | `"high-availability"` | memcached replica. Loadbalanaced via kubernetes. (only one entry in django settings.py) im memcached is activated under geonode.memcached.enabled this takes place |

diff --git a/charts/geonode/templates/geoserver/geoserver-deploy.yaml b/charts/geonode/templates/geoserver/geoserver-deploy.yaml
@@ -21,27 +21,25 @@ spec:
     spec:
       terminationGracePeriodSeconds: 3
       initContainers:
-      - name: data-dir-conf
-        image: geonode/geoserver_data:{{ .Values.geoserver.image.tag }}
+      - name: {{ .Values.geoserver_data.container_name }}
+        image: "{{ .Values.geoserver_data.image.name }}:{{ .Values.geoserver_data.image.tag }}"
         command:
         - sh
         - -c
         - |
-          # Copy defaults from data container
-          cp -r /tmp/geonode/downloaded/data /geoserver_data
-
-          # Copy overrides from ConfigMap
-          cp /overrides/notifier.xml /geoserver_data/data/notifier/
-
-          # Update custom EPSG codes
-          cat /geoserver_data/data/user_projections/epsg.properties > /tmp/epsg.properties
-          {{- range .Values.geoserver.customEPSGs }}
-          echo '{{ . }}' >> /tmp/epsg.properties
-          {{- end }}
-          {{- range .Values.geoserver.extraCustomEPSGs }}
-          echo '{{ . }}' >> /tmp/epsg.properties
-          {{- end }}
-          sort -u /tmp/epsg.properties > /geoserver_data/data/user_projections/epsg.properties
+          if [ ! -f /geoserver_data/data/.geoserver_data_copied ] ; then
+            # Copy defaults from data container
+            echo "copying geoserver_data files into volume ..."
+            cp -r /tmp/geonode/downloaded/data/* /geoserver_data/data/
+            touch /geoserver_data/data/.geoserver_data_copied
+          else
+            echo "geoserver_data files already exists, skipping copy ..."
+          fi
+        envFrom:
+        - configMapRef:
+            name:  {{ include "geoserver_pod_name" . }}-env
+        - secretRef:
+            name: {{ .Values.geoserver.secret.existingSecretName | default (include "geoserver_secret_name" .) | quote }}
         volumeMounts:
         - name: "{{ include "persistant_volume_name" . }}"
           mountPath: /geoserver_data/data

diff --git a/charts/geonode/values.yaml b/charts/geonode/values.yaml
@@ -17,9 +17,9 @@ geonode:
 
   image:
     # -- used geonode image
-    name: 52north/geonode
+    name: geonode/geonode
     # -- tag of used geonode image
-    tag: "4.1.3"
+    tag: "4.2.2"
 
   # -- pull secret to use for geonode image
   imagePullSecret: ""
@@ -317,15 +317,15 @@ geonode:
         # -- limit cpu as in resource.requests.cpu (https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/)
         cpu: 2
 
-# CONFIGURATION FOR GEOSERVER DEPLOYMENT#
+# CONFIGURATION FOR GEOSERVER DEPLOYMENT
 geoserver:
   # -- geoserver container name
   container_name: geoserver
   image:
     # -- geoserver image docker image (default in zalf namespace because geonode one was not up to date)
     name: geonode/geoserver
     # -- geoserver docker image tag
-    tag: "2.23.0"
+    tag: "2.23.3-v2"
   # -- geoserver port
   port: 8080
 
@@ -352,6 +352,14 @@ geoserver:
       # -- limit cpu as in resource.requests.cpu (https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/)
       cpu: 2
 
+geoserver_data:
+  container_name: geoserver-data-dir
+  image:
+    # -- geoserver image docker image (default in zalf namespace because geonode one was not up to date)
+    name: geonode/geoserver_data
+    # -- geoserver docker image tag
+    tag: "2.23.3-v1"
+
 # CONFIGURATION FOR NGINX DEPLOYMENT
 nginx:
   # -- nginx container name