Cleaning base and improving overlay dev

overlays/dev/patches/deployment.yaml

@@ -14,10 +14,21 @@ spec:
         - $(MINIO_BOOTSTRAP_JOB_NAME)
       containers:
       - name: nextcloud
-        #envFrom:
-        #- configMapRef:
-        #  name: nextcloud-env-update
         env:
+        - name: POSTGRES_USER
+          valueFrom:
+            secretKeyRef:
+              name: nextcloud-postgres-app
+              key: username
+        - name: POSTGRES_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: nextcloud-postgres-app
+              key: password
+        - name: OBJECTSTORE_S3_BUCKET
+          value: nxt-minio
+        - name: OBJECTSTORE_S3_AUTOCREATE
+          value: "true"
         - name: OBJECTSTORE_S3_KEY
           valueFrom:
             secretKeyRef:
@@ -28,6 +39,14 @@ spec:
             secretKeyRef:
               name: nextcloud-minio-user
               key: CONSOLE_SECRET_KEY
+        - name: OBJECTSTORE_S3_HOST
+          value: minio:$(MINIO_SERVICE_PORT)
+        - name: OBJECTSTORE_S3_PORT
+          value: "443"
+        - name: OBJECTSTORE_S3_SSL
+          value: "true"
+        - name: OBJECTSTORE_S3_USEPATH_STYLE
+          value: "true"
 
         livenessProbe:
           httpGet:
@@ -57,9 +76,6 @@ spec:
         - mountPath: /docker-entrypoint-hooks.d/post-installation/ldap.sh
           name: script-config-ldap
           subPath: poststart-ldap.sh
-        - mountPath: /docker-entrypoint-hooks.d/before-starting/plugins.sh
-          name: script-config-plugins
-          subPath: poststart-plugins.sh
         - mountPath: /etc/minio-ccerts
           name: minio-certs
           readOnly: true
@@ -71,9 +87,5 @@ spec:
         configMap:
           name: script-config-ldap
           defaultMode: 0755
-      - name: script-config-plugins
-        configMap:
-          name: script-config-plugins
-          defaultMode: 0755
       restartPolicy: Always
       serviceAccountName: nextcloud-sa

overlays/dev/patches/nextcloud-cpng.yaml

@@ -1,9 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: Cluster
-metadata:
-  name: nextcloud-postgres
-spec:
-  instances: 3
-  storage:
-    size: 50Gi
-    storageClass: directpv-min-io

overlays/dev/resources/nextcloud/cm-plugins-script.yaml

@@ -1,34 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: script-config-plugins
-data:
-  poststart-plugins.sh: |
-    #!/bin/sh
-    set -eu
-    ( 
-      if ! flock -n 7; then
-        echo "Another process is installing plugins. waiting"
-        flock 7
-        exit 0
-      fi
-
-      echo "Installing default apps"
-      plugin_list="${NEXTCLOUD_PLUGIN_LIST}"
-      OPTS=""
-      occ="/var/www/html/occ"
-
-      installed_apps=$(mktemp)
-      /bin/sh -c "${occ} app:list" | awk '!/Enabled|Disabled/ {print substr($2, 1, length($2)-1)}' > "${installed_apps}"
-
-      for plugin in ${plugin_list}; do
-        if ! grep -q "${plugin}" "${installed_apps}"; then
-          /bin/sh -c "${occ} ${OPTS} app:install ${plugin}"
-          /bin/sh -c "${occ} ${OPTS} app:update ${plugin}"
-          /bin/sh -c "${occ} ${OPTS} app:enable ${plugin}"
-        else
-          echo "${plugin} allready installed"
-        fi
-      done
-    ) 7> /var/www/html/nextcloud-plugin-install.lock
-    echo "Apps installation finished"

overlays/dev/resources/nextcloud/minio-tenant.yaml

@@ -8,28 +8,6 @@ spec:
     - "minio"
   pools:
   - servers: 2
-    affinity:
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-          - matchExpressions:
-            - key: role
-              operator: In
-              values:
-              - storage
-      podAntiAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-        - labelSelector:
-            matchExpressions:
-            - key: v1.min.io/tenant
-              operator: In
-              values:
-              - cds
-            - key: v1.min.io/pool
-              operator: In
-              values:
-              - pool-0
-          topologyKey: kubernetes.io/hostname
     name: pool-0
     volumesPerServer: 3
     volumeClaimTemplate:
@@ -41,7 +19,6 @@ spec:
         resources:
           requests:
             storage: 3Gi
-        storageClassName: directpv-min-io
     containerSecurityContext:
       runAsUser: 1000
       runAsGroup: 1000