-
Notifications
You must be signed in to change notification settings - Fork 9
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Issue#49 add a configurable fixture template #50
Merged
mwallschlaeger
merged 6 commits into
zalf-rdm:main
from
52North:issue#49_add-a-configurable-fixture-template
Aug 9, 2023
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d97edba
Leverages configurable fixtures
ridoo d994dc0
Leverages configurable favicon
ridoo 2a5139a
Remove change belonging to another PR
ridoo cab59cb
Format values.yaml
ridoo 01a321d
Update documentation
ridoo 9ddabde
Update documentation
ridoo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,6 +23,7 @@ Helm Chart for Geonode | |
|
||
| Key | Type | Default | Description | | ||
|-----|------|---------|-------------| | ||
| favicon | string | AAABAAMAEBAAAAEAIABoBA ... AAAA== | A base64 encoded favicon | | ||
| 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 | | ||
|
@@ -136,6 +137,7 @@ Helm Chart for Geonode | |
| geonode.uwsgi.processes | int | `128` | Maximum number of workers allowed | | ||
| geonode.uwsgi.reload_on_rss | int | `2048` | Restart workers after this much resident memory | | ||
| geonode.uwsgi.worker_reload_mercy | int | `60` | How long to wait before forcefully killing workers | | ||
| 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 | object | `{"admin_password":"geoserver","admin_username":"admin","container_name":"geoserver","image":{"name":"geonode/geoserver","tag":"2.23.0"},"pod_name":"geoserver","port":8080,"resources":{"limits":{"cpu":2,"memory":"4Gi"},"requests":{"cpu":1,"memory":"1Gi"}}}` | CONFIGURATION FOR GEOSERVER DEPLOYMENT | | ||
| geoserver.admin_password | string | `"geoserver"` | geoserver admin password | | ||
| geoserver.admin_username | string | `"admin"` | geoserver admin username | | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
12 changes: 12 additions & 0 deletions
12
deployment/geonode/templates/geonode/geonode-fixtures.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
{{ if .Values.geonodeFixtures }} | ||
# fixture data for Django Geonode | ||
|
||
apiVersion: v1 | ||
kind: ConfigMap | ||
metadata: | ||
name: {{ .Release.Name }}-geonode-fixtures | ||
namespace: {{ .Release.Namespace }} | ||
data: | ||
{{ toYaml .Values.geonodeFixtures | nindent 2 }} | ||
|
||
{{ end }} |
Large diffs are not rendered by default.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mwallschlaeger This does not match the actually configured volume:
https://github.com/zalf-rdm/geonode-k8s/pull/50/files#diff-fca9f77d2a6cb907ee65a0f6252b1261757188e043aed583e778fccdc9b1d4baR131
I will have to provide a quick fix for that