chart fixes and readme edits

helm/nextcloud/templates/_helpers.tpl

@@ -8,29 +8,40 @@
 {{ define "DATABASE_HOST" }}{{ .Release.Name }}-postgres{{ end }}
 {{ define "POSTGRES_USER" }}postgres{{ end }}
 
-{{/* Postgres password lookup - uses existing password if possible */}}
-{{ define "POSTGRES_PASSWORD" -}}
-{{- $POSTGRES_SECRETS := (lookup "v1" "Secret" .Release.Namespace ( include "POSTGRES_NAME" . )).data -}}
-{{- printf (ternary (dict "POSTGRES_PASSWORD" (randAlphaNum 64 | b64enc)) $POSTGRES_SECRETS (not $POSTGRES_SECRETS)).POSTGRES_PASSWORD -}}
-{{- end }}
-
 {{/* Generated Nextcloud Config */}}
 {{ define "NEXTCLOUD_NAME" }}{{ printf "%s-nextcloud" .Release.Name | lower }}{{ end }}
 {{ define "ADMIN_USER" }}admin{{ end }}
 
-{{/* Nextcloud admin password lookup - uses existing password if possible */}}
-{{- define "NEXTCLOUD_ADMIN_PASSWORD" -}}
-{{/* ternary (create a dict with random NEXTCLOUD_ADMIN_PASSWORD) (actual dictionary) (test whether NEXTCLOUD_SECRETS exists) */}}
-{{- $NEXTCLOUD_SECRETS := (lookup "v1" "Secret" .Release.Namespace ( include "NEXTCLOUD_NAME" . )).data -}}
-{{- printf (ternary (dict "NEXTCLOUD_ADMIN_PASSWORD" (randAlphaNum 64 | b64enc)) $NEXTCLOUD_SECRETS (not $NEXTCLOUD_SECRETS)).NEXTCLOUD_ADMIN_PASSWORD -}}
-{{- end -}}
-
 {{/* Generated Redis Config */}}
 {{ define "REDIS_NAME" }}{{ printf "%s-redis" .Release.Name | lower }}{{ end }}
 {{ define "REDIS_HOST" }}{{ .Release.Name }}-redis{{ end }}
 
-{{/* Redis password lookup - uses existing password if possible */}}
-{{- define "REDIS_PASSWORD" -}}
-{{- $REDIS_SECRETS := (lookup "v1" "Secret" .Release.Namespace ( include "REDIS_NAME" . )).data -}}
-{{- printf (ternary (dict "REDIS_PASSWORD" (randAlphaNum 64 | b64enc)) $REDIS_SECRETS (not $REDIS_SECRETS)).REDIS_PASSWORD -}}
+{{/* Postgres password lookup - uses existing password if possible */}}
+{{ define "POSTGRES_PASSWORD" -}}
+{{- $POSTGRES_SECRET := (lookup "v1" "Secret" .Release.Namespace ( include "POSTGRES_NAME" . )).data -}}
+{{- if $POSTGRES_SECRET -}}
+    {{- printf $POSTGRES_SECRET.POSTGRES_PASSWORD | b64enc -}}
+{{- else -}}
+    {{- printf (required ".Values.postgres.password is required" .Values.postgres.password) | b64enc -}}
 {{- end -}}
+{{- end }}
+
+{{/* Nextcloud admin password lookup - uses existing password if possible */}}
+{{ define "NEXTCLOUD_ADMIN_PASSWORD" -}}
+{{- $NEXTCLOUD_SECRETS := (lookup "v1" "Secret" .Release.Namespace ( include "NEXTCLOUD_NAME" . )).data -}}
+{{- if $NEXTCLOUD_SECRETS -}}
+    {{- printf $NEXTCLOUD_SECRETS.NEXTCLOUD_ADMIN_PASSWORD | b64enc -}}
+{{- else -}}
+    {{- printf (required ".Values.nextcloud.admin.password is required" .Values.nextcloud.admin.password) | b64enc -}}
+{{- end -}}
+{{- end }}
+
+{{/* Redis password lookup - uses existing password if possible */}}
+{{ define "REDIS_PASSWORD" -}}
+{{- $REDIS_SECRETS := (lookup "v1" "Secret" .Release.Namespace ( include "REDIS_NAME" . )).data -}}
+{{- if $REDIS_SECRETS -}}
+    {{- printf $REDIS_SECRETS.REDIS_PASSWORD | b64enc -}}
+{{- else -}}
+    {{- printf (required ".Values.redis.password is required" .Values.redis.password) | b64enc -}}
+{{- end -}}
+{{- end }}

helm/nextcloud/templates/deployment.yaml

@@ -13,6 +13,15 @@ spec:
       labels:
         app.kubernetes.io/name: nextcloud
     spec:
+      tolerations:
+      - key: "node.kubernetes.io/unreachable"
+        operator: "Exists"
+        effect: "NoExecute"
+        tolerationSeconds: 1
+      - key: "node.kubernetes.io/not-ready"
+        operator: "Exists"
+        effect: "NoExecute"
+        tolerationSeconds: 1
       containers:
       - name: nextcloud
         image: {{ .Values.nextcloud.image }}
@@ -94,8 +103,10 @@ spec:
         persistentVolumeClaim:
           claimName: {{ .Release.Name }}-postgres-iops
       - name: redis
-        persistentVolumeClaim:
-          claimName: {{ .Release.Name }}-redis-iops
+        emptyDir:
+          sizeLimit: 2Gi
+        # persistentVolumeClaim:
+        #   claimName: {{ .Release.Name }}-redis-iops
       - name: postgres-init
         secret:
           secretName: {{ .Release.Name }}-postgres-init

helm/nextcloud/templates/nextcloud-data-pvc.yaml

@@ -5,9 +5,9 @@ metadata:
   annotations:
     "helm.sh/resource-policy": keep
 spec:
-  storageClassName: zfs-iscsi-enc0
+  storageClassName: {{ .Values.nextcloud.data.storageClassName }}
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 2Ti
+      storage: {{ .Values.nextcloud.data.storage }}

helm/nextcloud/templates/nextcloud-html-pvc.yaml

@@ -5,9 +5,9 @@ metadata:
   annotations:
     "helm.sh/resource-policy": keep
 spec:
-  storageClassName: zfs-iscsi-enc1
+  storageClassName: {{ .Values.nextcloud.html.storageClassName }}
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 16Gi
+      storage: {{ .Values.nextcloud.html.storage }}

helm/nextcloud/templates/nextcloud-secret.yaml

@@ -9,4 +9,3 @@ data:
   NEXTCLOUD_ADMIN_PASSWORD: {{ include "NEXTCLOUD_ADMIN_PASSWORD" . | quote }}
   POSTGRES_PASSWORD: {{ include "POSTGRES_PASSWORD" . | quote }}
   REDIS_HOST_PASSWORD: {{ include "REDIS_PASSWORD" . | quote }}
-  SMTP_PASSWORD: {{ .Values.SMTP_PASSWORD | b64enc | quote }}

helm/nextcloud/templates/postgres-pvc.yaml

@@ -5,9 +5,9 @@ metadata:
   annotations:
     "helm.sh/resource-policy": keep
 spec:
-  storageClassName: zfs-iscsi-enc1
+  storageClassName: {{ .Values.postgres.storageClassName }}
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 32Gi
+      storage: {{ .Values.postgres.storage }}

helm/nextcloud/templates/redis-pvc.yaml

@@ -5,9 +5,9 @@ metadata:
   annotations:
     "helm.sh/resource-policy": keep
 spec:
-  storageClassName: zfs-iscsi-enc1
+  storageClassName: {{ .Values.redis.storageClassName }}
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 32Gi
+      storage: {{ .Values.redis.storage }}

helm/nextcloud/values.yaml

@@ -1,3 +1,21 @@
 nextcloud:
   image: nextcloud:26.0.7
   domain: nextcloud.reeseapps.com
+  html:
+    storageClassName: zfs-iscsi-enc1
+    storage: 16Gi
+  data:
+    storageClassName: zfs-iscsi-enc1
+    storage: 2Ti
+  admin:
+    password: ""
+
+postgres:
+  storageClassName: zfs-iscsi-enc1
+  storage: 32Gi
+  password: ""
+
+redis:
+  storageClassName: zfs-iscsi-enc1
+  storage: 32Gi
+  password: ""