Skip to content

Added volumes and volume mounts variables to be able to use wordforms… #88

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added volumes and volume mounts variables to be able to use wordforms… #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4cfd54
Added volumes and volume mounts variables to be able to use wordforms…
May 28, 2024
b2df190
Added prefix for mountpath to prevent overwriting manticore files.
May 30, 2024
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
12 changes: 12 additions & 0 deletions charts/manticoresearch/templates/manticore-balancer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,13 @@ spec:
- name: config-volume
mountPath: {{ .Values.balancer.config.path }}
subPath: manticore.conf
{{- range .Values.balancer.volumeMounts }}
- name: {{ .name }}
mountPath: /imports/{{ .mountPath }}
{{- if .subPath }}
subPath: {{ .subPath }}
{{- end}}
{{- end }}
resources:
{{- toYaml .Values.balancer.resources | nindent 10 }}
{{- if or .Values.exporter.enabled .Values.serviceMonitor.enabled }}
Expand Down Expand Up @@ -120,6 +127,11 @@ spec:
- name: config-volume
configMap:
name: {{ include "manticoresearch.fullname" . }}-balancer-config
{{- range .Values.balancer.volumes }}
Copy link
Contributor

@KlimTodrik KlimTodrik May 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably you forgot to add this variable to values.yml

- name: {{ .name }}
configMap:
Copy link
Contributor

@KlimTodrik KlimTodrik May 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using the config map here is not a good idea. The ConfigMap size limit is 1 MB.

Wordforms can be pretty big, it's noticed in our documentation

Copy link
Author

@fgroenendijk fgroenendijk May 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll look into this.

Copy link
Author

@fgroenendijk fgroenendijk Jun 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, looked into this. I'm at a loss as how to solve this. Do you have a suggestion for me?

Copy link
Contributor

@KlimTodrik KlimTodrik Jun 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mount volume as file and pass into creation table command link to mounted file as it described here

name: {{ .configMap.name }}
{{- end }}
{{- with .Values.balancer.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
Expand Down
12 changes: 12 additions & 0 deletions charts/manticoresearch/templates/manticore-worker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@ spec:
- name: config-volume
mountPath: {{ .Values.worker.config.path }}
subPath: manticore.conf
{{- range .Values.worker.volumeMounts }}
- name: {{ .name }}
mountPath: /imports/{{ .mountPath }}
{{- if .subPath }}
subPath: {{ .subPath }}
{{- end}}
{{- end }}
resources:
{{- toYaml .Values.worker.resources | nindent 10 }}
{{- if or .Values.exporter.enabled .Values.serviceMonitor.enabled }}
Expand Down Expand Up @@ -132,6 +139,11 @@ spec:
- name: config-volume
configMap:
name: {{ include "manticoresearch.fullname" . }}-worker-config
{{- range .Values.worker.volumes }}
Copy link
Contributor

@KlimTodrik KlimTodrik May 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same as for balancer

- name: {{ .name }}
configMap:
name: {{ .configMap.name }}
{{- end }}
{{- with .Values.worker.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
Expand Down
2 changes: 2 additions & 0 deletions charts/manticoresearch/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ balancer:
shutdown_timeout = 25s
auto_optimize = 0
}
volumeMounts: []
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
Expand Down Expand Up @@ -131,6 +132,7 @@ worker:
shutdown_timeout = 25s
auto_optimize = 0
}
volumeMounts: []
resources: {}
# See comment on balancer.resources
nodeSelector: {}
Expand Down