From 48e8fdd51288bf5b02e9b0bea1cbd7ab114a1d36 Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Fri, 24 Jan 2025 16:20:40 +0100 Subject: [PATCH] try without init-container and pvc --- customers/base/nextcloud-configmap.yml | 52 ++++++------ customers/base/nextcloud-deployment.yml | 79 +++++++------------ .../nordunet/test/nextcloud-deployment.yml | 5 +- .../vinnova/test/nextcloud-deployment.yml | 5 +- 4 files changed, 59 insertions(+), 82 deletions(-) diff --git a/customers/base/nextcloud-configmap.yml b/customers/base/nextcloud-configmap.yml index f789037..215b3c6 100644 --- a/customers/base/nextcloud-configmap.yml +++ b/customers/base/nextcloud-configmap.yml @@ -29,37 +29,37 @@ data: 'config_is_read_only' => true, 'csrf.disabled' => true, 'datadirectory' => '/var/www/html/data', - 'dbhost' => '{{MYSQL_HOST}}:{{MYSQL_PORT}}', - 'dbname' => '{{MYSQL_DATABASE}}', - 'dbpassword' => '{{MYSQL_PASSWORD}}', - 'dbport' => '{{MYSQL_PORT}}', + 'dbhost' => getenv('MYSQL_HOST') . ':' .getenv('MYSQL_PORT'), + 'dbname' => getenv('MYSQL_DATABASE'), + 'dbpassword' => getenv('MYSQL_PASSWORD'), + 'dbport' => getenv('MYSQL_PORT'), 'dbtableprefix' => 'oc_', 'dbtype' => 'mysql', - 'dbuser' => '{{MYSQL_USER}}', + 'dbuser' => getenv('MYSQL_USER'), 'default_phone_region' => 'SE', 'forcessl' => true, 'gs.enabled' => 'true', 'gs.federation' => 'global', 'gs.trustedHosts' => ['*.sunet.se'], - 'gss.jwt.key' => '{{GSS_JWT_KEY}}', - 'gss.master.url' => '{{GSS_MASTER_URL}}', + 'gss.jwt.key' => getenv('GSS_JWT_KEY'), + 'gss.master.url' => getenv('GSS_MASTER_URL'), 'gss.mode' => 'slave', 'gss.user.discovery.module' => '\\OCA\\GlobalSiteSelector\\UserDiscoveryModules\\ManualUserMapping', 'installed' => true, - 'instanceid' => '{{NEXTCLOUD_INSTANCEID}}', + 'instanceid' => getenv('NEXTCLOUD_INSTANCEID'), 'integrity.check.disabled' => true, 'log_type' => 'file', 'loglevel' => 0, - 'lookup_server' => '{{LOOKUP_SERVER}}', - 'mail_domain' => '{{MAIL_DOMAIN}}', - 'mail_from_address' => '{{MAIL_FROM_ADDRESS}}', + 'lookup_server' => getenv('LOOKUP_SERVER'), + 'mail_domain' => getenv('MAIL_DOMAIN'), + 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'), 'mail_sendmailmode' => 'smtp', 'mail_smtpauth' => 1, 'mail_smtpauthtype' => 'LOGIN', - 'mail_smtphost' => '{{MAIL_SMTPHOST}}', + 'mail_smtphost' => getenv('MAIL_SMTPHOST'), 'mail_smtpmode' => 'smtp', - 'mail_smtpname' => '{{MAIL_SMTPNAME}}', - 'mail_smtppassword' => '{{MAIL_SMTPPASSWORD}}', + 'mail_smtpname' => getenv('MAIL_SMTPNAME'), + 'mail_smtppassword' => getenv('MAIL_SMTPPASSWORD'), 'mail_smtpport' => '587', 'mail_smtpsecure' => 'tls', 'mail_template_class' => 'OCA\DriveEmailTemplate\EMailTemplate', @@ -73,33 +73,33 @@ data: 'arguments' => array ( 'autocreate' => false, - 'bucket' => '{{OBJECTSTORE_S3_BUCKET}}', - 'hostname' => '{{OBJECTSTORE_S3_HOST}}', - 'key' => '{{OBJECTSTORE_S3_KEY}}', + 'bucket' => getenv('OBJECTSTORE_S3_BUCKET'), + 'hostname' => getenv('OBJECTSTORE_S3_HOST'), + 'key' => getenv('OBJECTSTORE_S3_KEY'), 'legacy_auth' => false, 'objectPrefix' => 'urn:oid:', 'port' => '', - 'region' => '{{OBJECTSTORE_S3_REGION}}', - 'secret' => '{{OBJECTSTORE_S3_SECRET}}', + 'region' => getenv('OBJECTSTORE_S3_REGION'), + 'secret' => getenv('OBJECTSTORE_S3_SECRET'), 'use_path_style' => true, 'use_ssl' => true, ), ), - 'overwrite.cli.url' => 'https://{{SITE_NAME}}', - 'overwritehost' => '{{SITE_NAME}}', + 'overwrite.cli.url' => 'https://getenv('SITE_NAME'), + 'overwritehost' => getenv('SITE_NAME'), 'overwriteprotocol' => 'https', - 'passwordsalt' => '{{NEXTCLOUD_PASSWORDSALT}}', - 'secret' => '{{NEXTCLOUD_SECRET}}', + 'passwordsalt' => getenv('NEXTCLOUD_PASSWORDSALT'), + 'secret' => getenv('NEXTCLOUD_SECRET'), 'redis' => array ( - 'host' => '{{REDIS_HOST}}', + 'host' => getenv('REDIS_HOST'), 'port' => 6379, ), 'skeletondirectory' => '', 'templatedirectory' => '', 'trusted_domains' => array ( - 0 => '{{NEXTCLOUD_TRUSTED_DOMAINS}}' + 0 => getenv('NEXTCLOUD_TRUSTED_DOMAINS') ), 'trusted_proxies' => array ( @@ -111,5 +111,5 @@ data: 0 => 'admin', ), 'updatechecker' => false, - 'version' => '{{NEXTCLOUD_VERSION_STRING}}', + 'version' => getenv('NEXTCLOUD_VERSION_STRING'), ); diff --git a/customers/base/nextcloud-deployment.yml b/customers/base/nextcloud-deployment.yml index afabe94..b6fed7c 100644 --- a/customers/base/nextcloud-deployment.yml +++ b/customers/base/nextcloud-deployment.yml @@ -11,16 +11,6 @@ spec: app: customer-node updateStrategy: type: RollingUpdate - volumeClaimTemplates: - - metadata: - name: nextcloud-data - spec: - storageClassName: csi-sc-cinderplugin - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 1Gi template: metadata: labels: @@ -32,9 +22,9 @@ spec: - name: customer image: docker.sunet.se/drive/nextcloud-custom:30.0.5.2-1 volumeMounts: - - name: nextcloud-data - mountPath: /var/www/html/config/ - subPath: config + - name: nextcloud-config + mountPath: /var/www/html/config/config.php + subPath: config.php - name: apache-config mountPath: /etc/apache2/sites-enabled/000-default.conf subPath: 000-default.conf @@ -50,42 +40,6 @@ spec: - name: cli-php-config mountPath: /etc/php/8.0/cli/php.ini subPath: php.ini - resources: - limits: - cpu: 2000m - memory: 2048Mi - requests: - cpu: 1000m - memory: 512Mi - readinessProbe: - tcpSocket: - port: 80 - initialDelaySeconds: 10 - periodSeconds: 60 - livenessProbe: - tcpSocket: - port: 80 - initialDelaySeconds: 20 - periodSeconds: 180 - ports: - - containerPort: 80 - name: nextcloud-http - command: ["/bin/bash"] - args: ["-c", "apachectl -D FOREGROUND"] - lifecycle: - postStart: - exec: - command: ["/bin/bash", "-c", "/usr/local/bin/nc-upgrade"] - initContainers: - - image: docker.sunet.se/sunet/docker-jinja:latest - name: init-config - volumeMounts: - - name: nextcloud-config - mountPath: /tmp/config.php.template - subPath: config.php - - name: nextcloud-data - mountPath: /var/www/html/config - subPath: config env: - name: GSS_MASTER_URL value: "https://drive.test.sunet.se" @@ -174,7 +128,32 @@ spec: value: "redis" - name: SITE_NAME value: "customer.drive.test.sunet.se" - command: ["/bin/bash", "-c", "/usr/bin/j2 -f env -o /var/www/html/config/config.php /tmp/config.php.template"] + resources: + limits: + cpu: 2000m + memory: 2048Mi + requests: + cpu: 1000m + memory: 512Mi + readinessProbe: + tcpSocket: + port: 80 + initialDelaySeconds: 10 + periodSeconds: 60 + livenessProbe: + tcpSocket: + port: 80 + initialDelaySeconds: 20 + periodSeconds: 180 + ports: + - containerPort: 80 + name: nextcloud-http + command: ["/bin/bash"] + args: ["-c", "apachectl -D FOREGROUND"] + lifecycle: + postStart: + exec: + command: ["/bin/bash", "-c", "/usr/local/bin/nc-upgrade"] volumes: - name: script-config configMap: diff --git a/customers/overlays/nordunet/test/nextcloud-deployment.yml b/customers/overlays/nordunet/test/nextcloud-deployment.yml index ad89cbd..ed9c0ee 100644 --- a/customers/overlays/nordunet/test/nextcloud-deployment.yml +++ b/customers/overlays/nordunet/test/nextcloud-deployment.yml @@ -11,9 +11,8 @@ spec: labels: app: customer-node spec: - initContainers: - - image: docker.sunet.se/sunet/docker-jinja:latest - name: init-config + containers: + - name: customer env: - name: MYSQL_DATABASE value: "nextcloud_nordunet" diff --git a/customers/overlays/vinnova/test/nextcloud-deployment.yml b/customers/overlays/vinnova/test/nextcloud-deployment.yml index bb8cb30..5b671e0 100644 --- a/customers/overlays/vinnova/test/nextcloud-deployment.yml +++ b/customers/overlays/vinnova/test/nextcloud-deployment.yml @@ -10,9 +10,8 @@ spec: labels: app: customer-node spec: - initContainers: - - image: docker.sunet.se/sunet/docker-jinja:latest - name: init-config + containers: + - name: customer env: - name: MYSQL_DATABASE value: "nextcloud_vinnova"