Skip to content

Commit

Permalink
renamed deployments folder -> charts closes #58
Browse files Browse the repository at this point in the history
  • Loading branch information
mwallschlaeger committed Sep 5, 2023
1 parent 997dea7 commit 0a9a2f1
Show file tree
Hide file tree
Showing 40 changed files with 101 additions and 53 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/helm-lint-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
localtest
my-values.yaml
**/Chart.lock
deployment/geonode/charts/*.tgz
deployment/geonode/Chart.lock
charts/*/charts
.vscode
24 changes: 12 additions & 12 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -61,24 +61,24 @@ This helm chart now supports geonode v4.1.x.
Update helm dependencies via:

```bash
helm dependency update deployment/geonode
helm dependency update charts/geonode
```

## 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
Expand All @@ -93,7 +93,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

```
Expand Down
File renamed without changes.
21 changes: 21 additions & 0 deletions charts/geonode/.helmignore
Original file line number Diff line number Diff line change
@@ -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
52 changes: 52 additions & 0 deletions charts/geonode/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
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
annotations:
artifacthub.io/links: |
- name: Chart Source
url: https://github.com/zalf-rdm/geonode-k8s/tree/main/charts/geonode
- 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]
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
24 changes: 0 additions & 24 deletions deployment/geonode/Chart.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion docs/access-geonode-database-from-outside.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ postgres-operator:
Applying this via:
```
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
```

Will first of all change our service type to **LoadBalancer**. We can double check this with:
Expand Down
2 changes: 1 addition & 1 deletion docs/external-database-access.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ postgres-operator:
Applying this via:
```
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
```

Will first of all change our service type to **LoadBalancer**. We can double check this with:
Expand Down
2 changes: 1 addition & 1 deletion docs/external-database.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ To deploy run helm and give passwords as helm arguments like:
export GEONODE_K8S_POSTGRES_PASSWORD="password"
export GEONODE_K8S_GEONODE_PASSOWRD="password"
export GEONODE_K8S_GEODATA_PASSWORD="password"
helm upgrade --cleanup-on-fail --install --namespace geonode --create-namespace --values minikube-values-external-db.yaml --set postgres.external_postgres.postgres_password=${GEONODE_K8S_POSTGRES_PASSWORD} --set postgres.external_postgres.geonode_password=${GEONODE_K8S_GEONODE_PASSOWRD} --set postgres.external_postgres.geodata_password=${GEONODE_K8S_GEODATA_PASSWORD} geonode deployment/geonode
helm upgrade --cleanup-on-fail --install --namespace geonode --create-namespace --values minikube-values-external-db.yaml --set postgres.external_postgres.postgres_password=${GEONODE_K8S_POSTGRES_PASSWORD} --set postgres.external_postgres.geonode_password=${GEONODE_K8S_GEONODE_PASSOWRD} --set postgres.external_postgres.geodata_password=${GEONODE_K8S_GEODATA_PASSWORD} geonode charts/geonode
```

If run on minikube follow the original [minikube docs](minikube-installation.md) for accessing the geonode installation through `minikube tunnel`.
4 changes: 2 additions & 2 deletions docs/minikube-installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ To install minikube itself follow the instruction on https://kubernetes.io/de/do
Download or update latest helm chart dependencies listed in /chart.yaml.

```bash
helm dependency update deployment/geonode
helm dependency update charts/geonode
```

## Edit Minicube values
Expand All @@ -20,7 +20,7 @@ View and edit the predefined minikube values under /minikube-values.yaml

To run the installation on minikube run:
```bash
helm upgrade --cleanup-on-fail --install --namespace geonode --create-namespace --values minikube-values.yaml geonode deployment/geonode
helm upgrade --cleanup-on-fail --install --namespace geonode --create-namespace --values minikube-values.yaml geonode charts/geonode
```

You can check the installtion process with:
Expand Down
2 changes: 1 addition & 1 deletion docs/nginx-ingress-class.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# increasing the max uplaod size for kubernetes nginx-ingress

If you run the nginx ingress controller on your cluster. You may ran into an issue where you are unable to upload larger files into your geonode instance. To avoid this you can can ingrese the proxy-body-size for the [nignx-ingress](../deployment/geonode/templates/nginx/nginx-ingress.yaml) definition. See snippet below.
If you run the nginx ingress controller on your cluster. You may ran into an issue where you are unable to upload larger files into your geonode instance. To avoid this you can can ingrese the proxy-body-size for the [nignx-ingress](../charts/geonode/templates/nginx/nginx-ingress.yaml) definition. See snippet below.
```
apiVersion: networking.k8s.io/v1
kind: Ingress
Expand Down

0 comments on commit 0a9a2f1

Please sign in to comment.