ungleich-public/ungleich-k8s
6
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

zammad: add resource limits for zammad processes

Browse source
This commit is contained in:
Nico Schottelius 2021-10-10 16:52:18 +09:00
parent 52b4fbead7
commit 5082458eb6
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
apps/zammad/templates/deployment.yaml
View file

@ -56,7 +56,6 @@ spec:
capabilities: capabilities:
add: ["SYS_CHROOT"] add: ["SYS_CHROOT"]
#image: docker.elastic.co/elasticsearch/elasticsearch:7.15.0
# resources: # resources:
# requests: # requests:
# memory: "64Mi" # memory: "64Mi"
@ -223,6 +222,13 @@ spec:
command: command:
- /docker-entrypoint.sh - /docker-entrypoint.sh
- zammad-railsserver - zammad-railsserver
resources:
requests:
memory: "256Mi"
cpu: "100m"
limits:
memory: "512Mi"
cpu: "500m"
# Wait for 10 minutes to get ready # Wait for 10 minutes to get ready
# startupProbe: # startupProbe:
# httpGet: # httpGet:
@ -314,21 +320,16 @@ spec:
value: "localhost:11211" value: "localhost:11211"
- name: ELASTICSEARCH_HOST - name: ELASTICSEARCH_HOST
value: "{{ .Release.Name }}-elasticsearch" value: "{{ .Release.Name }}-elasticsearch"
# - name: ZAMMAD_TRUSTED_DOMAINS
# value: "{{ tpl .Values.fqdn . }}"
# - name: ZAMMAD_ADMIN_USER
# valueFrom:
# secretKeyRef:
# name: {{ tpl .Values.identifier . }}-zammad
# key: USERNAME
# - name: ZAMMAD_ADMIN_PASSWORD
# valueFrom:
# secretKeyRef:
# name: {{ tpl .Values.identifier . }}-zammad
# key: PASSWORD
volumeMounts: volumeMounts:
- name: zammad-data - name: zammad-data
mountPath: "/opt/zammad" mountPath: "/opt/zammad"
resources:
requests:
memory: "256Mi"
cpu: "100m"
limits:
memory: "512Mi"
cpu: "500m"
- name: zammad-websocket - name: zammad-websocket
image: zammad/zammad-docker-compose:zammad-{{ .Chart.AppVersion }} image: zammad/zammad-docker-compose:zammad-{{ .Chart.AppVersion }}
command: command:
@ -377,6 +378,13 @@ spec:
ports: ports:
- containerPort: 6042 - containerPort: 6042
name: websocket name: websocket
resources:
requests:
memory: "256Mi"
cpu: "100m"
limits:
memory: "512Mi"
cpu: "500m"
volumes: volumes:
- name: etcletsencrypt - name: etcletsencrypt
persistentVolumeClaim: persistentVolumeClaim: