merge main into gh-pages (#79)

* Issue#59 task prepare this repository to be available on artifact hub (#65) * Fixes [#59,#58] * Issue#27 py csw single microservice (#68) issue#27_csw_single_microsservice * Issue#67 separate site url related settings from ingress config (#69) issue#67_separate_site_url_related_settings_from_ingress_config * Provide confidential values as secret (#71) * WIP: Provide confidential values as secret * Fix parameter names in comment * Provide demo credentials as base64 * Add named secret in values.yaml with default content * Remove secret boilerplate in values.yaml * Configure secret creation via flag * Enhance secret configuration - Use existingSecretName to configure secret via external secret - rabbitmq uses its own naming syntax. We show them for convenience - fixing external database property Postgres secrets for external databases has to be added still * Fix yaml syntax * Fix yaml and property refs * Adds configurable secret to external database * Adjust minikube values * Resolve go template issues * Update documentation * Fix wording * release 1.0.0 final changes [geonode 4.1.2] (#74) release 1.0.0 * Issue#72 bug celery container is not starting properly and exiting right away (#76) * release 1.0.0 * fixing release build (#78) * added github token to install helm --------- Co-authored-by: Henning Bredel <[email protected]>
zalf-rdm · Sep 11, 2023 · 2044437 · 2044437
1 parent a7a7ce8
commit 2044437
Show file tree

Hide file tree

Showing 56 changed files with 804 additions and 245 deletions.
diff --git a/.github/workflows/helm-lint-check.yaml b/.github/workflows/helm-lint-check.yaml
@@ -19,9 +19,9 @@ jobs:
       with:
         version: '3.12.0' # default is latest (stable)
     - name: build dependencies
-      run: helm dependency update deployment/geonode/
+      run: helm dependency update charts/geonode/
     - name: helm-check
       uses: igabaydulin/[email protected]
       env:
-        CHART_LOCATION: ./deployment/geonode/
-        CHART_VALUES: ./deployment/geonode/values.yaml
+        CHART_LOCATION: ./charts/geonode/
+        CHART_VALUES: ./charts/geonode/values.yaml
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -0,0 +1,32 @@
+name: Release Charts
+
+on:
+  push:
+    branches:
+    - issue#77_bug_missing_github_token_when_building_gh_page_for_usage_in_artifacts
+
+jobs:
+  release:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    - name: Configure Git
+      run: |
+        git config user.name "$GITHUB_ACTOR"
+        git config user.email "[email protected]"
+
+    - name: Install Helm
+      uses: azure/setup-helm@v3
+      with:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Run chart-releaser
+      uses: helm/[email protected]
+      env:
+        CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 localtest
 my-values.yaml
 **/Chart.lock
-deployment/geonode/charts/*.tgz
-deployment/geonode/Chart.lock
+charts/*/charts
 .vscode
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,15 +1,15 @@
 repos:
-  - repo: https://github.com/norwoodj/helm-docs
-    rev: v1.2.0
-    hooks:
-      - id: helm-docs
-        args:
-          # Make the tool search for charts only under the `example-charts` directory
-          - --chart-search-root=deployment/geonode
+- repo: https://github.com/norwoodj/helm-docs
+  rev: v1.2.0
+  hooks:
+  - id: helm-docs
+    args:
+    # Make the tool search for charts only under the `example-charts` directory
+    - --chart-search-root=charts/geonode
 
-          # The `./` makes it relative to the chart-search-root set above
-          #- --template-files=./_templates.gotmpl
+    # The `./` makes it relative to the chart-search-root set above
+    #- --template-files=./_templates.gotmpl
 
-          # Repeating the flag adds this to the list, now [./_templates.gotmpl, README.md.gotmpl]
-          # A base filename makes it relative to each chart directory found
-          #- --template-files=README.md.gotmpl
+    # Repeating the flag adds this to the list, now [./_templates.gotmpl, README.md.gotmpl]
+    # A base filename makes it relative to each chart directory found
+    #- --template-files=README.md.gotmpl
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 
-![Version: 4.1.x](https://img.shields.io/badge/Version-4.1.x-informational?style=flat-square)
+![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square)
 
 # Helm Chart for Geonode
 
@@ -26,7 +26,7 @@ Due to growing needs for high availability and scalability this repository aims
 Geonode-k8s
 -----------
 
-This repository provides a helm chart for **geonode(4.1.x)** including additional services as:
+This repository provides a helm chart for **geonode(4.1.2)** including additional services as:
 - geoserver: source server for sharing geospatial data  (https://geoserver.org/)
 - rabbitmq: message broker (scalable)
 - postgresql database: using zalando postgres-operator for distributed database for geonode and postgis db for geoserver (https://github.com/zalando/postgres-operator) (scalable)
@@ -35,7 +35,7 @@ This repository provides a helm chart for **geonode(4.1.x)** including additiona
 
 This helm chart provides the possibility to run most of the services redundant to increase performance on the one hand and increase fail safe on the other hand.
 
-To get an overview of the available configuration check out the values [docs](deployment/geonode/README.md). If you want to run the helm chart first on a minikube cluster check out the [minikube](docs/minikube-installation.md) guide. Also check the minikube-values.yaml for basic configuration. 
+To get an overview of the available configuration check out the values [docs](charts/geonode/README.md). If you want to run the helm chart first on a minikube cluster check out the [minikube](docs/minikube-installation.md) guide. Also check the minikube-values.yaml for basic configuration. 
 
 If you want to go straight for a production installation follow the [installation](#install) guide.
 
@@ -54,31 +54,36 @@ Install
 * [Helm](https://helm.sh/)
 
 The chart will automatically install required dependencies, i.e. a RabbitMQ broker and a Postgres database with `postgis` extensions installed, and link them up.
-This helm chart now supports geonode v4.1.x.
+
+| GeoNode-k8s chart version | GeoNode version(s) | geonode container image | geoserver container image | 
+|---------------------------|--------------------|-------------------------|---------------------------|
+| 1.0.0 | [4.1.2](https://github.com/GeoNode/geonode/releases/tag/4.1.2) | [52north/geonode:4.1.2](https://hub.docker.com/r/52north/geonode/tags) | [geonode/geoserver:2.23.0](https://hub.docker.com/r/geonode/geoserver/tags) |
+
 
 ## Install chart dependencies
 
 Update helm dependencies via:
 
 ```bash
-helm dependency update deployment/geonode
+helm repo add geonode https://zalf-rdm.github.io/geonode-k8s/
+helm repo update
 ```
 
 ## Override desired values in your own override file
-Define your own values.yaml to configure your geonode installation. Use the [docs](deployment/geonode/README.md) to understand the parameters.
+Define your own values.yaml to configure your geonode installation. Use the [docs](charts/geonode/README.md) to understand the parameters.
 
 ```bash
 vi my-values.yaml
 ```
 
 ## Install chart
 ```bash
-helm upgrade --cleanup-on-fail   --install --namespace geonode --create-namespace --values my-values.yaml geonode deployment/geonode
+helm upgrade --cleanup-on-fail   --install --namespace geonode --create-namespace --values my-values.yaml geonode charts/geonode
 ```
 
 ## Delete Installation
 ```bash
-helm delete --namespace geonode geonode deployment/geonode
+helm delete --namespace geonode geonode charts/geonode
 ```
 
 ## Contribution
@@ -93,7 +98,7 @@ Feel free to [create an issue](https://github.com/zalf-rdm/geonode-k8s/issues/ne
 ### Documentation
 
 Ensure values.yaml documentation is up-to-date. 
-The [parameter documentation](deployment/geonode/README.md) is generated via [`helm-docs`](https://github.com/norwoodj/helm-docs).
+The [parameter documentation](charts/geonode/README.md) is generated via [`helm-docs`](https://github.com/norwoodj/helm-docs).
 There is a pre-commit hook configuration so please ensure you install it into your local working copy via 
 
 ```

diff --git a/deployment/geonode/.gitignore → charts/geonode/.gitignore b/deployment/geonode/.gitignore → charts/geonode/.gitignore
diff --git a/charts/geonode/.helmignore b/charts/geonode/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/charts/geonode/Chart.yaml b/charts/geonode/Chart.yaml
@@ -0,0 +1,54 @@
+apiVersion: v2
+name: geonode-k8s
+version: 4.1.0
+description: Helm Chart for Geonode a web-based application and platform for developing geospatial information systems (GIS) and for deploying spatial data infrastructures (SDI)
+keywords:
+- geonode
+- geospatial
+- geodata
+- SDI
+- http
+- web
+- python
+- geoserver
+- postresql
+- postgis
+- rabbitmq
+- memcached
+- django
+icon: https://www.osgeo.org/wp-content/uploads/GeoNode-370x206.png
+annotations:
+  artifacthub.io/links: |
+    - name: Chart Source
+      url: https://github.com/zalf-rdm/geonode-k8s/
+    - name: Geonode
+      url: https://www.geonode.org/
+    - name: support
+      url: https://github.com/zalf-rdm/geonode-k8s/issues
+  artifacthub.io/category: "storage"
+  artifacthub.io/license: "GPL3"
+home: https://geonode.org/
+sources:
+- https://github.com/zalf-rdm/geonode-k8s
+- https://github.com/geonode/geonode
+maintainers:
+- name: mwallschlaeger
+  email: [email protected]
+  url: https://github.com/mwallschlaeger
+dependencies:
+- name: postgres-operator-ui
+  version: ~1.9.0
+  repository: https://opensource.zalando.com/postgres-operator/charts/postgres-operator-ui/
+  condition: postgres-operator-ui.enabled
+- name: postgres-operator
+  version: ~1.9.0
+  repository: https://opensource.zalando.com/postgres-operator/charts/postgres-operator/
+  condition: postgres-operator.enabled
+- name: rabbitmq
+  version: ~10.1.7
+  repository: https://charts.bitnami.com/bitnami
+  condition: rabbitmq.enabled
+- name: memcached
+  repository: https://charts.bitnami.com/bitnami
+  condition: geonode.memcached.enaled
+  version: ~6.x.x