From 6d1eab750c112d93032ec3be99e51e43aa0bb4c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Wallschl=C3=A4ger?= Date: Sun, 23 Jun 2024 09:54:54 +0200 Subject: [PATCH] [Fixes #176] Task: support GeoNode 4.3 (#181) --- README.md | 2 +- charts/geonode/Chart.yaml | 4 ++-- charts/geonode/README.md | 9 +++++---- charts/geonode/values.yaml | 4 ++-- docs/index.md | 2 +- docs/list-of-releases-and-versions.md | 3 ++- minikube-values.yaml | 2 +- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index f3402fd..834b394 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) +![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) # Helm Chart for Geonode diff --git a/charts/geonode/Chart.yaml b/charts/geonode/Chart.yaml index e4bf6bb..4ad6727 100644 --- a/charts/geonode/Chart.yaml +++ b/charts/geonode/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: geonode-k8s -version: 1.1.1 -description: "Helm Chart for Geonode. Supported versions: Geonode: 4.2.2, Geoserver: 2.23.3-v2, pyCSW: 2.6.1" +version: 1.2.0 +description: "Helm Chart for Geonode. Supported versions: Geonode: 4.3.0, Geoserver: 2.24.3-v1, pyCSW: 2.6.1" keywords: - geonode - geospatial diff --git a/charts/geonode/README.md b/charts/geonode/README.md index 07f5b1a..8cf6a05 100644 --- a/charts/geonode/README.md +++ b/charts/geonode/README.md @@ -1,8 +1,8 @@ # geonode-k8s -![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) +![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) -Helm Chart for Geonode. Supported versions: Geonode: 4.2.2, Geoserver: 2.23.3-v2, pyCSW: 2.6.1 +Helm Chart for Geonode. Supported versions: Geonode: 4.3.0, Geoserver: 2.24.3-v1, pyCSW: 2.6.1 **Homepage:** @@ -68,7 +68,7 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.2.2, Geoserver: 2.23.3-v2 | 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 | `"geonode/geonode"` | used geonode image | -| geonode.image.tag | string | `"4.2.2"` | tag of used geonode image | +| geonode.image.tag | string | `"4.3.0"` | tag of used geonode image | | geonode.imagePullPolicy | string | `"IfNotPresent"` | image pull policy | | geonode.imagePullSecret | string | `""` | pull secret to use for geonode image | | geonode.ingress.annotations | object | `{}` | adds ingress annotations for nginx ingress class | @@ -147,7 +147,7 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.2.2, Geoserver: 2.23.3-v2 | 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 | | 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.3-v2"` | geoserver docker image tag | +| geoserver.image.tag | string | `"2.24.3-v1"` | geoserver docker image tag | | geoserver.imagePullPolicy | string | `"IfNotPresent"` | geoserver image pull policy | | geoserver.imagePullSecret | string | `""` | pull secret to use for geoserver image | | geoserver.port | int | `8080` | geoserver port | @@ -192,6 +192,7 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.2.2, Geoserver: 2.23.3-v2 | postgres.external.secret.geodata_password | string | `"geogeonode"` | | | postgres.external.secret.geonode_password | string | `"geonode"` | | | postgres.external.secret.postgres_password | string | `"postgres"` | | +| postgres.external.ssl | string | `"prefer"` | | | postgres.geodata_databasename_and_username | string | `"geodata"` | geoserver database name and username | | postgres.geonode_databasename_and_username | string | `"geonode"` | geonode database name and username | | postgres.operator.numberOfInstances | int | `1` | number of database instances | diff --git a/charts/geonode/values.yaml b/charts/geonode/values.yaml index 4cbc827..8f69720 100644 --- a/charts/geonode/values.yaml +++ b/charts/geonode/values.yaml @@ -19,7 +19,7 @@ geonode: # -- used geonode image name: geonode/geonode # -- tag of used geonode image - tag: "4.2.2" + tag: "4.3.0" # -- image pull policy imagePullPolicy: IfNotPresent # -- pull secret to use for geonode image @@ -341,7 +341,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.3-v2" + tag: "2.24.3-v1" # -- geoserver image pull policy imagePullPolicy: "IfNotPresent" # -- pull secret to use for geoserver image diff --git a/docs/index.md b/docs/index.md index f3402fd..834b394 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,5 +1,5 @@ -![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) +![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) # Helm Chart for Geonode diff --git a/docs/list-of-releases-and-versions.md b/docs/list-of-releases-and-versions.md index 3b5f6d3..3f57eba 100644 --- a/docs/list-of-releases-and-versions.md +++ b/docs/list-of-releases-and-versions.md @@ -16,4 +16,5 @@ the table below shows an overview about the geonode-k8s release with the corespo | [1.0.9](https://github.com/zalf-rdm/geonode-k8s/releases/tag/geonode-k8s-1.0.9) | [4.1.3](https://github.com/GeoNode/geonode/releases/tag/4.1.3) | [52north/geonode:4.1.3](https://hub.docker.com/r/52north/geonode/tags) | [geonode/geoserver:2.23.0](https://hub.docker.com/r/geonode/geoserver/tags) | | [1.0.10](https://github.com/zalf-rdm/geonode-k8s/releases/tag/geonode-k8s-1.0.10) | [4.1.3](https://github.com/GeoNode/geonode/releases/tag/4.1.3) | [52north/geonode:4.1.3](https://hub.docker.com/r/52north/geonode/tags) | [geonode/geoserver:2.23.0](https://hub.docker.com/r/geonode/geoserver/tags) | | [1.1.0](https://github.com/zalf-rdm/geonode-k8s/releases/tag/geonode-k8s-1.1.0) | [4.2.2](https://github.com/GeoNode/geonode/releases/tag/4.2.2) | [geonode/geonode:4.2.2](https://hub.docker.com/r/geonode/geonode/tags) | [geonode/geoserver:2.23.3-v2](https://hub.docker.com/r/geonode/geoserver/tags) | -| [1.1.1](https://github.com/zalf-rdm/geonode-k8s/releases/tag/geonode-k8s-1.1.1) | [4.2.2](https://github.com/GeoNode/geonode/releases/tag/4.2.2) | [geonode/geonode:4.2.2](https://hub.docker.com/r/geonode/geonode/tags) | [geonode/geoserver:2.23.3-v2](https://hub.docker.com/r/geonode/geoserver/tags) | \ No newline at end of file +| [1.1.1](https://github.com/zalf-rdm/geonode-k8s/releases/tag/geonode-k8s-1.1.1) | [4.2.2](https://github.com/GeoNode/geonode/releases/tag/4.2.2) | [geonode/geonode:4.2.2](https://hub.docker.com/r/geonode/geonode/tags) | [geonode/geoserver:2.23.3-v2](https://hub.docker.com/r/geonode/geoserver/tags) | +| [1.2.0](https://github.com/zalf-rdm/geonode-k8s/releases/tag/geonode-k8s-1.2.0) | [4.3.0](https://github.com/GeoNode/geonode/releases/tag/4.3.0) | [geonode/geonode:4.3.0](https://hub.docker.com/r/geonode/geonode/tags) | [geonode/geoserver:2.24.3-v1](https://hub.docker.com/r/geonode/geoserver/tags) | \ No newline at end of file diff --git a/minikube-values.yaml b/minikube-values.yaml index 4aa1d99..dc76be9 100644 --- a/minikube-values.yaml +++ b/minikube-values.yaml @@ -32,7 +32,7 @@ geonode: authentication_method: username_email pycsw: - enabled: False + enabled: True postgres-operator: enabled: True