diff --git a/customers/base/nextcloud-deployment.yml b/customers/base/nextcloud-deployment.yml index 424d6e5..4ac21bb 100644 --- a/customers/base/nextcloud-deployment.yml +++ b/customers/base/nextcloud-deployment.yml @@ -24,13 +24,25 @@ spec: - name: customer image: docker.sunet.se/drive/nextcloud-custom:25.0.3.3-4 volumeMounts: - - name: server-storage - mountPath: /var/www/html - subPath: server-data - name: nextcloud-config - mountPath: /var/www/html/config + mountPath: /var/www/html/config/config.php subPath: config.php + initContainers: + - image: docker.sunet.se/sunet/docker-jinja:latest + name: init-config + volumeMounts: + - name: nextcloud-config-template + mountPath: /tmp/config.php.template + subPath: config.php + - name: nextcloud-config + mountPath: /var/www/html/config/config.php + subPath: config.php env: + - name: ADMIN_PASSWORD + valueFrom: + secretKeyRef: + name: proxysql-secret + key: "proxysql_admin_password" - name: GSS_MASTER_URL value: "https://drive.test.sunet.se" - name: GSS_JWT_KEY @@ -123,22 +135,7 @@ spec: key: "redis_password" - name: SITE_NAME value: "customer.drive.test.sunet.se" - initContainers: - - image: docker.sunet.se/sunet/docker-jinja:latest - name: init-config - volumeMounts: - - name: nextcloud-config-template - mountPath: /tmp/config.php.template - subPath: config.php - - name: nextcloud-config - mountPath: /var/www/html/config - subPath: config.php - env: - - name: ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: proxysql-secret - key: "proxysql_admin_password" + command: ["/bin/sh", "-c", "/usr/bin/j2 -f env -o /var/www/html/config/config.php /tmp/config.php.template"] volumes: - name: nextcloud-config-template configMap: diff --git a/customers/overlays/vr/test/nextcloud-deployment.yml b/customers/overlays/vr/test/nextcloud-deployment.yml index 9030a60..c4e4317 100644 --- a/customers/overlays/vr/test/nextcloud-deployment.yml +++ b/customers/overlays/vr/test/nextcloud-deployment.yml @@ -6,10 +6,13 @@ metadata: labels: app: customer-node spec: - template: + replicas: 1 + selector: + matchLabels: + app: customer-node spec: - containers: - - name: customer-node + initContainers: + - name: init-config env: - name: GSS_MASTER_URL value: "https://drive.test.sunet.se" @@ -19,18 +22,9 @@ spec: value: "drive.test.sunet.se" - name: MAIL_SMTPNAME value: "noreply@drive.test.sunet.se" - - name: MYSQL_DATABASE - value: "vr_nextcloud" - - name: MYSQL_USER - value: "vr_nextcloud" - name: NEXTCLOUD_TRUSTED_DOMAINS - value: "vr.drive.test.sunet.se" - - name: NEXTCLOUD_VERSION_STRING - value: "25.0.3.3" + value: "customer.drive.test.sunet.se" - name: OBJECTSTORE_S3_BUCKET value: "primary-vr-drive-test.sunet.se" - name: SITE_NAME value: "vr.drive.test.sunet.se" - resources: {} - strategy: {} -status: {}