Release 1.0.3

Merge branch 'main' into production

Author: tormi

.circleci/config.yml

@@ -10,18 +10,26 @@ executors:
     docker:
       - image: wunderio/silta-cicd:circleci-php8.3-node22-composer2-v1
 
+# Define shared branch filters as reusable anchors.
+branch-filters:
+  &ignored-branches
+  branches:
+    ignore:
+      - production
+      - main
+      - /dependabot\/.*/
+      # Remove the following filters from actual project configuration.
+      - /^10\..*/
+      - /^11\..*/
+
 workflows:
   commit:
     jobs:
       - approval:
           type: approval
           name: approve-deployment
           filters:
-            branches:
-              ignore:
-                - production
-                - main
-                - /dependabot\/.*/
+            <<: *ignored-branches
 
       - silta/drupal-validate:
           name: validate
@@ -48,14 +56,9 @@ workflows:
             - analyze
             - approve-deployment
           filters:
-            branches:
-              ignore:
-                - production
-                - main
-                - /dependabot\/.*/
+            <<: *ignored-branches
 
       # Deploy job for feature environments.
-      # Other jobs defined below extend this job.
       - silta/drupal-deploy: &deploy
           name: deploy
           executor: silta
@@ -74,14 +77,9 @@ workflows:
           requires:
             - build
           filters:
-            branches:
-              ignore:
-                - production
-                - main
-                - /dependabot\/.*/
+            <<: *ignored-branches
 
       # Build job for main environment.
-      # Extends the job defined for feature environments.
       - silta/drupal-build:
           <<: *build
           name: build-main

composer.json

@@ -19,18 +19,18 @@
         "composer/installers": "^2.3",
         "cweagans/composer-patches": "^1.7",
         "drupal/admin_toolbar": "^3.5",
-        "drupal/core-composer-scaffold": "^10.3",
-        "drupal/core-recommended": "^10.3",
+        "drupal/core-composer-scaffold": "^10.4",
+        "drupal/core-recommended": "^10.4",
         "drupal/monolog": "^3.0",
         "drupal/purge": "^3.6",
         "drupal/simplei": "^2.1",
         "drupal/varnish_purge": "^2.2",
-        "drush/drush": "^12.5",
+        "drush/drush": "^13.3",
         "vlucas/phpdotenv": "^5.6",
         "wunderio/drupal-ping": "^2.5"
     },
     "require-dev": {
-        "drupal/core-dev": "^10.3",
+        "drupal/core-dev": "^10.4",
         "wunderio/code-quality": "^3.0"
     },
     "conflict": {

drush/Commands/SiltaAliasAlterCommands.php

@@ -34,7 +34,7 @@ class SiltaAliasAlterCommands extends DrushCommands implements SiteAliasManagerA
     public function alter(InputInterface $input, AnnotationData $annotationData) {
         $self = $this->siteAliasManager()->getSelf();
 
-        $aliases_to_alter = ['@self.current', '@self.main'];
+        $aliases_to_alter = ['@self.current', '@self.main', '@self.prod'];
 
         if (in_array($self->name(), $aliases_to_alter)) {
             // Get branch name we're currently on.

silta/silta-main.yml

@@ -1,4 +1,7 @@
-# Overrides used for main branch.
+# Main environment configuration.
+#
+# Override the default values of Wunder's Drupal Helm chart and silta.yml.
+# @see: https://github.com/wunderio/charts/blob/master/drupal/values.yaml
 
 php:
   cron:

silta/silta-prod.yml

@@ -1,36 +1,45 @@
+# Production environment configuration.
+#
 # Override the default values of Wunder's Drupal Helm chart and silta.yml.
 # @see: https://github.com/wunderio/charts/blob/master/drupal/values.yaml
 
-# Enable autoscaling for production.
+# Enable autoscaling.
 autoscaling:
   enabled: true
   minReplicas: 2
   maxReplicas: 5
 
-# Don't delay the production deployment process to create the reference data.
+# Reference data configuration.
 referenceData:
+  # Don't delay the production deployment process with reference data updates.
   updateAfterDeployment: false
 
-# Enable daily backups.
+# Enable backups.
 backup:
   enabled: true
 
+# PHP configuration.
 php:
   cron:
     drupal:
-      # In production environments, run cron every 5 minutes. Adjust as needed.
-      schedule: '*/5 * * * *'
-  # Reserve more resources for our PHP containers.
+      # Run cron every 5 minutes. Adjust as needed.
+      schedule: "*/5 * * * *"
   resources:
     requests:
       cpu: 200m
       memory: 256M
     limits:
       cpu: 500m
       memory: 512M
+  # Set the preproduction environment URI.
+  # Update this to match the production URI during the site launch.
+  env:
+    DRUSH_OPTIONS_URI: "https://production.drupal-project.finland.wdr.io"
+
   # Don't show errors in production.
   errorLevel: "hide"
 
+# Nginx configuration.
 nginx:
   resources:
     requests:
@@ -39,19 +48,21 @@ nginx:
     limits:
       cpu: 100m
       memory: 150M
-# Uncomment these lines to disable basic auth protection.
+
+# Uncomment to disable basic authentication.
 # basicauth:
 #   enabled: false
 
 # Disable MailHog in production.
 mailhog:
   enabled: false
 
+# MariaDB configuration.
 mariadb:
   master:
     persistence:
-      # Database storage disk space allocation
-      # Request assistance from ops team after changing this on existing deployment.
+      # Database storage disk space allocation.
+      # Request assistance from Ops team to change this on an existing deployment.
       size: 5Gi
     resources:
       requests:
@@ -109,20 +120,11 @@ mariadb:
       socket=/opt/bitnami/mariadb/tmp/mysql.sock
       pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
 
-# Consider enabling memcached service
+# Memcached service configuration.
 # memcached:
 #   enabled: true
 
-# Connect to an externally hosted database.
-#  env:
-#    DB_HOST: 'hosted.database.server.com'
-#    DB_NAME: 'drupal-1A4G3C'
-#    DB_USER: 'drupal'
-#    DB_PASS: 'never store passwords'
-# Disable the built-in database when using an external database.
-#mariadb:
-#  enabled: false
-
+# Varnish service configuration.
 varnish:
   enabled: true
   resources:
@@ -132,6 +134,6 @@ varnish:
     limits:
       cpu: 500m
       memory: 1Gi
-  # See https://varnish-cache.org/docs/6.6/users-guide/storage-backends.html
-  # Disc allocated storage.
-  storageBackend: 'file,/var/lib/varnish/varnish_storage.bin,512M'
+  # Set the storage backend to file.
+  # @see: https://varnish-cache.org/docs/6.6/users-guide/storage-backends.html
+  storageBackend: "file,/var/lib/varnish/varnish_storage.bin,512M"

silta/silta.yml

@@ -1,4 +1,5 @@
-
+# Default Silta environment configuration.
+#
 # Override the default values of Wunder's Drupal Helm chart.
 # @see: https://github.com/wunderio/charts/blob/master/drupal/values.yaml
 
@@ -11,19 +12,21 @@ php:
       # This will avoid running all cron jobs at the same time.
       schedule: '~ 0 31 2 *'
 
-# Configure reference data that will be used when creating new environments.
+# Reference data configuration.
 referenceData:
-  # The name of the environment from which reference data will be copied.
+  # Configure reference data source for new environments.
   referenceEnvironment: 'main'
 
+# Enable MailHog in non-production environments.
 mailhog:
   enabled: true
 
+# MariaDB configuration.
 mariadb:
   master:
     persistence:
-      # Specify the size of the persistent volume (PV) for database storage.
-      # If you need to change this on an existing deployment, request assistance from the ops team.
+      # Database storage disk space allocation.
+      # Request assistance from Ops team to change this on an existing deployment.
       size: 1G
     resources:
       requests:
@@ -80,7 +83,7 @@ mariadb:
       socket=/opt/bitnami/mariadb/tmp/mysql.sock
       pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
 
-# Configure Google Filestore volume for files storage.
+# Configure Google Filestore for public and private files.
 mounts:
   public-files:
     enabled: true
@@ -93,7 +96,7 @@ mounts:
     mountPath: /app/private
     storageClassName: nfs-shared
 
+# Varnish service configuration.
+# @see: https://github.com/wunderio/silta/blob/master/docs/silta-examples.md#using-varnish
 varnish:
-  # See https://github.com/wunderio/silta/blob/master/docs/silta-examples.md#using-varnish
-  # to configure varnish for Your site correctly.
   enabled: true