From edcc8e0da077e59e982e0f5c3515824377d277b5 Mon Sep 17 00:00:00 2001 From: Dominik Hebeler <dominik@suma-ev.de> Date: Tue, 10 May 2022 14:49:13 +0200 Subject: [PATCH] added missing containers --- .gitlab/review.yaml | 3 ++ chart/templates/deployment.yaml | 72 +++++++++++++++++++++++++++++++++ chart/values.yaml | 3 -- 3 files changed, 75 insertions(+), 3 deletions(-) diff --git a/.gitlab/review.yaml b/.gitlab/review.yaml index 870ff0015..685b7d09f 100644 --- a/.gitlab/review.yaml +++ b/.gitlab/review.yaml @@ -1,3 +1,6 @@ +# Which App Environment to set on startup +environment: development + ingress: annotations: kubernetes.io/tls-acme: "true" diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml index e51b462a4..5acdfa6bd 100644 --- a/chart/templates/deployment.yaml +++ b/chart/templates/deployment.yaml @@ -70,6 +70,78 @@ spec: cpu: 500m memory: 500M limits: + - name: scheduler + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ template "fpm_image" . }}" + command: ["/usr/local/bin/php"] + args: ["artisan", "schedule:work"] + imagePullPolicy: {{ .Values.image.fpm.pullPolicy }} + env: + - name: APP_ENV + value: {{ .Values.environment }} + volumeMounts: + - name: secrets + mountPath: /metager/metager_app/.env + subPath: ENV_PRODUCTION + readOnly: true + ports: + - name: http + containerPort: 8080 + protocol: TCP + livenessProbe: + httpGet: + path: /health-check/liveness-scheduler + port: http + readinessProbe: + httpGet: + path: /health-check/liveness-scheduler + port: http + startupProbe: + httpGet: + path: /health-check/liveness-scheduler + port: http + resources: + requests: + cpu: 100m + memory: 100M + limits: + - name: worker + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ template "fpm_image" . }}" + command: ["/usr/local/bin/php"] + args: ["artisan", "requests:fetcher"] + imagePullPolicy: {{ .Values.image.fpm.pullPolicy }} + env: + - name: APP_ENV + value: {{ .Values.environment }} + volumeMounts: + - name: secrets + mountPath: /metager/metager_app/.env + subPath: ENV_PRODUCTION + readOnly: true + ports: + - name: http + containerPort: 8080 + protocol: TCP + livenessProbe: + httpGet: + path: /health-check/liveness-worker + port: http + readinessProbe: + httpGet: + path: /health-check/liveness-worker + port: http + startupProbe: + httpGet: + path: /health-check/liveness-worker + port: http + resources: + requests: + cpu: 500m + memory: 100M + limits: - name: nginx securityContext: {{- toYaml .Values.securityContext | nindent 12 }} diff --git a/chart/values.yaml b/chart/values.yaml index 11d627401..9a51d5a77 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -4,9 +4,6 @@ replicaCount: 1 -# Which App Environment to set on startup -environment: development - image: pullPolicy: IfNotPresent fpm: -- GitLab