Merge branch 'develop' into trunk
This commit is contained in:
commit
376c5d3ab1
1 changed files with 18 additions and 13 deletions
|
|
@ -88,7 +88,12 @@ spec:
|
||||||
lifecycle:
|
lifecycle:
|
||||||
preStop:
|
preStop:
|
||||||
exec:
|
exec:
|
||||||
command: [ "/bin/sh", "-c", "kill -s TERM 1; while test $(ps ax | grep -v grep | grep bash | wc -l) -gt 0; do sleep 2s; done" ]
|
command:
|
||||||
|
[
|
||||||
|
"/bin/sh",
|
||||||
|
"-c",
|
||||||
|
"kill -s TERM 1; while test $(ps ax | grep -v grep | grep bash | wc -l) -gt 0; do sleep 2s; done",
|
||||||
|
]
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpu: "${APP_CI_CPU_LIMIT}"
|
cpu: "${APP_CI_CPU_LIMIT}"
|
||||||
|
|
@ -97,21 +102,21 @@ spec:
|
||||||
cpu: "${APP_CI_CPU_REQUEST}"
|
cpu: "${APP_CI_CPU_REQUEST}"
|
||||||
memory: "${APP_CI_MEMORY_REQUEST}"
|
memory: "${APP_CI_MEMORY_REQUEST}"
|
||||||
command:
|
command:
|
||||||
- "bash"
|
- "bash"
|
||||||
args:
|
args:
|
||||||
- "k8s-queues.sh"
|
- "k8s-queues.sh"
|
||||||
envFrom:
|
envFrom:
|
||||||
- configMapRef:
|
- configMapRef:
|
||||||
name: ${CI_PROJECT_PATH_SLUG}-config-map
|
name: ${CI_PROJECT_PATH_SLUG}-config-map
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: storage
|
- name: storage
|
||||||
mountPath: /app/srcs/storage
|
mountPath: /app/srcs/storage
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
- name: docker-registry-credentials
|
- name: docker-registry-credentials
|
||||||
securityContext:
|
securityContext:
|
||||||
runAsUser: 33
|
runAsUser: 82
|
||||||
runAsGroup: 33
|
runAsGroup: 82
|
||||||
fsGroup: 33
|
fsGroup: 82
|
||||||
fsGroupChangePolicy: "OnRootMismatch"
|
fsGroupChangePolicy: "OnRootMismatch"
|
||||||
volumes:
|
volumes:
|
||||||
- name: storage
|
- name: storage
|
||||||
|
|
@ -197,8 +202,8 @@ spec:
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: ${CI_PROJECT_PATH_SLUG}-pvc-storage
|
claimName: ${CI_PROJECT_PATH_SLUG}-pvc-storage
|
||||||
securityContext:
|
securityContext:
|
||||||
runAsUser: 33
|
runAsUser: 82
|
||||||
runAsGroup: 33
|
runAsGroup: 82
|
||||||
fsGroup: 33
|
fsGroup: 82
|
||||||
fsGroupChangePolicy: "OnRootMismatch"
|
fsGroupChangePolicy: "OnRootMismatch"
|
||||||
restartPolicy: OnFailure
|
restartPolicy: OnFailure
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue