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.

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

Make solr volumes and volumeMounts configurable #45

Open
wants to merge 1 commit into
base: release/3.1.0-beta1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions charts/sddi-ckan/charts/solr/templates/solr-statefulset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ spec:
{{- toYaml .Values.podSecurityContext | nindent 8 }}

volumes:
- name: data
persistentVolumeClaim:
claimName: {{ include "solr.fullname" . }}
{{- if .Values.volumes }}
{{- include "common.tplvalues.render" ( dict "value" .Values.volumes "context" $ ) | nindent 8 }}
{{- end }}

initContainers:
{{- if .Values.initContainers }}
Expand All @@ -58,8 +58,9 @@ spec:
protocol: TCP

volumeMounts:
- name: data
mountPath: /var/solr/data
{{- if .Values.volumeMounts }}
{{- include "common.tplvalues.render" ( dict "value" .Values.volumeMounts "context" $ ) | nindent 10 }}
{{- end }}

resources:
{{- toYaml .Values.resources | nindent 12 }}
Expand Down
21 changes: 21 additions & 0 deletions charts/sddi-ckan/charts/solr/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,27 @@ initContainers:
# The initContainers specified here, are appended to the ones specified in `initContainers`.
extraInitContainers: []

# Volumes ---------------------------------------------------------------------
# -- Sets [`volumes`](https://kubernetes.io/docs/concepts/storage/volumes).
# Set to `[]` to disable the default volumes.
# Set to any list of volume definitions to overwrite the default volumes.
# Use `extraVolumes` to extend the default volumes.
# @default -- See [`values.yml`](values.yml) for the list of default volumes.
volumes:
- name: data
persistentVolumeClaim:
claimName: '{{ include "ckan.fullname" . }}'

# VolumeMounts ----------------------------------------------------------------
# -- Sets [`volumeMounts`](https://kubernetes.io/docs/concepts/storage/volumes).
# Set to `[]` to disable the default volumeMounts.
# Set to any list of volumeMount definitions to overwrite the default volumeMounts.
# Use `extraVolumeMounts` to extend the default volumeMounts.
# @default -- See [`values.yml`](values.yml) for the list of default volumeMounts.
volumeMounts:
- name: data
mountPath: /var/solr/data

# -- [k8s: Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/)
resources: {}
# -- [k8s: Assign pods to nodes](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/)
Expand Down