Move nextcloud to ix-dev (#1050)

* move nextcloud to ix-dev

* fix probe and update lock

* indent

charts/nextcloud/1.6.18/Chart.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: file://../../../library/common/2207.0.0
-  version: 2207.0.0
-digest: sha256:f17f3d458ca0210a52e39da0dce35034e900b36f2040d4b19bed46a7aae91506
-generated: "2022-07-28T22:31:02.992776385+05:00"

charts/nextcloud/1.6.18/Chart.yaml

@@ -1,22 +0,0 @@
-apiVersion: v2
-appVersion: 25.0.4
-dependencies:
-- name: common
-  repository: file://../../../library/common/2207.0.0
-  version: 2207.0.0
-description: A file sharing server that puts the control and security of your own
-  data back into your hands.
-home: https://nextcloud.com/
-icon: https://cdn.rawgit.com/docker-library/docs/defa5ffc7123177acd60ddef6e16bddf694cc35f/nextcloud/logo.svg
-keywords:
-- nextcloud
-- storage
-- http
-- web
-- php
-name: nextcloud
-sources:
-- https://github.com/nextcloud/docker
-- https://github.com/nextcloud/helm
-upstream_version: 2.3.2
-version: 1.6.18

charts/nextcloud/1.6.18/requirements.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: file://../../../library/common/2207.0.0
-  version: 2207.0.0
-digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6
-generated: "2021-05-10T13:07:35.423192+05:00"

charts/nextcloud/1.6.18/templates/postgres-deployment.yaml

@@ -1,17 +0,0 @@
-{{ $values := (. | mustDeepCopy) }}
-{{ $_ := set $values "common" (dict "nameSuffix" "postgres") }}
-{{ include "common.deployment.common_config" $values | nindent 0 }}
-spec: {{ include "common.deployment.common_spec" $values | nindent 2 }}
-  template: {{ include "common.deployment.pod.metadata" $values | nindent 4 }}
-    spec:
-      containers:
-      - name: {{ .Chart.Name }}-postgres
-        image: {{ template "postgres.imageName" . }}
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        env: {{ include "postgres.envVariableConfiguration" $values | nindent 10 }}
-        volumeMounts: {{ include "postgres.volumeMountsConfiguration" $values | nindent 10 }}
-        ports:
-        - name: postgres-tcp
-          containerPort: 5432
-          protocol: TCP
-      volumes: {{ include "postgres.volumeConfiguration" $values | nindent 8 }}

charts/nextcloud/1.6.18/templates/tests/deployment-check.yaml

@@ -1,21 +0,0 @@
-{{- $serviceName := (include "common.names.fullname" .) -}}
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ .Release.Name }}-nextcloud-test"
-  labels:
-    app: {{ .Release.Name }}
-    release: {{ .Release.Name }}
-  annotations:
-    "helm.sh/hook": test
-spec:
-    containers:
-      - name: test-curl
-        image: alpine/curl
-        imagePullPolicy: "IfNotPresent"
-        command:
-          - /bin/sh
-          - -ec
-          - |
-            curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ksf http://{{ $serviceName }}/login
-    restartPolicy: Never

library/ix-dev/charts/nextcloud/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: file://../../../common/2207.0.0
+  version: 2207.0.0
+digest: sha256:a301ba0f99ec1e08a60a7f0a0320aa02d225993572f2f056f09520f06df88b37
+generated: "2023-03-22T15:32:05.580526674Z"

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

@@ -0,0 +1,29 @@
+name: nextcloud
+description: A file sharing server that puts the control and security of your own
+  data back into your hands.
+annotations:
+  title: Nextcloud
+type: application
+version: 1.6.19
+apiVersion: v2
+appVersion: '25.0.4'
+kubeVersion: '>=1.16.0-0'
+maintainers:
+  - name: truenas
+    url: https://www.truenas.com/
+dependencies:
+  - name: common
+    repository: file://../../../common/2207.0.0
+    version: 2207.0.0
+home: https://nextcloud.com/
+icon: https://cdn.rawgit.com/docker-library/docs/defa5ffc7123177acd60ddef6e16bddf694cc35f/nextcloud/logo.svg
+sources:
+  - https://github.com/nextcloud/docker
+  - https://github.com/nextcloud/helm
+  - https://github.com/truenas/charts/tree/master/library/ix-dev/charts/nextcloud
+keywords:
+  - nextcloud
+  - storage
+  - http
+  - web
+  - php

charts/nextcloud/1.6.18/test_values.yaml → library/ix-dev/charts/nextcloud/ci/test-values.yaml

@@ -9,10 +9,6 @@ dnsConfig:
   options: []
 emptyDirVolumes: true
 environmentVariables: []
-image:
-  pullPolicy: IfNotPresent
-  repository: nextcloud
-  tag: 25.0.4
 ixChartContext: {}
 nextcloud:
   datadir: /var/www/html/data
@@ -20,11 +16,6 @@ nextcloud:
   install_ffmpeg: true
   password: changeme
   username: admin
-nginx:
-  image:
-    pullPolicy: IfNotPresent
-    repository: nginx
-    tag: 1.23.3
 postgresAppVolumeMounts:
   postgres-backup:
     emptyDir: true

charts/nextcloud/1.6.18/templates/deployment.yaml → library/ix-dev/charts/nextcloud/templates/deployment.yaml

@@ -28,6 +28,45 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
           - name: nginx-https
             containerPort: 443
             protocol: TCP
+        livenessProbe:
+          httpGet:
+            scheme: HTTPS
+            path: /status.php
+            port: 443
+            httpHeaders:
+            - name: Host
+              value: localhost
+          initialDelaySeconds: 10
+          periodSeconds: 10
+          timeoutSeconds: 5
+          failureThreshold: 5
+          successThreshold: 1
+        readinessProbe:
+          httpGet:
+            scheme: HTTPS
+            path: /status.php
+            port: 443
+            httpHeaders:
+            - name: Host
+              value: localhost
+          initialDelaySeconds: 10
+          periodSeconds: 10
+          timeoutSeconds: 5
+          failureThreshold: 5
+          successThreshold: 2
+        startupProbe:
+          httpGet:
+            scheme: HTTPS
+            path: /status.php
+            port: 443
+            httpHeaders:
+            - name: Host
+              value: localhost
+          initialDelaySeconds: 10
+          periodSeconds: 5
+          timeoutSeconds: 2
+          failureThreshold: 60
+          successThreshold: 1
       {{ end }}
       - name: {{ .Chart.Name }}
           {{ include "common.resources.limitation" . | nindent 8 }}
@@ -63,10 +102,11 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
             httpHeaders:
             - name: Host
               value: localhost
-          initialDelaySeconds: 30
+          initialDelaySeconds: 10
           periodSeconds: 10
           timeoutSeconds: 5
           failureThreshold: 5
+          successThreshold: 1
         readinessProbe:
           httpGet:
             path: /status.php
@@ -74,10 +114,11 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
             httpHeaders:
             - name: Host
               value: localhost
-          initialDelaySeconds: 30
+          initialDelaySeconds: 10
           periodSeconds: 10
           timeoutSeconds: 5
           failureThreshold: 5
+          successThreshold: 1
         startupProbe:
         {{- if .Values.nextcloud.install_ffmpeg }}
           exec:
@@ -94,10 +135,11 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
             - name: Host
               value: localhost
         {{- end }}
-          initialDelaySeconds: 60
+          initialDelaySeconds: 10
           periodSeconds: 10
           timeoutSeconds: 5
-          failureThreshold: 60
+          failureThreshold: 5
+          successThreshold: 1
         volumeMounts:
         - name: nextcloud-data
           mountPath: /var/www/

library/ix-dev/charts/nextcloud/templates/postgres-deployment.yaml

@@ -0,0 +1,50 @@
+{{ $values := (. | mustDeepCopy) }}
+{{ $_ := set $values "common" (dict "nameSuffix" "postgres") }}
+{{ include "common.deployment.common_config" $values | nindent 0 }}
+spec: {{ include "common.deployment.common_spec" $values | nindent 2 }}
+  template: {{ include "common.deployment.pod.metadata" $values | nindent 4 }}
+    spec:
+      containers:
+      - name: {{ .Chart.Name }}-postgres
+        image: {{ template "postgres.imageName" . }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        env: {{ include "postgres.envVariableConfiguration" $values | nindent 10 }}
+        volumeMounts: {{ include "postgres.volumeMountsConfiguration" $values | nindent 10 }}
+        ports:
+        - name: postgres-tcp
+          containerPort: 5432
+          protocol: TCP
+        readinessProbe:
+          exec:
+            command:
+              - sh
+              - -c
+              - "until pg_isready -U ${POSTGRES_USER} -h localhost; do sleep 2; done"
+          initialDelaySeconds: 10
+          periodSeconds: 10
+          timeoutSeconds: 5
+          failureThreshold: 5
+          successThreshold: 2
+        livenessProbe:
+          exec:
+            command:
+              - sh
+              - -c
+              - "until pg_isready -U ${POSTGRES_USER} -h localhost; do sleep 2; done"
+          initialDelaySeconds: 10
+          periodSeconds: 10
+          timeoutSeconds: 5
+          failureThreshold: 5
+          successThreshold: 1
+        startupProbe:
+          exec:
+            command:
+              - sh
+              - -c
+              - "until pg_isready -U ${POSTGRES_USER} -h localhost; do sleep 2; done"
+          initialDelaySeconds: 10
+          periodSeconds: 5
+          timeoutSeconds: 2
+          failureThreshold: 60
+          successThreshold: 1
+      volumes: {{ include "postgres.volumeConfiguration" $values | nindent 8 }}