ci vals

library/ix-dev/charts/nextcloud/ci/basic-values.yaml

@@ -0,0 +1,30 @@
+ncConfig:
+  adminUser: admin
+  adminPassword: password
+  host: ""
+  dataDir: /var/www/html
+  commands:
+    - ffmpeg
+    - smbclient
+  maxUploadLimit: 3
+  phpMemoryLimit: 512
+  nginx:
+    proxyTimeouts: 120
+    useDifferentAccessPort: false
+    externalAccessPort: 80
+
+ncNetwork:
+  webPort: 9001
+
+ncStorage:
+  pgData:
+    type: emptyDir
+    emptyDirConfig:
+      medium: ""
+      size: ""
+  pgBackup:
+    type: emptyDir
+    emptyDirConfig:
+      medium: ""
+      size: ""
+  additionalStorages: []

library/ix-dev/charts/nextcloud/templates/_nginx.tpl

@@ -1,4 +1,9 @@
 {{- define "nginx.workload" -}}
+  {{- $fullname := (include "ix.v1.common.lib.chart.names.fullname" $) -}}
+  {{- $ncUrl := printf "http://%s:80" $fullname -}}
+  {{- if .Values.ncNetwork.certificateID -}}
+    {{- $ncUrl = printf "https://%s:%s" $fullname .Values.ncNetwork.webPort -}}
+  {{- end }}
 workload:
   nginx:
     enabled: true
@@ -51,26 +56,21 @@ workload:
               path: /status.php
               httpHeaders:
                 Host: localhost
-      {{- $fullname := (include "ix.v1.common.lib.chart.names.fullname" $) -}}
-      {{- $ncUrl := printf "http://%s:80" $fullname }}
-      {{- if .Values.ncNetwork.certificateID -}}
-        {{- $ncUrl = printf "https://%s:%s" $fullname .Values.ncNetwork.webPort -}}
-      {{- end }}
       initContainers:
         01-wait-server:
           enabled: true
-            type: init
-            imageSelector: bashImage
-            command:
-              - bash
-            args:
-              - -c
-              - |
+          type: init
+          imageSelector: bashImage
+          command:
+            - bash
+          args:
+            - -c
+            - |
+              echo "Waiting for [{{ $ncUrl }}]";
+              until wget --spider --quiet --timeout=3 --tries=1 {{ $ncUrl }}/status.php;
+              do
                 echo "Waiting for [{{ $ncUrl }}]";
-                until wget --spider --quiet --timeout=3 --tries=1 {{ $ncUrl }}/status.php;
-                do
-                  echo "Waiting for [{{ $ncUrl }}]";
-                  sleep 2;
-                done
-                echo "API is up: {{ $ncUrl }}";
+                sleep 2;
+              done
+              echo "API is up: {{ $ncUrl }}";
 {{- end -}}

library/ix-dev/charts/nextcloud/values.yaml

@@ -11,7 +11,7 @@ nginxImage:
 ncPostgresImage:
   pullPolicy: IfNotPresent
   repository: postgres
-  tag: 13.1
+  tag: "13.1"
 
 resources:
   limits: