diff --git a/charts/dependency/solr/Chart.yaml b/charts/dependency/solr/Chart.yaml index deda04180ae..38c15be5d65 100644 --- a/charts/dependency/solr/Chart.yaml +++ b/charts/dependency/solr/Chart.yaml @@ -23,7 +23,7 @@ sources: - https://github.com/apache/solr - https://hub.docker.com/r/bitnami/solr/ type: application -version: 0.0.61 +version: 0.0.62 annotations: truecharts.org/catagories: | - search diff --git a/charts/dependency/solr/questions.yaml b/charts/dependency/solr/questions.yaml index 3643517a546..c42c1b49479 100644 --- a/charts/dependency/solr/questions.yaml +++ b/charts/dependency/solr/questions.yaml @@ -1,4 +1,7 @@ # Include{groups} +portals: + open: +# Include{portalLink} questions: # Include{global} # Include{controller} diff --git a/charts/dependency/solr/values.yaml b/charts/dependency/solr/values.yaml index dba023f3979..2e5ca6f732d 100644 --- a/charts/dependency/solr/values.yaml +++ b/charts/dependency/solr/values.yaml @@ -137,4 +137,4 @@ env: key: "solr-password" portal: - enabled: false + enabled: true diff --git a/charts/incubator/docspell/Chart.yaml b/charts/incubator/docspell/Chart.yaml index 9de7885140d..a7eef6b6490 100644 --- a/charts/incubator/docspell/Chart.yaml +++ b/charts/incubator/docspell/Chart.yaml @@ -28,7 +28,7 @@ sources: - https://github.com/eikek/docspell - https://docspell.org/docs/install/docker/ - https://docspell.org/docs/configure/defaults/ -version: 0.0.1 +version: 0.0.2 annotations: truecharts.org/catagories: | - productivity diff --git a/charts/incubator/docspell/docs/installation-notes.md b/charts/incubator/docspell/docs/installation-notes.md new file mode 100644 index 00000000000..0840349ca99 --- /dev/null +++ b/charts/incubator/docspell/docs/installation-notes.md @@ -0,0 +1,4 @@ +# Installation Notes + +When signing up, choose the same name for collective and user. +That's a directive coming from Docspell's documentation. diff --git a/charts/incubator/docspell/templates/_joex.tpl b/charts/incubator/docspell/templates/_joex.tpl index 38ed233edad..9d8e3fb216a 100644 --- a/charts/incubator/docspell/templates/_joex.tpl +++ b/charts/incubator/docspell/templates/_joex.tpl @@ -17,10 +17,9 @@ volumeMounts: ports: - containerPort: {{ .Values.service.joex.ports.joex.port }} name: joex -{{/* TODO: Find out a path for healthchecks and come back to enable probes readinessProbe: httpGet: - path: / + path: /api/info/version port: {{ .Values.service.joex.ports.joex.port }} initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }} timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }} @@ -28,7 +27,7 @@ readinessProbe: failureThreshold: {{ .Values.probes.readiness.spec.failureThreshold }} livenessProbe: httpGet: - path: / + path: /api/info/version port: {{ .Values.service.joex.ports.joex.port }} initialDelaySeconds: {{ .Values.probes.liveness.spec.initialDelaySeconds }} timeoutSeconds: {{ .Values.probes.liveness.spec.timeoutSeconds }} @@ -36,11 +35,10 @@ livenessProbe: failureThreshold: {{ .Values.probes.liveness.spec.failureThreshold }} startupProbe: httpGet: - path: / + path: /api/info/version port: {{ .Values.service.joex.ports.joex.port }} initialDelaySeconds: {{ .Values.probes.startup.spec.initialDelaySeconds }} timeoutSeconds: {{ .Values.probes.startup.spec.timeoutSeconds }} periodSeconds: {{ .Values.probes.startup.spec.periodSeconds }} failureThreshold: {{ .Values.probes.startup.spec.failureThreshold }} -*/}} {{- end -}} diff --git a/charts/incubator/docspell/templates/_secret.tpl b/charts/incubator/docspell/templates/_secret.tpl index 14be9d97e85..64700787bd7 100644 --- a/charts/incubator/docspell/templates/_secret.tpl +++ b/charts/incubator/docspell/templates/_secret.tpl @@ -177,7 +177,7 @@ stringData: enabled = true backend = "solr" solr = { - url = {{ printf "http://%v:%v@%v-solr:8983/%v" .Values.solr.solrUsername (.Values.solr.solrPassword | trimAll "\"") .Release.Name .Values.solr.solrCores | quote }} + url = {{ printf "http://%v:%v@%v-solr:8983/solr/%v" .Values.solr.solrUsername (.Values.solr.solrPassword | trimAll "\"") .Release.Name .Values.solr.solrCores | quote }} commit-within = {{ $full_text_search.solr.commit_within }} log-verbose = {{ $full_text_search.solr.log_verbose }} def-type = {{ $full_text_search.solr.def_type | quote }} @@ -566,7 +566,7 @@ stringData: enabled = true backend = "solr" solr = { - url = {{ printf "http://%v:%v@%v-solr:8983/%v" .Values.solr.solrUsername (.Values.solr.solrPassword | trimAll "\"") .Release.Name .Values.solr.solrCores | quote }} + url = {{ printf "http://%v:%v@%v-solr:8983/solr/%v" .Values.solr.solrUsername (.Values.solr.solrPassword | trimAll "\"") .Release.Name .Values.solr.solrCores | quote }} commit-within = {{ $full_text_search.solr.commit_within }} log-verbose = {{ $full_text_search.solr.log_verbose }} def-type = {{ $full_text_search.solr.def_type | quote }} diff --git a/charts/incubator/docspell/values.yaml b/charts/incubator/docspell/values.yaml index e55dbbb5524..5baab50b033 100644 --- a/charts/incubator/docspell/values.yaml +++ b/charts/incubator/docspell/values.yaml @@ -486,6 +486,17 @@ joex: fail_fast: true run_timeout: 15 minutes +probes: + liveness: + type: HTTP + path: /api/info/version + readiness: + type: HTTP + path: /api/info/version + startup: + type: HTTP + path: /api/info/version + service: main: ports: