diff --git a/charts/nextcloud/1.6.31/.helmignore b/charts/nextcloud/1.6.32/.helmignore similarity index 100% rename from charts/nextcloud/1.6.31/.helmignore rename to charts/nextcloud/1.6.32/.helmignore diff --git a/charts/nextcloud/1.6.31/Chart.lock b/charts/nextcloud/1.6.32/Chart.lock similarity index 100% rename from charts/nextcloud/1.6.31/Chart.lock rename to charts/nextcloud/1.6.32/Chart.lock diff --git a/charts/nextcloud/1.6.31/Chart.yaml b/charts/nextcloud/1.6.32/Chart.yaml similarity index 98% rename from charts/nextcloud/1.6.31/Chart.yaml rename to charts/nextcloud/1.6.32/Chart.yaml index fffb3c71bf..c07d7d099b 100644 --- a/charts/nextcloud/1.6.31/Chart.yaml +++ b/charts/nextcloud/1.6.32/Chart.yaml @@ -4,7 +4,7 @@ description: A file sharing server that puts the control and security of your ow annotations: title: Nextcloud type: application -version: 1.6.31 +version: 1.6.32 apiVersion: v2 appVersion: 27.0.0 kubeVersion: '>=1.16.0-0' diff --git a/charts/nextcloud/1.6.31/README.md b/charts/nextcloud/1.6.32/README.md similarity index 100% rename from charts/nextcloud/1.6.31/README.md rename to charts/nextcloud/1.6.32/README.md diff --git a/charts/nextcloud/1.6.31/app-readme.md b/charts/nextcloud/1.6.32/app-readme.md similarity index 100% rename from charts/nextcloud/1.6.31/app-readme.md rename to charts/nextcloud/1.6.32/app-readme.md diff --git a/charts/nextcloud/1.6.31/charts/common-2304.0.1.tgz b/charts/nextcloud/1.6.32/charts/common-2304.0.1.tgz similarity index 100% rename from charts/nextcloud/1.6.31/charts/common-2304.0.1.tgz rename to charts/nextcloud/1.6.32/charts/common-2304.0.1.tgz diff --git a/charts/nextcloud/1.6.31/ci/test-values.yaml b/charts/nextcloud/1.6.32/ci/test-values.yaml similarity index 96% rename from charts/nextcloud/1.6.31/ci/test-values.yaml rename to charts/nextcloud/1.6.32/ci/test-values.yaml index a8926c1719..597503b117 100644 --- a/charts/nextcloud/1.6.31/ci/test-values.yaml +++ b/charts/nextcloud/1.6.32/ci/test-values.yaml @@ -14,6 +14,7 @@ nextcloud: datadir: /var/www/html/data host: nextcloud.kube.home install_ffmpeg: true + install_smbclient: true password: changeme username: admin postgresAppVolumeMounts: diff --git a/charts/nextcloud/1.6.31/ix_values.yaml b/charts/nextcloud/1.6.32/ix_values.yaml similarity index 100% rename from charts/nextcloud/1.6.31/ix_values.yaml rename to charts/nextcloud/1.6.32/ix_values.yaml diff --git a/charts/nextcloud/1.6.31/metadata.yaml b/charts/nextcloud/1.6.32/metadata.yaml similarity index 100% rename from charts/nextcloud/1.6.31/metadata.yaml rename to charts/nextcloud/1.6.32/metadata.yaml diff --git a/charts/nextcloud/1.6.31/migrations/migrate_from_1.1.0 b/charts/nextcloud/1.6.32/migrations/migrate_from_1.1.0 similarity index 100% rename from charts/nextcloud/1.6.31/migrations/migrate_from_1.1.0 rename to charts/nextcloud/1.6.32/migrations/migrate_from_1.1.0 diff --git a/charts/nextcloud/1.6.31/questions.yaml b/charts/nextcloud/1.6.32/questions.yaml similarity index 98% rename from charts/nextcloud/1.6.31/questions.yaml rename to charts/nextcloud/1.6.32/questions.yaml index bbc6e09794..25aa585e83 100644 --- a/charts/nextcloud/1.6.31/questions.yaml +++ b/charts/nextcloud/1.6.32/questions.yaml @@ -110,6 +110,12 @@ questions: schema: type: boolean default: false + - variable: install_smbclient + label: "Install smbclient" + description: "Automatically Install smbclient when the container starts" + schema: + type: boolean + default: false - variable: cronjob description: "Setup cronjob for nextcloud" diff --git a/charts/nextcloud/1.6.31/templates/NOTES.txt b/charts/nextcloud/1.6.32/templates/NOTES.txt similarity index 100% rename from charts/nextcloud/1.6.31/templates/NOTES.txt rename to charts/nextcloud/1.6.32/templates/NOTES.txt diff --git a/charts/nextcloud/1.6.31/templates/_nginx.tpl b/charts/nextcloud/1.6.32/templates/_nginx.tpl similarity index 100% rename from charts/nextcloud/1.6.31/templates/_nginx.tpl rename to charts/nextcloud/1.6.32/templates/_nginx.tpl diff --git a/charts/nextcloud/1.6.31/templates/_postgres.tpl b/charts/nextcloud/1.6.32/templates/_postgres.tpl similarity index 100% rename from charts/nextcloud/1.6.31/templates/_postgres.tpl rename to charts/nextcloud/1.6.32/templates/_postgres.tpl diff --git a/charts/nextcloud/1.6.31/templates/backup-postgres-config.yaml b/charts/nextcloud/1.6.32/templates/backup-postgres-config.yaml similarity index 100% rename from charts/nextcloud/1.6.31/templates/backup-postgres-config.yaml rename to charts/nextcloud/1.6.32/templates/backup-postgres-config.yaml diff --git a/charts/nextcloud/1.6.31/templates/backup-postgres-hook.yaml b/charts/nextcloud/1.6.32/templates/backup-postgres-hook.yaml similarity index 100% rename from charts/nextcloud/1.6.31/templates/backup-postgres-hook.yaml rename to charts/nextcloud/1.6.32/templates/backup-postgres-hook.yaml diff --git a/charts/nextcloud/1.6.31/templates/cronjob.yaml b/charts/nextcloud/1.6.32/templates/cronjob.yaml similarity index 100% rename from charts/nextcloud/1.6.31/templates/cronjob.yaml rename to charts/nextcloud/1.6.32/templates/cronjob.yaml diff --git a/charts/nextcloud/1.6.31/templates/deployment.yaml b/charts/nextcloud/1.6.32/templates/deployment.yaml similarity index 90% rename from charts/nextcloud/1.6.31/templates/deployment.yaml rename to charts/nextcloud/1.6.32/templates/deployment.yaml index fc88cd52e3..c8ba72ea51 100644 --- a/charts/nextcloud/1.6.31/templates/deployment.yaml +++ b/charts/nextcloud/1.6.32/templates/deployment.yaml @@ -122,21 +122,34 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} failureThreshold: 5 successThreshold: 1 startupProbe: - {{- if .Values.nextcloud.install_ffmpeg }} + {{ $cmds := list }} + {{ if .Values.nextcloud.install_ffmpeg }} + {{ $cmds = mustAppend $cmds "ffmpeg" }} + {{ end }} + {{ if .Values.nextcloud.install_smbclient }} + {{ $cmds = mustAppend $cmds "smbclient" }} + {{ end }} + {{ if $cmds }} exec: command: - /bin/sh - -c - | - command -v ffmpeg /dev/null 2>&1 || exit 1 - {{- else }} + commands_to_check={{ join " " $cmds }} + for comm in $commands_to_check; do + if ! command -v $comm /dev/null 2>&1; then + echo "Command $comm not found" + exit 1 + fi + done + {{ else }} httpGet: path: /status.php port: http httpHeaders: - name: Host value: localhost - {{- end }} + {{ end }} initialDelaySeconds: 10 periodSeconds: 10 timeoutSeconds: 5 @@ -168,7 +181,7 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} - name: extrappvolume-{{ $index }} mountPath: {{ $hostPathConfiguration.mountPath }} {{ end }} - {{- if .Values.nextcloud.install_ffmpeg }} + {{ if $cmds }} lifecycle: postStart: exec: @@ -176,12 +189,12 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} - /bin/sh - -c - | - echo "Installing ffmpeg..." + echo "Installing {{ join " " $cmds }}..." apt update && \ apt install -y --no-install-recommends \ - ffmpeg || echo "Failed to install ffmpeg" + {{ join " " $cmds }} || echo "Failed to install binary/binaries" echo "Finished." - {{- end }} + {{ end }} {{ include "common.networking.dnsConfiguration" .Values | nindent 6 }} volumes: - name: nginx-configuration diff --git a/charts/nextcloud/1.6.31/templates/nginx-configmap.yaml b/charts/nextcloud/1.6.32/templates/nginx-configmap.yaml similarity index 100% rename from charts/nextcloud/1.6.31/templates/nginx-configmap.yaml rename to charts/nextcloud/1.6.32/templates/nginx-configmap.yaml diff --git a/charts/nextcloud/1.6.31/templates/nginx-secret.yaml b/charts/nextcloud/1.6.32/templates/nginx-secret.yaml similarity index 100% rename from charts/nextcloud/1.6.31/templates/nginx-secret.yaml rename to charts/nextcloud/1.6.32/templates/nginx-secret.yaml diff --git a/charts/nextcloud/1.6.31/templates/nuke-deployments-hook.yaml b/charts/nextcloud/1.6.32/templates/nuke-deployments-hook.yaml similarity index 100% rename from charts/nextcloud/1.6.31/templates/nuke-deployments-hook.yaml rename to charts/nextcloud/1.6.32/templates/nuke-deployments-hook.yaml diff --git a/charts/nextcloud/1.6.31/templates/postgres-deployment.yaml b/charts/nextcloud/1.6.32/templates/postgres-deployment.yaml similarity index 100% rename from charts/nextcloud/1.6.31/templates/postgres-deployment.yaml rename to charts/nextcloud/1.6.32/templates/postgres-deployment.yaml diff --git a/charts/nextcloud/1.6.31/templates/postgres-secret.yaml b/charts/nextcloud/1.6.32/templates/postgres-secret.yaml similarity index 100% rename from charts/nextcloud/1.6.31/templates/postgres-secret.yaml rename to charts/nextcloud/1.6.32/templates/postgres-secret.yaml diff --git a/charts/nextcloud/1.6.31/templates/postgres-service.yaml b/charts/nextcloud/1.6.32/templates/postgres-service.yaml similarity index 100% rename from charts/nextcloud/1.6.31/templates/postgres-service.yaml rename to charts/nextcloud/1.6.32/templates/postgres-service.yaml diff --git a/charts/nextcloud/1.6.31/templates/secrets.yaml b/charts/nextcloud/1.6.32/templates/secrets.yaml similarity index 100% rename from charts/nextcloud/1.6.31/templates/secrets.yaml rename to charts/nextcloud/1.6.32/templates/secrets.yaml diff --git a/charts/nextcloud/1.6.31/templates/service.yaml b/charts/nextcloud/1.6.32/templates/service.yaml similarity index 100% rename from charts/nextcloud/1.6.31/templates/service.yaml rename to charts/nextcloud/1.6.32/templates/service.yaml diff --git a/charts/nextcloud/1.6.31/templates/serviceaccount.yaml b/charts/nextcloud/1.6.32/templates/serviceaccount.yaml similarity index 100% rename from charts/nextcloud/1.6.31/templates/serviceaccount.yaml rename to charts/nextcloud/1.6.32/templates/serviceaccount.yaml