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

charts/geonode/README.md

@@ -31,7 +31,7 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.1.3, Geoserver: 2.23.0, p
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | favicon | string | AAABAAMAEBAAAAEAIABoBA ... AAAA== | A base64 encoded favicon |
-| geonode.accesscontrol.lockdown | bool | `false` | Enable/Disable lockdown mode of GeoNode |
+| geonode.accesscontrol.lockdown | string | `"False"` | Enable/Disable lockdown mode of GeoNode |
 | geonode.acme.email | string | `"[email protected]"` | the email to be used to gain certificates |
 | geonode.acme.enabled | bool | `false` | enables cert-manager to do ACME challenges (aka certificates via letsencrypt) |
 | geonode.acme.stageUrl | string | `"https://acme-staging-v02.api.letsencrypt.org/directory"` | ACME staging environment (use acme-staging to avoid running into rate limits) stageUrl: https://acme-v02.api.letsencrypt.org/directory |
@@ -66,9 +66,9 @@ 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.imagePullSecret | string | `""` | secret to use to pull 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 |
 | geonode.ingress.ingressClassName | string | `nil` | define kubernetes ingress class for geonode ingress |
@@ -141,8 +141,8 @@ 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.imagePullSecret | string | `""` | secret to use to pull geoserver image |
+| geoserver.image.tag | string | `"2.23.3-v2"` | geoserver docker image tag |
+| geoserver.imagePullSecret | string | `""` | pull secret to use for geoserver image |
 | geoserver.pod_name | string | `"geoserver"` | geoserver pod name |
 | 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/) |
@@ -152,6 +152,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 |
@@ -161,7 +164,7 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.1.3, Geoserver: 2.23.0, p
 | nginx.external_cors.enabled | bool | `false` | Add Access-Control-Allow-Origin directive to allow integration from an external domain |
 | nginx.image.name | string | `"nginx"` | nginx docker image |
 | nginx.image.tag | string | `"1.25"` | nginx docker image tag |
-| nginx.imagePullSecret | string | `""` | secret to use to pull nginx image |
+| nginx.imagePullSecret | string | `""` | pull secret to use for nginx image |
 | nginx.maxClientBodySize | string | `"2G"` | max file upload size |
 | nginx.pod_name | string | `"nginx"` | nginx pod name |
 | nginx.replicaCount | int | `1` | nginx container replicas |
@@ -204,7 +207,7 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.1.3, Geoserver: 2.23.0, p
 | pycsw.endpoint | string | `"/catalogue/csw"` | pycsw url below geonode.ingress.externalDomain |
 | pycsw.image.name | string | `"geopython/pycsw"` | pycsw docker image |
 | pycsw.image.tag | string | `"2.6.1"` | pycsw docker image tag |
-| pycsw.imagePullSecret | string | `""` | secret to use to pull pycsw image |
+| pycsw.imagePullSecret | string | `""` | pull secret to use for pycsw image |
 | pycsw.mappings | string | copied from 4.1.x: https://github.com/GeoNode/geonode/blob/master/geonode/catalogue/backends/pycsw_local_mappings.py | pycsw config file parameters, see docs: https://docs.pycsw.org/_/downloads/en/latest/pdf/ |
 | pycsw.pod_name | string | `"pysw"` | pycsw pod name |
 | pycsw.port | int | `8000` | pycsw endpoint port |
@@ -227,4 +230,4 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.1.3, Geoserver: 2.23.0, p
 | 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.3](https://github.com/norwoodj/helm-docs/releases/v1.11.3)
+Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)

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

charts/geonode/templates/postgres/postgres-external-geodata-secrets.yaml

@@ -6,5 +6,10 @@ metadata:
   namespace: {{ .Release.Namespace }}
 type: Opaque
 data:
+<<<<<<< HEAD
+  username: {{ .Values.postgres.geodata_databasename_and_username | b64enc }}
+  password: {{ .Values.postgres.external_postgres.secret.geodata_password | b64enc }}
+=======
   geodata_password: {{ .Values.postgres.external_postgres.secret.geodata_password | b64enc }}
+>>>>>>> c3d30d13231a852d96e84a856125ae9a22926b78
 {{ end }}

charts/geonode/templates/postgres/postgres-external-geonode-secrets.yaml

@@ -6,5 +6,10 @@ metadata:
   namespace: {{ .Release.Namespace }}
 type: Opaque
 data:
+<<<<<<< HEAD
+  username: {{ .Values.postgres.geonode_databasename_and_username | b64enc }}
+  password: {{ .Values.postgres.external_postgres.secret.geonode_password | b64enc }}
+=======
   geonode_password: {{ .Values.postgres.external_postgres.secret.geonode_password | b64enc }}
+>>>>>>> c3d30d13231a852d96e84a856125ae9a22926b78
 {{ end }}

charts/geonode/values.yaml

@@ -19,9 +19,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: ""
@@ -319,7 +319,7 @@ 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 pod name
   pod_name: geoserver
@@ -329,7 +329,7 @@ geoserver:
     # -- 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
 
@@ -356,6 +356,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 pod name