Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Issue#49 add a configurable fixture template #50

Merged
merged 6 commits into from
Aug 9, 2023
Merged

Issue#49 add a configurable fixture template #50

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d97edba
Leverages configurable fixtures
ridoo Aug 8, 2023
d994dc0
Leverages configurable favicon
ridoo Aug 8, 2023
2a5139a
Remove change belonging to another PR
ridoo Aug 8, 2023
cab59cb
Format values.yaml
ridoo Aug 8, 2023
01a321d
Update documentation
ridoo Aug 9, 2023
9ddabde
Update documentation
ridoo Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions deployment/geonode/templates/geonode/geonode-deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@ spec:
mountPath: "/usr/src/geonode/geonode/geonode-k8s-settings.py"
subPath: geonode-k8s-settings.py
readOnly: true
{{ if .Values.geonodeFixtures }}
- name: geonode-fixtures
mountPath: "/usr/src/geonode/geonode/fixtures"
readOnly: true
{{ end }}

resources:
requests:
Expand Down Expand Up @@ -223,6 +228,12 @@ spec:
mountPath: "/usr/src/geonode/geonode/geonode-k8s-settings.py"
subPath: geonode-k8s-settings.py
readOnly: true
{{ if .Values.geonodeFixtures }}
- name: geonode-fixtures
mountPath: "/usr/src/geonode/geonode/fixtures"
readOnly: true
{{ end }}

resources:
requests:
memory: {{ .Values.geonode.celery.resources.requests.memory }}
Expand Down Expand Up @@ -262,6 +273,17 @@ spec:
items:
- key: geonode-k8s-settings.py
path: "geonode-k8s-settings.py"
{{- if .Values.geonodeFixtures }}
- name: geonode-fixtures
configMap:
name: {{ .Release.Name }}-geonode-fixtures
defaultMode: 0744
items:
{{- range $key, $value := .Values.geonodeFixtures }}
- key: {{ $key | quote }}
path: {{ $key | quote }}
{{- end }}
{{- end }}
# Using an emptyDir to cache compiled statics... it will survive container crashes, but not pod restarts
- name: cache-volume
emptyDir: {}
1 change: 1 addition & 0 deletions deployment/geonode/templates/geonode/geonode-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ data:

# General settings
FREETEXT_KEYWORDS_READONLY: {{ include "boolean2str" .Values.geonode.general.freetext_keywords_readonly | quote }}
FIXTURE_DIRS: "[ '/usr/src/geonode/fixtures' ]"
Copy link
Contributor Author

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

# PUBLISHING
RESOURCE_PUBLISHING: {{ include "boolean2str" .Values.geonode.general.publishing.resource_publishing_by_staff | quote }}
ADMIN_MODERATE_UPLOADS: {{ include "boolean2str" .Values.geonode.general.publishing.admin_moderate_uploads | quote }}
Expand Down
Loading