diff --git a/test/nextcloud/1.6.16/.helmignore b/test/nextcloud/1.6.17/.helmignore similarity index 100% rename from test/nextcloud/1.6.16/.helmignore rename to test/nextcloud/1.6.17/.helmignore diff --git a/test/nextcloud/1.6.16/Chart.lock b/test/nextcloud/1.6.17/Chart.lock similarity index 100% rename from test/nextcloud/1.6.16/Chart.lock rename to test/nextcloud/1.6.17/Chart.lock diff --git a/test/nextcloud/1.6.16/Chart.yaml b/test/nextcloud/1.6.17/Chart.yaml similarity index 97% rename from test/nextcloud/1.6.16/Chart.yaml rename to test/nextcloud/1.6.17/Chart.yaml index 6eda5ea3ec..dba73fd4c6 100644 --- a/test/nextcloud/1.6.16/Chart.yaml +++ b/test/nextcloud/1.6.17/Chart.yaml @@ -19,4 +19,4 @@ sources: - https://github.com/nextcloud/docker - https://github.com/nextcloud/helm upstream_version: 2.3.2 -version: 1.6.16 +version: 1.6.17 diff --git a/test/nextcloud/1.6.16/README.md b/test/nextcloud/1.6.17/README.md similarity index 100% rename from test/nextcloud/1.6.16/README.md rename to test/nextcloud/1.6.17/README.md diff --git a/test/nextcloud/1.6.16/app-readme.md b/test/nextcloud/1.6.17/app-readme.md similarity index 100% rename from test/nextcloud/1.6.16/app-readme.md rename to test/nextcloud/1.6.17/app-readme.md diff --git a/test/nextcloud/1.6.16/charts/common-2207.0.0.tgz b/test/nextcloud/1.6.17/charts/common-2207.0.0.tgz similarity index 100% rename from test/nextcloud/1.6.16/charts/common-2207.0.0.tgz rename to test/nextcloud/1.6.17/charts/common-2207.0.0.tgz diff --git a/test/nextcloud/1.6.16/ix_values.yaml b/test/nextcloud/1.6.17/ix_values.yaml similarity index 100% rename from test/nextcloud/1.6.16/ix_values.yaml rename to test/nextcloud/1.6.17/ix_values.yaml diff --git a/test/nextcloud/1.6.16/migrations/migrate_from_1.1.0 b/test/nextcloud/1.6.17/migrations/migrate_from_1.1.0 similarity index 100% rename from test/nextcloud/1.6.16/migrations/migrate_from_1.1.0 rename to test/nextcloud/1.6.17/migrations/migrate_from_1.1.0 diff --git a/test/nextcloud/1.6.16/questions.yaml b/test/nextcloud/1.6.17/questions.yaml similarity index 98% rename from test/nextcloud/1.6.16/questions.yaml rename to test/nextcloud/1.6.17/questions.yaml index 3d23dece8a..923794df22 100644 --- a/test/nextcloud/1.6.16/questions.yaml +++ b/test/nextcloud/1.6.17/questions.yaml @@ -104,6 +104,12 @@ questions: type: path default: "/var/www/html/data" required: true + - variable: install_ffmpeg + label: "Install ffmpeg" + description: "Automatically Install ffmpeg when the container starts" + schema: + type: boolean + default: false - variable: cronjob description: "Setup cronjob for nextcloud" diff --git a/test/nextcloud/1.6.16/requirements.lock b/test/nextcloud/1.6.17/requirements.lock similarity index 100% rename from test/nextcloud/1.6.16/requirements.lock rename to test/nextcloud/1.6.17/requirements.lock diff --git a/test/nextcloud/1.6.16/templates/NOTES.txt b/test/nextcloud/1.6.17/templates/NOTES.txt similarity index 100% rename from test/nextcloud/1.6.16/templates/NOTES.txt rename to test/nextcloud/1.6.17/templates/NOTES.txt diff --git a/test/nextcloud/1.6.16/templates/_nginx.tpl b/test/nextcloud/1.6.17/templates/_nginx.tpl similarity index 100% rename from test/nextcloud/1.6.16/templates/_nginx.tpl rename to test/nextcloud/1.6.17/templates/_nginx.tpl diff --git a/test/nextcloud/1.6.16/templates/_postgres.tpl b/test/nextcloud/1.6.17/templates/_postgres.tpl similarity index 100% rename from test/nextcloud/1.6.16/templates/_postgres.tpl rename to test/nextcloud/1.6.17/templates/_postgres.tpl diff --git a/test/nextcloud/1.6.16/templates/backup-postgres-config.yaml b/test/nextcloud/1.6.17/templates/backup-postgres-config.yaml similarity index 100% rename from test/nextcloud/1.6.16/templates/backup-postgres-config.yaml rename to test/nextcloud/1.6.17/templates/backup-postgres-config.yaml diff --git a/test/nextcloud/1.6.16/templates/backup-postgres-hook.yaml b/test/nextcloud/1.6.17/templates/backup-postgres-hook.yaml similarity index 100% rename from test/nextcloud/1.6.16/templates/backup-postgres-hook.yaml rename to test/nextcloud/1.6.17/templates/backup-postgres-hook.yaml diff --git a/test/nextcloud/1.6.16/templates/cronjob.yaml b/test/nextcloud/1.6.17/templates/cronjob.yaml similarity index 100% rename from test/nextcloud/1.6.16/templates/cronjob.yaml rename to test/nextcloud/1.6.17/templates/cronjob.yaml diff --git a/test/nextcloud/1.6.16/templates/deployment.yaml b/test/nextcloud/1.6.17/templates/deployment.yaml similarity index 76% rename from test/nextcloud/1.6.16/templates/deployment.yaml rename to test/nextcloud/1.6.17/templates/deployment.yaml index 593e8db419..7c8ee1ad3b 100644 --- a/test/nextcloud/1.6.16/templates/deployment.yaml +++ b/test/nextcloud/1.6.17/templates/deployment.yaml @@ -56,6 +56,48 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} - name: http containerPort: 80 protocol: TCP + livenessProbe: + httpGet: + path: /status.php + port: http + httpHeaders: + - name: Host + value: localhost + initialDelaySeconds: 30 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 5 + readinessProbe: + httpGet: + path: /status.php + port: http + httpHeaders: + - name: Host + value: localhost + initialDelaySeconds: 30 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 5 + startupProbe: + {{- if .Values.nextcloud.install_ffmpeg }} + exec: + command: + - /bin/sh + - -c + - | + command -v ffmpeg /dev/null 2>&1 || exit 1 + {{- else }} + httpGet: + path: /status.php + port: http + httpHeaders: + - name: Host + value: localhost + {{- end }} + initialDelaySeconds: 60 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 60 volumeMounts: - name: nextcloud-data mountPath: /var/www/ @@ -82,6 +124,20 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} - name: extrappvolume-{{ $index }} mountPath: {{ $hostPathConfiguration.mountPath }} {{ end }} + {{- if .Values.nextcloud.install_ffmpeg }} + lifecycle: + postStart: + exec: + command: + - /bin/sh + - -c + - | + echo "Installing ffmpeg..." + apt update && \ + apt install -y --no-install-recommends \ + ffmpeg || echo "Failed to install ffmpeg" + echo "Finished." + {{- end }} {{ include "common.networking.dnsConfiguration" .Values | nindent 6 }} volumes: - name: nginx-configuration diff --git a/test/nextcloud/1.6.16/templates/nginx-configmap.yaml b/test/nextcloud/1.6.17/templates/nginx-configmap.yaml similarity index 100% rename from test/nextcloud/1.6.16/templates/nginx-configmap.yaml rename to test/nextcloud/1.6.17/templates/nginx-configmap.yaml diff --git a/test/nextcloud/1.6.16/templates/nginx-secret.yaml b/test/nextcloud/1.6.17/templates/nginx-secret.yaml similarity index 100% rename from test/nextcloud/1.6.16/templates/nginx-secret.yaml rename to test/nextcloud/1.6.17/templates/nginx-secret.yaml diff --git a/test/nextcloud/1.6.16/templates/nuke-deployments-hook.yaml b/test/nextcloud/1.6.17/templates/nuke-deployments-hook.yaml similarity index 100% rename from test/nextcloud/1.6.16/templates/nuke-deployments-hook.yaml rename to test/nextcloud/1.6.17/templates/nuke-deployments-hook.yaml diff --git a/test/nextcloud/1.6.16/templates/postgres-deployment.yaml b/test/nextcloud/1.6.17/templates/postgres-deployment.yaml similarity index 100% rename from test/nextcloud/1.6.16/templates/postgres-deployment.yaml rename to test/nextcloud/1.6.17/templates/postgres-deployment.yaml diff --git a/test/nextcloud/1.6.16/templates/postgres-secret.yaml b/test/nextcloud/1.6.17/templates/postgres-secret.yaml similarity index 100% rename from test/nextcloud/1.6.16/templates/postgres-secret.yaml rename to test/nextcloud/1.6.17/templates/postgres-secret.yaml diff --git a/test/nextcloud/1.6.16/templates/postgres-service.yaml b/test/nextcloud/1.6.17/templates/postgres-service.yaml similarity index 100% rename from test/nextcloud/1.6.16/templates/postgres-service.yaml rename to test/nextcloud/1.6.17/templates/postgres-service.yaml diff --git a/test/nextcloud/1.6.16/templates/secrets.yaml b/test/nextcloud/1.6.17/templates/secrets.yaml similarity index 100% rename from test/nextcloud/1.6.16/templates/secrets.yaml rename to test/nextcloud/1.6.17/templates/secrets.yaml diff --git a/test/nextcloud/1.6.16/templates/service.yaml b/test/nextcloud/1.6.17/templates/service.yaml similarity index 100% rename from test/nextcloud/1.6.16/templates/service.yaml rename to test/nextcloud/1.6.17/templates/service.yaml diff --git a/test/nextcloud/1.6.16/templates/serviceaccount.yaml b/test/nextcloud/1.6.17/templates/serviceaccount.yaml similarity index 100% rename from test/nextcloud/1.6.16/templates/serviceaccount.yaml rename to test/nextcloud/1.6.17/templates/serviceaccount.yaml diff --git a/test/nextcloud/1.6.16/templates/tests/deployment-check.yaml b/test/nextcloud/1.6.17/templates/tests/deployment-check.yaml similarity index 100% rename from test/nextcloud/1.6.16/templates/tests/deployment-check.yaml rename to test/nextcloud/1.6.17/templates/tests/deployment-check.yaml diff --git a/test/nextcloud/1.6.16/test_values.yaml b/test/nextcloud/1.6.17/test_values.yaml similarity index 97% rename from test/nextcloud/1.6.16/test_values.yaml rename to test/nextcloud/1.6.17/test_values.yaml index 3a726542c2..be1900a09d 100644 --- a/test/nextcloud/1.6.16/test_values.yaml +++ b/test/nextcloud/1.6.17/test_values.yaml @@ -19,6 +19,7 @@ nextcloud: host: nextcloud.kube.home password: changeme username: admin + install_ffmpeg: true nginx: image: pullPolicy: IfNotPresent