fix(docspell): fix solr ulr (#4040)

* fix(docspell): fix solr ulr

* enable portal on solr

* adjust probes

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

charts/dependency/solr/questions.yaml

@@ -1,4 +1,7 @@
 # Include{groups}
+portals:
+  open:
+# Include{portalLink}
 questions:
 # Include{global}
 # Include{controller}

charts/dependency/solr/values.yaml

@@ -137,4 +137,4 @@ env:
       key: "solr-password"
 
 portal:
-  enabled: false
+  enabled: true

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

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.

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 -}}

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 }}

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: