Feature/nginx cron (#436)

* nginx, cronjob tweaks, version dependant hpa

Author: agnis-mateuss

charts/drupal/templates/_helpers.tpl

@@ -548,3 +548,20 @@ set -e
 if [ -f /lagoon/entrypoints.sh ] ; then /lagoon/entrypoints.sh ; fi
 
 {{- end }}
+
+
+{{- define "drupal.cron.api-version" }}
+{{- if semverCompare ">=1.21" .Capabilities.KubeVersion.Version }}
+batch/v1
+{{- else }}
+batch/v1beta1
+{{- end }}
+{{- end }}
+
+{{- define "drupal.autoscaling.api-version" }}
+{{- if semverCompare ">=1.23" .Capabilities.KubeVersion.Version }}
+autoscaling/v2
+{{- else }}
+autoscaling/v2beta1
+{{- end }}
+{{- end }}

charts/drupal/templates/backup-cron.yaml

@@ -1,7 +1,7 @@
 {{- if .Values.backup.enabled }}
 {{- $db_password := randAlphaNum 20 }}
 {{- $params := dict "db_password" $db_password  -}}
-apiVersion: batch/v1beta1
+apiVersion: {{ include "drupal.cron.api-version" $ | trim }}
 kind: CronJob
 metadata:
   name: {{ .Release.Name }}-backup

charts/drupal/templates/drupal-configmap.yaml

@@ -463,7 +463,11 @@ data:
                 expires         365d;
                 add_header Cache-Control "public";
                 ## Set the OS file cache.
-                open_file_cache max=10000 inactive=120s;
+                {{- if .Values.nginx.open_file_cache.enabled }}
+                open_file_cache max={{ .Values.nginx.open_file_cache.max }} inactive={{ .Values.nginx.open_file_cache.inactive }};
+                {{- else }}
+                open_file_cache off;
+                {{- end }}
                 open_file_cache_valid 45s;
                 open_file_cache_min_uses 2;
                 open_file_cache_errors off;
@@ -485,7 +489,11 @@ data:
                 expires 365d;
                 add_header Cache-Control "public";
                 ## Set the OS file cache.
-                open_file_cache max=10000 inactive=120s;
+                {{- if .Values.nginx.open_file_cache.enabled }}
+                open_file_cache max={{ .Values.nginx.open_file_cache.max }} inactive={{ .Values.nginx.open_file_cache.inactive }};
+                {{- else }}
+                open_file_cache off;
+                {{- end }}
                 open_file_cache_valid 45s;
                 open_file_cache_min_uses 2;
                 open_file_cache_errors off;

charts/drupal/templates/drupal-deployment.yaml

@@ -148,7 +148,7 @@ spec:
                   - drupal
 ---
 {{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v2beta1
+apiVersion: {{ include "drupal.autoscaling.api-version" . | trim }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ .Release.Name }}-drupal

charts/drupal/templates/reference-data-cron.yaml

@@ -1,6 +1,6 @@
 {{- if .Values.referenceData.enabled }}
 {{- if eq .Values.referenceData.referenceEnvironment .Values.environmentName }}
-apiVersion: batch/v1beta1
+apiVersion: {{ include "drupal.cron.api-version" . | trim }}
 kind: CronJob
 metadata:
   name: {{ .Release.Name }}-refdata

charts/drupal/values.yaml

@@ -137,6 +137,9 @@ nginx:
     requests:
       cpu: 1m
       memory: 10M
+    limits:
+      cpu: 500m
+      memory: 250M
 
   # Set of values to enable and use http basic authentication
   # It is implemented only for very basic protection (like web crawlers)
@@ -197,6 +200,13 @@ nginx:
   # Extra configuration to pass to nginx as a file
   extraConfig: |
 
+  # Toggle open_files_cache.
+  # Naming follows https://nginx.org/en/docs/http/ngx_http_core_module.html#open_file_cache directive
+  open_file_cache:
+    enabled: true
+    max: 6000
+    inactive: 120s
+
 # Configuration for everything that runs in php containers.
 php:
   # The docker image to be used. This is typically passed by your CI system using the --set parameter.