Move nextcloud probes to http/https instead of tcp (#652)

* no message

* back to tcp

* no message

* no message

* try some tweaking of the probes

* try again

* use new common

* try not using empty-dir

* try setting type

* more

* size set

* hmm

* disable cron for now

* mount html instead of www

* use nextcloud user for initcontainer checkings

* Try some more tweaking

* hmmm

* whoops

* also try custom startup probe

* reenable cronjob

* cleaning

charts/develop/nextcloud/Chart.yaml

@@ -35,4 +35,4 @@ sources:
 - https://github.com/nextcloud/docker
 - https://github.com/nextcloud/helm
 type: application
-version: 1.0.18
+version: 1.0.19

charts/develop/nextcloud/SCALE/ix_values.yaml

@@ -47,7 +47,7 @@ initContainers:
     command:
       - "sh"
       - "-c"
-      - "until pg_isready -h ${pghost} ; do sleep 2 ; done"
+      - "until pg_isready -U nextcloud -h ${pghost} ; do sleep 2 ; done"
     imagePullPolicy: IfNotPresent
     env:
       - name: pghost
@@ -63,32 +63,56 @@ probes:
   # -- Liveness probe configuration
   # @default -- See below
   liveness:
-    # -- sets the probe type when not using a custom probe
+    custom: true
-    # @default -- "TCP"
-    type: HTTP
     # -- If a HTTP probe is used (default for HTTP/HTTPS services) this path is used
     # @default -- "/"
-    path: /status.php
+    spec:
+      httpGet:
+        path: /status.php
+        port: 80
+        httpHeaders:
+        - name: Host
+          value: "test.fakedomain.dns"
+      initialDelaySeconds: 10
+      periodSeconds: 10
+      timeoutSeconds: 2
+      failureThreshold: 5
 
   # -- Redainess probe configuration
   # @default -- See below
   readiness:
-    # -- sets the probe type when not using a custom probe
+    custom: true
-    # @default -- "TCP"
-    type: HTTP
     # -- If a HTTP probe is used (default for HTTP/HTTPS services) this path is used
     # @default -- "/"
-    path: /status.php
+    spec:
+      httpGet:
+        path: /status.php
+        port: 80
+        httpHeaders:
+        - name: Host
+          value: "test.fakedomain.dns"
+      initialDelaySeconds: 10
+      periodSeconds: 10
+      timeoutSeconds: 2
+      failureThreshold: 5
 
   # -- Startup probe configuration
   # @default -- See below
   startup:
-    # -- sets the probe type when not using a custom probe
+    custom: true
-    # @default -- "TCP"
-    type: HTTP
     # -- If a HTTP probe is used (default for HTTP/HTTPS services) this path is used
     # @default -- "/"
-    path: /status.php
+    spec:
+      httpGet:
+        path: /status.php
+        port: 80
+        httpHeaders:
+        - name: Host
+          value: "test.fakedomain.dns"
+      initialDelaySeconds: 10
+      periodSeconds: 10
+      timeoutSeconds: 2
+      failureThreshold: 5
 
 ## Cronjob to execute Nextcloud background tasks
 ## ref: https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/background_jobs_configuration.html#webcron

charts/develop/nextcloud/SCALE/questions.yaml

@@ -124,6 +124,13 @@ questions:
           schema:
             type: string
             default: "172.16.0.0/16"
+        - variable: NODE_IP
+          label: "NODE_IP"
+          description: "Sets nextcloud nodeip for nodeport connections"
+          schema:
+            type: string
+            $ref:
+              - "definitions/nodeIP"
 
 
   # Configure Enviroment Variables

charts/develop/nextcloud/templates/_configmap.tpl

@@ -17,7 +17,7 @@ kind: ConfigMap
 metadata:
   name: nextcloudconfig
 data:
-  NEXTCLOUD_TRUSTED_DOMAINS: {{ $hosts | quote }}
+  NEXTCLOUD_TRUSTED_DOMAINS: {{ ( printf "%v %v %v" "test.fakedomain.dns" ( .Values.env.NODE_IP | default "localhost" ) $hosts ) | quote }}
   {{- if .Values.ingress.main.enabled }}
   APACHE_DISABLE_REWRITE_IP: "1"
   {{- end }}

charts/develop/nextcloud/values.yaml

@@ -48,20 +48,26 @@ envValueFrom:
 persistence:
   data:
     enabled: true
-    mountPath: "/var/www"
+    mountPath: "/var/www/html"
-    type: emptyDir
+    type: pvc
+    accessMode: ReadWriteOnce
+    size: "100Gi"
 
   db:
     noMount: true
     forceName: "db"
     enabled: true
-    type: emptyDir
+    type: pvc
+    accessMode: ReadWriteOnce
+    size: "100Gi"
 
   redismaster:
     noMount: true
     forceName: "redismaster"
     enabled: true
-    type: emptyDir
+    type: pvc
+    accessMode: ReadWriteOnce
+    size: "100Gi"
 
 initContainers:
   - name: init-postgresdb
@@ -69,7 +75,7 @@ initContainers:
     command:
       - "sh"
       - "-c"
-      - "until pg_isready -h ${pghost} ; do sleep 2 ; done"
+      - "until pg_isready -U nextcloud -h ${pghost} ; do sleep 2 ; done"
     imagePullPolicy: IfNotPresent
     env:
       - name: pghost
@@ -88,32 +94,57 @@ probes:
   # -- Liveness probe configuration
   # @default -- See below
   liveness:
-    # -- sets the probe type when not using a custom probe
+    custom: true
-    # @default -- "TCP"
-    type: HTTP
     # -- If a HTTP probe is used (default for HTTP/HTTPS services) this path is used
     # @default -- "/"
-    path: /status.php
+    spec:
+      httpGet:
+        path: /status.php
+        port: 80
+        httpHeaders:
+        - name: Host
+          value: "test.fakedomain.dns"
+      initialDelaySeconds: 10
+      periodSeconds: 10
+      timeoutSeconds: 2
+      failureThreshold: 5
 
   # -- Redainess probe configuration
   # @default -- See below
   readiness:
-    # -- sets the probe type when not using a custom probe
+    custom: true
-    # @default -- "TCP"
-    type: HTTP
     # -- If a HTTP probe is used (default for HTTP/HTTPS services) this path is used
     # @default -- "/"
-    path: /status.php
+    spec:
+      httpGet:
+        path: /status.php
+        port: 80
+        httpHeaders:
+        - name: Host
+          value: "test.fakedomain.dns"
+      initialDelaySeconds: 10
+      periodSeconds: 10
+      timeoutSeconds: 2
+      failureThreshold: 5
 
   # -- Startup probe configuration
   # @default -- See below
   startup:
-    # -- sets the probe type when not using a custom probe
+    custom: true
-    # @default -- "TCP"
-    type: HTTP
     # -- If a HTTP probe is used (default for HTTP/HTTPS services) this path is used
     # @default -- "/"
-    path: /status.php
+    spec:
+      httpGet:
+        path: /status.php
+        port: 80
+        httpHeaders:
+        - name: Host
+          value: "test.fakedomain.dns"
+      initialDelaySeconds: 10
+      periodSeconds: 10
+      timeoutSeconds: 2
+      failureThreshold: 5
+
 
 ## Cronjob to execute Nextcloud background tasks
 ## ref: https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/background_jobs_configuration.html#webcron