From 8564500ac50726b28a706a40d0d8ddc80d2fdbe0 Mon Sep 17 00:00:00 2001 From: MergeCheck Date: Tue, 7 Jul 2026 09:53:42 -0300 Subject: [PATCH 1/2] chore(drupal): bump drupal to 11.4.0 --- charts/drupal/Chart.yaml | 2 +- charts/drupal/README.md | 12 +++++------- charts/drupal/tests/deployment_test.yaml | 4 ++-- charts/drupal/values.yaml | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/charts/drupal/Chart.yaml b/charts/drupal/Chart.yaml index 8a60d22c..e9bc3a35 100644 --- a/charts/drupal/Chart.yaml +++ b/charts/drupal/Chart.yaml @@ -4,7 +4,7 @@ name: drupal description: Production-ready Drupal CMS with seeded sites persistence, S3 backups, and safe horizontal scaling controls type: application version: 1.2.8 -appVersion: "11.3.13" +appVersion: "11.4.0" kubeVersion: ">=1.26.0-0" maintainers: - name: helmforgedev diff --git a/charts/drupal/README.md b/charts/drupal/README.md index 5cd9a1cb..4ccce6e6 100644 --- a/charts/drupal/README.md +++ b/charts/drupal/README.md @@ -6,7 +6,7 @@ Important runtime note: - This chart uses `docker.io/library/drupal`. - Drupal upstream does not currently publish its own upstream-maintained runtime container image. -- HelmForge pins the Docker Official Apache image explicitly to `11.3.13-php8.5-apache-bookworm`, which is published by the Docker Official Drupal image repository. +- HelmForge pins the Docker Official Apache image explicitly to `11.4.0-php8.5-apache-bookworm`, which is published by the Docker Official Drupal image repository. - The chart prepares runtime, persistence, ingress, backup automation, and database connectivity, then guides the final site installation through Drupal's web installer. ## Install @@ -44,7 +44,7 @@ Then: ## Why This Chart Is Different -- **Pinned production image** — uses `drupal:11.3.13-php8.5-apache-bookworm`, keeping the Drupal release, PHP runtime, and Debian base explicit +- **Pinned production image** — uses `drupal:11.4.0-php8.5-apache-bookworm`, keeping the Drupal release, PHP runtime, and Debian base explicit - **Seeded `sites/` persistence** — preserves installer output and uploads without masking Drupal core files from the image - **Built-in backup automation** — archives `sites/` and backs up either MySQL or SQLite to S3-compatible storage - **Safe scaling model** — single replica by default, with fail-fast guardrails for multi-replica or HPA use @@ -53,10 +53,8 @@ Then: ## Upstream Version Notes -Drupal `11.3.13` is an upstream patch release for Drupal 11. The official -release notes state that it is ready for production use and resolves Composer -security errors from third-party components when installing -`drupal/core-recommended`. +Drupal `11.4.0` is an upstream release for Drupal 11. Review the official +Drupal release notes before upgrading production workloads. ## Production Example @@ -144,7 +142,7 @@ mysql: |-----|---------|-------------| | `replicaCount` | `1` | Number of Drupal replicas. | | `image.repository` | `docker.io/library/drupal` | Drupal image repository. | -| `image.tag` | `11.3.13-php8.5-apache-bookworm` | Drupal image tag. | +| `image.tag` | `11.4.0-php8.5-apache-bookworm` | Drupal image tag. | | `database.mode` | `auto` | Database mode: `auto`, `external`, `mysql`, or `sqlite`. | | `mysql.enabled` | `true` | Deploy bundled MySQL. | | `mysql.auth.database` | `drupal` | Database name created by the MySQL subchart. | diff --git a/charts/drupal/tests/deployment_test.yaml b/charts/drupal/tests/deployment_test.yaml index 6cb62f71..775a15f3 100644 --- a/charts/drupal/tests/deployment_test.yaml +++ b/charts/drupal/tests/deployment_test.yaml @@ -52,7 +52,7 @@ tests: asserts: - equal: path: spec.template.spec.containers[0].image - value: docker.io/library/drupal:11.3.13-php8.5-apache-bookworm + value: docker.io/library/drupal:11.4.0-php8.5-apache-bookworm - it: should include the seed-sites init container template: templates/deployment.yaml @@ -62,7 +62,7 @@ tests: value: seed-sites - equal: path: spec.template.spec.initContainers[0].image - value: docker.io/library/drupal:11.3.13-php8.5-apache-bookworm + value: docker.io/library/drupal:11.4.0-php8.5-apache-bookworm - it: should mount the sites directory template: templates/deployment.yaml diff --git a/charts/drupal/values.yaml b/charts/drupal/values.yaml index 3b5e159f..82c4ea4e 100644 --- a/charts/drupal/values.yaml +++ b/charts/drupal/values.yaml @@ -27,7 +27,7 @@ image: # -- Drupal container image repository repository: docker.io/library/drupal # -- Drupal container image tag - tag: "11.3.13-php8.5-apache-bookworm" + tag: "11.4.0-php8.5-apache-bookworm" # -- Image pull policy pullPolicy: IfNotPresent From 2556fee77f670bd3781bda3a7e2dfe788809e0b6 Mon Sep 17 00:00:00 2001 From: MergeCheck Date: Tue, 7 Jul 2026 18:59:29 -0300 Subject: [PATCH 2/2] docs(drupal): restore upgrade guidance --- charts/drupal/README.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/charts/drupal/README.md b/charts/drupal/README.md index 4ccce6e6..9c8f103a 100644 --- a/charts/drupal/README.md +++ b/charts/drupal/README.md @@ -53,8 +53,15 @@ Then: ## Upstream Version Notes -Drupal `11.4.0` is an upstream release for Drupal 11. Review the official -Drupal release notes before upgrading production workloads. +Drupal `11.4.0` is an upstream feature minor release for Drupal 11 and is +marked by upstream as ready for production sites. The release changes the +Composer dependency policy for `drupal/core-recommended`: Guzzle, Twig, and +Symfony polyfills are no longer pinned there, so security and patch updates can +be applied without waiting for a new Drupal core release. + +Before upgrading production workloads, test the site in staging with the same +PHP extensions, Composer dependency set, storage class, and database mode used +in production. ## Production Example