Merge branch 'development' into 'master'

Development

See merge request !1559

.gitlab-ci.yml

@@ -157,6 +157,7 @@ development:
       - $INCREMENTAL_ROLLOUT_ENABLED
       - $INCREMENTAL_ROLLOUT_MODE
 
+
 production:
   variables:
     ADDITIONAL_HOSTS: "www.metager.de,metager.org,www.metager.org,metager.es,www.metager.es,klassik.metager.org"

chart/templates/deployment.yaml

@@ -30,6 +30,15 @@ spec:
         tier: "{{ .Values.application.tier }}"
         release: {{ .Release.Name }}
     spec:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: worker
+                operator: NotIn
+                values:
+                - temp
       imagePullSecrets:
 {{ toYaml .Values.image.secrets | indent 10 }}
       securityContext:
@@ -37,7 +46,7 @@ spec:
       volumes:
       - name: mglogs-persistent-storage
         persistentVolumeClaim:
-          claimName: mglogs
+          claimName: mg-logs
       containers:
       # Main PHP-FPM Container
       - name: {{ .Chart.Name }}-phpfpm