Skip to content

Commit

Permalink
Remove cpu limits (#635)
Browse files Browse the repository at this point in the history
Remove cpu limits

We are hitting several cpu limits and weird packit-service behaviour with it. Many resources on internet suggest not to use cpu limits (but instead adjust cpu requests if needed),
like this one:
https://medium.com/inside-sumup/are-kubernetes-cpu-limits-bad-a04430bf54e1

Reviewed-by: Laura Barcziová
  • Loading branch information
softwarefactory-project-zuul[bot] authored Jan 15, 2025
2 parents 5cc06cb + 453ef72 commit 442eb44
Show file tree
Hide file tree
Showing 17 changed files with 2 additions and 21 deletions.
1 change: 0 additions & 1 deletion openshift/dashboard.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ spec:
cpu: "5m"
limits:
memory: "256Mi"
cpu: "50m"
volumes:
- name: packit-secrets
secret:
Expand Down
1 change: 0 additions & 1 deletion openshift/flower.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ spec:
cpu: "5m"
limits:
memory: "128Mi"
cpu: "50m"
replicas: 1
strategy:
type: Recreate
Expand Down
1 change: 0 additions & 1 deletion openshift/nginx.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ spec:
cpu: "5m"
limits:
memory: "32Mi"
cpu: "10m"
replicas: 1
strategy:
type: Recreate
Expand Down
1 change: 0 additions & 1 deletion openshift/packit-service-beat.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ spec:
ephemeral-storage: "80Ki"
limits:
memory: "256Mi"
cpu: "50m"
replicas: 1
strategy:
type: Recreate
1 change: 0 additions & 1 deletion openshift/packit-service-fedmsg.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ spec:
cpu: "5m"
limits:
memory: "128Mi"
cpu: "50m"
livenessProbe:
exec:
command:
Expand Down
3 changes: 1 addition & 2 deletions openshift/packit-service.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ spec:
# you have to temporarily increase (in webUI/console) the limit
# and once the alembic upgrade passes, revert.
memory: "{{ '4Gi' if project == 'packit--prod' else '512Mi' }}"
cpu: "200m"
# In TLS world, hostname needs to match whatever is set in the cert
# in our cause, k8s is doing here something like curl https://172.15.2.4:8443/api/healthz/
# which will fail TLS validation.
Expand Down Expand Up @@ -143,7 +142,7 @@ spec:
readOnly: true
resources:
requests: {memory: "128Mi", cpu: "10m"}
limits: {memory: "128Mi", cpu: "100m"}
limits: {memory: "128Mi"}
{% endif %}
---
apiVersion: v1
Expand Down
3 changes: 1 addition & 2 deletions openshift/packit-worker.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ spec:
cpu: {{ worker_requests_cpu }}
limits:
memory: {{ worker_limits_memory }}
cpu: {{ worker_limits_cpu }}
livenessProbe:
exec:
command:
Expand Down Expand Up @@ -197,7 +196,7 @@ spec:
readOnly: true
resources:
requests: {memory: "128Mi", cpu: "10m"}
limits: {memory: "128Mi", cpu: "100m"}
limits: {memory: "128Mi"}
{% endif %}
---
kind: ImageStream
Expand Down
1 change: 0 additions & 1 deletion openshift/postgres.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ spec:
# based on this limit, so keep the limit reasonably high.
memory: "{{ '4Gi' if project == 'packit--prod' else '512Mi' }}"
# Not utilized most of the time, but useful during migrations and for some queries
cpu: "1"
volumeMounts:
- name: postgres-data
mountPath: /var/lib/pgsql/data
Expand Down
1 change: 0 additions & 1 deletion openshift/pushgateway.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ spec:
cpu: "5m"
limits:
memory: "32Mi"
cpu: "10m"
replicas: 1
strategy:
type: Recreate
Expand Down
1 change: 0 additions & 1 deletion openshift/redict.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ spec:
cpu: "10m"
limits:
memory: "256Mi"
cpu: "10m"
volumes:
- name: redict-pv
persistentVolumeClaim:
Expand Down
1 change: 0 additions & 1 deletion openshift/redis-commander.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ spec:
cpu: "10m"
limits:
memory: "32Mi"
cpu: "10m"
replicas: 1
strategy:
type: Recreate
Expand Down
1 change: 0 additions & 1 deletion openshift/redis.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ spec:
cpu: "10m"
limits:
memory: "64Mi"
cpu: "10m"
volumes:
- name: redis-pv
persistentVolumeClaim:
Expand Down
1 change: 0 additions & 1 deletion openshift/valkey.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ spec:
cpu: "10m"
limits:
memory: "256Mi"
cpu: "10m"
volumes:
- name: valkey-pv
persistentVolumeClaim:
Expand Down
1 change: 0 additions & 1 deletion playbooks/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
cpu: "5m"
limits:
memory: "128Mi"
cpu: "50m"
appcode: PCKT-002
servicephase: lab
costcenter: "700"
Expand Down
1 change: 0 additions & 1 deletion roles/deploy/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ tokman:
cpu: "5m"
limits:
memory: "128Mi"
cpu: "50m"
appcode: PCKT-002
servicephase: lab
costcenter: "700"
Expand Down
3 changes: 0 additions & 3 deletions roles/deploy/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@
worker_requests_memory: "384Mi"
worker_requests_cpu: "100m"
worker_limits_memory: "1024Mi"
worker_limits_cpu: "400m"
ansible.builtin.include_tasks: k8s.yml
loop:
- "{{ lookup('template', '{{ project_dir }}/openshift/packit-worker.yml.j2') }}"
Expand All @@ -206,7 +205,6 @@
worker_requests_memory: "320Mi"
worker_requests_cpu: "80m"
worker_limits_memory: "640Mi"
worker_limits_cpu: "2"
ansible.builtin.include_tasks: k8s.yml
loop:
- "{{ lookup('template', '{{ project_dir }}/openshift/packit-worker.yml.j2') }}"
Expand Down Expand Up @@ -238,7 +236,6 @@
worker_requests_memory: "768Mi"
worker_requests_cpu: "100m"
worker_limits_memory: "2048Mi"
worker_limits_cpu: "600m"
ansible.builtin.include_tasks: k8s.yml
loop:
- "{{ lookup('template', '{{ project_dir }}/openshift/packit-worker.yml.j2') }}"
Expand Down
1 change: 0 additions & 1 deletion vars/packit/prod_template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,3 @@ tokman:
cpu: "20m"
limits:
memory: "160Mi"
cpu: "50m"

0 comments on commit 442eb44

Please sign in to comment.