Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-08-10 14:15:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/solr] Fix probes for cloudEnabled=false (#10685)

Browse Source 
* Fix probes for cloudEnabled=false.

Signed-off-by: Richard Sufliarsky <richard.sufliarsky@gmail.com>

* Improved readability.

Co-authored-by: Francisco de Paz Galán <fdepaz@vmware.com>
Signed-off-by: Richard Sufliarsky <richard.sufliarsky@gmail.com>

* Updated remaining two probes.
Signed-off-by: Richard Sufliarsky <richard.sufliarsky@gmail.com>

* Re-bump chart version accordingly

Signed-off-by: Jose Antonio Carmona <jcarmona@vmware.com>

Co-authored-by: Francisco de Paz Galán <fdepaz@vmware.com>
Co-authored-by: Jose Antonio Carmona <jcarmona@vmware.com>
This commit is contained in:
Richard Sufliarsky
2022-06-14 10:07:04 +02:00
committed by GitHub
co-authored by Francisco de Paz Galán Jose Antonio Carmona
parent cd7cccabba
commit fe3e5734c8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitnami/solr/Chart.yaml
+1 -1
View File
@@ -27,4 +27,4 @@ name: solr
sources: sources:
- https://github.com/bitnami/bitnami-docker-solr - https://github.com/bitnami/bitnami-docker-solr
- https://lucene.apache.org/solr/ - https://lucene.apache.org/solr/
version: 5.1.6 version: 5.1.7
bitnami/solr/templates/statefulset.yaml
+3 -3
View File
@@ -262,7 +262,7 @@ spec:
{{- if .Values.auth.enabled }} {{- if .Values.auth.enabled }}
SOLR_AUTH_TYPE=basic SOLR_AUTHENTICATION_OPTS="-Dbasicauth=${SOLR_ADMIN_USERNAME}:${SOLR_ADMIN_PASSWORD}" \ SOLR_AUTH_TYPE=basic SOLR_AUTHENTICATION_OPTS="-Dbasicauth=${SOLR_ADMIN_USERNAME}:${SOLR_ADMIN_PASSWORD}" \
{{- end }} {{- end }}
solr assert --timeout {{ printf "%v000" .Values.livenessProbe.timeoutSeconds | quote }} --cloud "{{ ternary "https" "http" .Values.tls.enabled }}://localhost:${SOLR_PORT_NUMBER}/solr/" solr assert --timeout {{ printf "%v000" .Values.livenessProbe.timeoutSeconds | quote }} {{ ternary "--cloud" "--not-cloud" .Values.cloudEnabled }} "{{ ternary "https" "http" .Values.tls.enabled }}://localhost:${SOLR_PORT_NUMBER}/solr/"
{{- else if .Values.customLivenessProbe }} {{- else if .Values.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customLivenessProbe "context" $) | nindent 12 }} livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customLivenessProbe "context" $) | nindent 12 }}
{{- end }} {{- end }}
@@ -281,7 +281,7 @@ spec:
{{- if .Values.auth.enabled }} {{- if .Values.auth.enabled }}
SOLR_AUTH_TYPE=basic SOLR_AUTHENTICATION_OPTS="-Dbasicauth=${SOLR_ADMIN_USERNAME}:${SOLR_ADMIN_PASSWORD}" \ SOLR_AUTH_TYPE=basic SOLR_AUTHENTICATION_OPTS="-Dbasicauth=${SOLR_ADMIN_USERNAME}:${SOLR_ADMIN_PASSWORD}" \
{{- end }} {{- end }}
solr assert --timeout {{ printf "%v000" .Values.readinessProbe.timeoutSeconds | quote }} --cloud "{{ ternary "https" "http" .Values.tls.enabled }}://localhost:${SOLR_PORT_NUMBER}/solr/" solr assert --timeout {{ printf "%v000" .Values.readinessProbe.timeoutSeconds | quote }} {{ ternary "--cloud" "--not-cloud" .Values.cloudEnabled }} "{{ ternary "https" "http" .Values.tls.enabled }}://localhost:${SOLR_PORT_NUMBER}/solr/"
{{- else if .Values.customReadinessProbe }} {{- else if .Values.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customReadinessProbe "context" $) | nindent 12 }} readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customReadinessProbe "context" $) | nindent 12 }}
{{- end }} {{- end }}
@@ -300,7 +300,7 @@ spec:
{{- if .Values.auth.enabled }} {{- if .Values.auth.enabled }}
SOLR_AUTH_TYPE=basic SOLR_AUTHENTICATION_OPTS="-Dbasicauth=${SOLR_ADMIN_USERNAME}:${SOLR_ADMIN_PASSWORD}" \ SOLR_AUTH_TYPE=basic SOLR_AUTHENTICATION_OPTS="-Dbasicauth=${SOLR_ADMIN_USERNAME}:${SOLR_ADMIN_PASSWORD}" \
{{- end }} {{- end }}
solr assert --timeout {{ printf "%v000" .Values.readinessProbe.timeoutSeconds | quote }} --cloud "{{ ternary "https" "http" .Values.tls.enabled }}://localhost:${SOLR_PORT_NUMBER}/solr/" solr assert --timeout {{ printf "%v000" .Values.readinessProbe.timeoutSeconds | quote }} {{ ternary "--cloud" "--not-cloud" .Values.cloudEnabled }} "{{ ternary "https" "http" .Values.tls.enabled }}://localhost:${SOLR_PORT_NUMBER}/solr/"
{{- else if .Values.customStartupProbe }} {{- else if .Values.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customStartupProbe "context" $) | nindent 12 }} startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customStartupProbe "context" $) | nindent 12 }}
{{- end }} {{- end }}