diff --git a/charts/develop/nextcloud/Chart.yaml b/charts/develop/nextcloud/Chart.yaml index 83d5d6f2cde..340da832be3 100644 --- a/charts/develop/nextcloud/Chart.yaml +++ b/charts/develop/nextcloud/Chart.yaml @@ -35,5 +35,4 @@ sources: - https://github.com/nextcloud/docker - https://github.com/nextcloud/helm type: application -version: 1.0.8 - +version: 1.0.9 diff --git a/charts/develop/nextcloud/SCALE/questions.yaml b/charts/develop/nextcloud/SCALE/questions.yaml index 09d3a201ecc..e06f046a97c 100644 --- a/charts/develop/nextcloud/SCALE/questions.yaml +++ b/charts/develop/nextcloud/SCALE/questions.yaml @@ -104,6 +104,20 @@ questions: schema: type: string default: "002" + - variable: NEXTCLOUD_ADMIN_USER + label: "NEXTCLOUD_ADMIN_USER" + description: "Sets nextcloud admin username" + schema: + type: string + required: true + default: "" + - variable: NEXTCLOUD_ADMIN_PASSWORD + label: "NEXTCLOUD_ADMIN_PASSWORD" + description: "Sets nextcloud admin password" + schema: + type: string + required: true + default: "" # Configure Enviroment Variables - variable: envList @@ -512,61 +526,7 @@ questions: show_if: [["type", "=", "pvc"]] type: string default: "100Gi" - - variable: dbbackup - label: "Database Backup Storage" - description: "Stores the Application database backups." - schema: - type: dict - attrs: - - variable: enabled - label: "Enable the storage" - schema: - type: boolean - default: true - - variable: storageClass - label: "Type of Storage" - description: " Warning: Anything other than Internal will break rollback!" - schema: - type: string - default: "SCALE-ZFS" - - variable: mountPath - label: "mountPath" - description: "Path inside the container the storage is mounted" - schema: - type: string - default: "" - hidden: true - - variable: medium - label: "EmptyDir Medium" - schema: - show_if: [["type", "=", "emptyDir"]] - type: string - default: "" - enum: - - value: "" - description: "Default" - - value: "Memory" - description: "Memory" - - variable: accessMode - label: "Access Mode (Advanced)" - description: "Allow or disallow multiple PVC's writhing to the same PV" - schema: - show_if: [["type", "=", "pvc"]] - type: string - default: "ReadWriteOnce" - enum: - - value: "ReadWriteOnce" - description: "ReadWriteOnce" - - value: "ReadOnlyMany" - description: "ReadOnlyMany" - - value: "ReadWriteMany" - description: "ReadWriteMany" - - variable: size - label: "Size quotum of storage" - schema: - show_if: [["type", "=", "pvc"]] - type: string - default: "100Gi" + - variable: persistenceList label: "Additional app storage" group: "Storage and Persistence" diff --git a/charts/develop/nextcloud/values.yaml b/charts/develop/nextcloud/values.yaml index f1ef799a792..1ddab62391e 100644 --- a/charts/develop/nextcloud/values.yaml +++ b/charts/develop/nextcloud/values.yaml @@ -14,13 +14,14 @@ service: main: port: 80 -env: {} +env: + NEXTCLOUD_ADMIN_USER: "admin" + NEXTCLOUD_ADMIN_PASSWORD: "adminpass" envTpl: POSTGRES_DB: "{{ .Values.postgresql.postgresqlDatabase }}" POSTGRES_USER: "{{ .Values.postgresql.postgresqlUsername }}" - envFrom: - configMapRef: name: nextcloudconfig @@ -59,10 +60,6 @@ persistence: enabled: true type: emptyDir - dbbackup: - enabled: true - type: emptyDir - initContainers: - name: init-postgresdb image: postgres:13.1