Skip to content

GH-534: Add additive Solr modules env and args support #535

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

Open
tormi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

GH-534: Add additive Solr modules env and args support #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 deletions drupal/templates/solr-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,30 @@ spec:
ports:
- containerPort: 8983
command: {{ .Values.solr.command }}
{{- if or .Values.solr.modules .Values.solr.extraEnv }}
env:
{{- if .Values.solr.modules }}
- name: SOLR_MODULES
value: {{ join "," .Values.solr.modules | quote }}
{{- end }}
{{- with .Values.solr.extraEnv }}
{{- if kindIs "map" . }}
{{- range $key, $val := . }}
- name: {{ $key }}
value: {{ $val | quote }}
{{- end }}
{{- else }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
{{- end }}
args:
{{- range .Values.solr.commandArgs }}
- {{ . | quote }}
{{- end }}
{{- range .Values.solr.extraCommandArgs }}
- {{ . | quote }}
{{- end }}
livenessProbe:
httpGet:
scheme: HTTP
Expand Down
3 changes: 3 additions & 0 deletions drupal/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,9 @@
"imageTag": { "type": ["string", "integer"] },
"command": { "type": "array" },
"commandArgs": { "type": "array" },
"modules": { "type": "array", "items": { "type": "string" } },
"extraEnv": { "type": ["array", "object", "null"] },
"extraCommandArgs": { "type": "array", "items": { "type": "string" } },
"confLocation": { "type": "string" },
"coreName": { "type": "string" },
"readinessProbeUrl": { "type": "string" },
Expand Down
8 changes: 8 additions & 0 deletions drupal/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,6 +905,14 @@ solr:
"-m", "256m",
"-a", "-Dlog4j2.formatMsgNoLookups=true -XX:+ExitOnOutOfMemoryError -XX:+HeapDumpOnOutOfMemoryError"
]
# Additive module list rendered as SOLR_MODULES.
# Example: ["extraction", "langid", "ltr", "analysis-extras"]
modules: []
# Additive environment variables for Solr container.
# Supports either env list format or a key-value map.
extraEnv: null
# Additive command arguments appended after commandArgs.
extraCommandArgs: []

# Path in php container containing solr conf files (schema, solrconfig, stopwords, etc.).
# Solr init container will contents of this folder to actual solr container.
Expand Down
Loading