Merge pull request #509 from wunderio/release/2025-11-04

Release 2025-11-04

Author: ArtisKrumins

drupal/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: drupal
-version: 1.27.0
+version: 1.28.0
 dependencies:
 - name: mariadb
   version: 7.5.x

drupal/templates/_helpers.tpl

@@ -350,7 +350,7 @@ imagePullSecrets:
 {{- define "drupal.wait-for-db-command" }}
 TIME_WAITING=0
 echo "Waiting for database.";
-until mysqladmin status --connect-timeout=2 -u $DB_USER -p$DB_PASS -h $DB_HOST -P ${DB_PORT:-3306} --silent; do
+until mariadb-admin status --connect-timeout=2 -u $DB_USER -p$DB_PASS -h $DB_HOST -P ${DB_PORT:-3306} --silent; do
   echo -n "."
   sleep 5
   TIME_WAITING=$((TIME_WAITING+5))
@@ -363,7 +363,7 @@ done
 {{- end }}
 
 {{- define "drupal.create-db" }}
-mysql -u $DB_USER -p$DB_PASS -h $DB_HOST -P ${DB_PORT:-3306} -e "CREATE DATABASE IF NOT EXISTS $DB_NAME;"
+mariadb -u $DB_USER -p$DB_PASS -h $DB_HOST -P ${DB_PORT:-3306} -e "CREATE DATABASE IF NOT EXISTS $DB_NAME;"
 {{- end }}
 
 {{- define "drupal.wait-for-elasticsearch-command" }}
@@ -490,11 +490,11 @@ if [[ "$(drush status --fields=bootstrap)" = *'Successful'* ]] ; then
       /tmp/db.sql \
       '/-- Table structure for table/-1' \
       '{*}'
-    # First file is the mysqldump header, rename it to "header"
+    # First file is the mariadb-dump header, rename it to "header"
     mv table-0000 header
     # Find last table file
     last_table=$(find -type f -name 'table-*' | sort -n | tail -n1)
-    # Split last table file to extract mysqldump footer, which starts with a line including "@OLD_"
+    # Split last table file to extract mariadb-dump footer, which starts with a line including "@OLD_"
     csplit \
       --silent \
       --prefix='last-' \
@@ -565,12 +565,12 @@ if [ "${REF_DATA_COPY_DB:-}" == "true" ]; then
 
       if [[ "$import_method" == "parallel" ]]; then
         echo "Importing SQL files in parallel. This setting can be changed in silta.yml using the referenceData.databaseImportMethod key."
-        find "${tmp_ref_data}/" -type f -name "*.sql" | xargs -P10 -I{} sh -c 'echo "Importing {}" && mysql -A --user="${DB_USER}" --password="${DB_PASS}" --host="${DB_HOST}" "${DB_NAME}" < {}'
+        find "${tmp_ref_data}/" -type f -name "*.sql" | xargs -P10 -I{} sh -c 'echo "Importing {}" && mariadb -A --user="${DB_USER}" --password="${DB_PASS}" --host="${DB_HOST}" "${DB_NAME}" < {}'
         pipeline_exit_code=$? # Capture exit code of the pipeline (most likely influenced by xargs)
 
         # Check if xargs reported an error (any non-zero exit status)
         if [ "$pipeline_exit_code" -ne 0 ]; then
-          echo "ERROR: One or more parallel imports failed. Check the logs above for specific mysql errors."
+          echo "ERROR: One or more parallel imports failed. Check the logs above for specific mariadb errors."
           exit 1
         fi
 
@@ -580,8 +580,8 @@ if [ "${REF_DATA_COPY_DB:-}" == "true" ]; then
         echo "Importing SQL files sequentially. This setting can be changed in silta.yml using the referenceData.databaseImportMethod key."
         find "${tmp_ref_data}/" -type f -name "*.sql" | sort | while IFS= read -r sql_file; do
           echo "Importing ${sql_file}"
-          if ! mysql -A --user="${DB_USER}" --password="${DB_PASS}" --host="${DB_HOST}" "${DB_NAME}" < "${sql_file}"; then
-            echo "ERROR: Failed to import ${sql_file}. Check the logs above for specific mysql errors."
+          if ! mariadb -A --user="${DB_USER}" --password="${DB_PASS}" --host="${DB_HOST}" "${DB_NAME}" < "${sql_file}"; then
+            echo "ERROR: Failed to import ${sql_file}. Check the logs above for specific mariadb errors."
             exit 1
           fi
         done
@@ -658,8 +658,8 @@ fi
 
   # Take a database dump.
   echo "Starting database backup."
-  /usr/bin/mysqldump -u $DB_USER --password=$DB_PASS -h $DB_HOST --skip-lock-tables --single-transaction --max_allowed_packet=1G --quick $IGNORE_TABLES $DB_NAME > /tmp/db.sql
-  /usr/bin/mysqldump -u $DB_USER --password=$DB_PASS -h $DB_HOST --skip-lock-tables --single-transaction --max_allowed_packet=1G --quick --force --no-data $DB_NAME $IGNORED_TABLES >> /tmp/db.sql
+  /usr/bin/mariadb-dump -u $DB_USER --password=$DB_PASS -h $DB_HOST --skip-lock-tables --single-transaction --max_allowed_packet=1G --quick $IGNORE_TABLES $DB_NAME > /tmp/db.sql
+  /usr/bin/mariadb-dump -u $DB_USER --password=$DB_PASS -h $DB_HOST --skip-lock-tables --single-transaction --max_allowed_packet=1G --quick --force --no-data $DB_NAME $IGNORED_TABLES >> /tmp/db.sql
   echo "Database backup complete."
 {{- end }}
 
@@ -728,7 +728,7 @@ fi
   TIME_WAITING=0
   echo "Waiting for database.";
 
-  until mysqladmin status --connect-timeout=2 -u $DB_USER -p$DB_PASS -h $DB_HOST --protocol=tcp --silent; do
+  until mariadb-admin status --connect-timeout=2 -u $DB_USER -p$DB_PASS -h $DB_HOST --protocol=tcp --silent; do
     echo -n "."
     sleep 1s
     TIME_WAITING=$((TIME_WAITING+1))
@@ -740,7 +740,7 @@ fi
   done
 
   echo "Importing database dump for validation"
-  mysql -u $DB_USER -p$DB_PASS $DB_NAME -h $DB_HOST --protocol=tcp --max_allowed_packet=1G < /tmp/db.sql
+  mariadb -u $DB_USER -p$DB_PASS $DB_NAME -h $DB_HOST --protocol=tcp --max_allowed_packet=1G < /tmp/db.sql
   drush status --fields=bootstrap
 
 {{- end }}

drupal/templates/drupal-configmap.yaml

@@ -154,8 +154,6 @@ data:
       ## This value is set to be identical with PHP's post_max_size.
       client_max_body_size        {{ .Values.php.php_ini.post_max_size }};
       client_body_buffer_size     128k;
-      client_header_buffer_size   4k;
-      large_client_header_buffers 8 16K;
       keepalive_timeout           15 10;
       keepalive_requests          100;
       reset_timedout_connection   on;
@@ -209,6 +207,19 @@ data:
         ~^/(?<no_slash>.*)$ $no_slash;
       }
 
+      {{- if .Values.nginx.httpConfig  }}
+      # nginx.httpConfig values
+      {{- range $k, $v := .Values.nginx.httpConfig  }}
+      {{- if not (eq $v "null") }}
+      {{- if (contains "\n" $v) }}
+      {{- printf "%s %s" $k (tpl $v $) | nindent 6 }}
+      {{- else }}
+      {{ $k }} {{ tpl $v $ }};
+      {{- end }}
+      {{- end }}
+      {{- end }}
+      {{- end }}
+    
       include conf.d/*.conf;
     }
 

drupal/templates/varnish-configmap-vcl.yaml

@@ -434,7 +434,7 @@ data:
         return (synth( 403, "Forbidden"));
       }
 
-      if (req.http.Authorization) {
+      if (req.http.Authorization || client.ip ~ internal) {
         # Not cacheable by default
         return (pass);
       }

drupal/tests/nginx-extra-config_test.yaml

@@ -63,3 +63,29 @@ tests:
                 path: misc.conf
               name: RELEASE-NAME-nginx-extra-conf
             name: nginx-extra-conf
+  - it: httpConfig can be passed
+    template: drupal-configmap.yaml
+    set:
+      nginx.httpConfig:
+        foo: "0"
+        bar: "1"
+        baz: "2"
+    asserts:
+    - matchRegex:
+        path: data.nginx_conf
+        pattern: "foo 0;"
+    - matchRegex:
+        path: data.nginx_conf
+        pattern: "bar 1;"
+    - matchRegex:
+        path: data.nginx_conf
+        pattern: "baz 2;"
+  - it: httpConfig appears in http context
+    template: drupal-configmap.yaml
+    set:
+      nginx.httpConfig:
+        foobar: "123"
+    asserts:
+    - matchRegex:
+        path: data.nginx_conf
+        pattern: "http \\{[\\s\\S]*foobar 123;[\\s\\S]*include conf\\.d/\\*\\.conf;"

drupal/values.schema.json

@@ -151,6 +151,7 @@
         "content_security_policy": { "type": "string" },
         "loglevel": { "type": "string" },
         "comp_level": { "type": "integer" },
+        "httpConfig": { "type": "object" },
         "extraConfig": { "type": "string" },
         "locationExtraConfig": { "type": "string" },
         "serverExtraConfig": { "type": "string" },

drupal/values.yaml

@@ -238,9 +238,15 @@ nginx:
   # Extra configuration block in location context.
   locationExtraConfig: |
 
+  # Note: This will be deprecated in the future, use nginx.httpConfig instead.
   # Extra configuration to pass to nginx as a file
   extraConfig: |
 
+  # Configuration for http context.
+  httpConfig:
+    client_header_buffer_size: "4k"
+    large_client_header_buffers: "8 16K"
+
   # Toggle open_files_cache.
   # Naming follows https://nginx.org/en/docs/http/ngx_http_core_module.html#open_file_cache directive
   open_file_cache:
@@ -626,7 +632,7 @@ mariadb:
     # https://hub.docker.com/r/wunderio/bitnami-mariadb/tags
     registry: docker.io
     repository: wunderio/bitnami-mariadb
-    tag: 10.6-debian-12
+    tag: 11.4-debian-12
   replication:
     enabled: false
   db:

frontend/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: frontend
-version: 1.23.0
+version: 1.24.0
 dependencies:
 - name: mariadb
   version: 7.10.x

frontend/templates/configmap.yaml

@@ -69,8 +69,6 @@ data:
       client_header_timeout       60s;
       client_max_body_size        32m;
       client_body_buffer_size     16k;
-      client_header_buffer_size   4k;
-      large_client_header_buffers 8 16K;
       keepalive_timeout           75s;
       keepalive_requests          100;
       reset_timedout_connection   off;
@@ -115,6 +113,19 @@ data:
       map $http_x_proxy_auth $proxy_auth { default 0; '{{ .Values.nginx.x_proxy_auth }}' 1; }
       {{- end}}
 
+      {{- if .Values.nginx.httpConfig  }}
+      # nginx.httpConfig values
+      {{- range $k, $v := .Values.nginx.httpConfig  }}
+      {{- if not (eq $v "null") }}
+      {{- if (contains "\n" $v) }}
+      {{- printf "%s %s" $k (tpl $v $) | nindent 6 }}
+      {{- else }}
+      {{ $k }} {{ tpl $v $ }};
+      {{- end }}
+      {{- end }}
+      {{- end }}
+      {{- end }}
+
       include conf.d/*.conf;
     }
 

frontend/templates/varnish-configmap-vcl.yaml

@@ -135,7 +135,7 @@ data:
       }
 
       # Do not cache requests with Authorization header
-      if (req.http.Authorization) {
+      if (req.http.Authorization || client.ip ~ internal) {
         return (pass);
       }