Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Resource request/limit and add PriorityClass #359

Merged
merged 2 commits into from
Mar 24, 2025
Merged

Update Resource request/limit and add PriorityClass #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79a6ffb
Add priorityClass funcionality for pods
Rub21 Mar 12, 2025
a5633ef
Split resource request and limit
Rub21 Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions osm-seed/templates/db/db-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-db
spec:
priorityClassName: {{ .Values.db.priorityClass | default "high-priority" }}
containers:
- name: {{ .Chart.Name }}-db
image: "{{ .Values.db.image.name }}:{{ .Values.db.image.tag }}"
Expand Down Expand Up @@ -85,12 +86,16 @@ spec:
{{- end }}
{{- if .Values.db.resources.enabled }}
resources:
{{- if .Values.db.resources.requests.enabled }}
requests:
memory: {{ .Values.db.resources.requests.memory }}
cpu: {{ .Values.db.resources.requests.cpu }}
{{- end }}
{{- if .Values.db.resources.limits.enabled }}
limits:
memory: {{ .Values.db.resources.limits.memory }}
cpu: {{ .Values.db.resources.limits.cpu }}
{{- end }}
{{- end }}
volumes:
- name: postgres-storage
Expand Down
1 change: 1 addition & 0 deletions osm-seed/templates/jobs/replication-job-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ spec:
labels:
app: {{ template "osm-seed.name" . }}
spec:
priorityClassName: {{ .Values.replicationJob.priorityClass | default "high-priority" }}
containers:
- name: {{ .Release.Name }}-replication-job-deployment
image: {{ .Values.replicationJob.image.name }}:{{ .Values.replicationJob.image.tag }}
Expand Down
1 change: 1 addition & 0 deletions osm-seed/templates/memcached/memcached-deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-memcached
spec:
priorityClassName: {{ .Values.memcached.priorityClass | default "high-priority" }}
containers:
- name: {{ .Chart.Name }}-memcached
image: "memcached"
Expand Down
5 changes: 5 additions & 0 deletions osm-seed/templates/nominatim-api/nominatim-api-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-nominatim-api
spec:
priorityClassName: {{ .Values.nominatimApi.priorityClass | default "medium-priority" }}
containers:
- name: {{ .Chart.Name }}-nominatim-api
image: "{{ .Values.nominatimApi.image.name }}:{{ .Values.nominatimApi.image.tag }}"
Expand Down Expand Up @@ -85,12 +86,16 @@ spec:
subPath: {{ .Values.nominatimApi.persistenceDisk.subPath }}
{{- if .Values.nominatimApi.resources.enabled }}
resources:
{{- if .Values.nominatimApi.resources.requests.enabled }}
requests:
memory: {{ .Values.nominatimApi.resources.requests.memory }}
cpu: {{ .Values.nominatimApi.resources.requests.cpu }}
{{- end }}
{{- if .Values.nominatimApi.resources.limits.enabled }}
limits:
memory: {{ .Values.nominatimApi.resources.limits.memory }}
cpu: {{ .Values.nominatimApi.resources.limits.cpu }}
{{- end }}
{{- end }}
volumes:
- name: nominatim-db-storage
Expand Down
1 change: 1 addition & 0 deletions osm-seed/templates/osmcha-app/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ spec:
volumeMounts:
- name: staticfiles
mountPath: /app/staticfiles
priorityClassName: {{ .Values.osmchaApi.priorityClass | default "medium-priority" }}
containers:
- name: osmcha-api
image: "{{ .Values.osmchaApi.image.name }}:{{ .Values.osmchaApi.image.tag }}"
Expand Down
1 change: 1 addition & 0 deletions osm-seed/templates/osmcha-db/osmcha-db-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ spec:
volumeMounts:
- name: postgres-storage
mountPath: /var/lib/postgresql/data
priorityClassName: {{ .Values.osmchaDb.priorityClass | default "medium-priority" }}
containers:
- name: {{ .Chart.Name }}-osmcha-db
image: "{{ .Values.osmchaDb.image.name }}:{{ .Values.osmchaDb.image.tag }}"
Expand Down
14 changes: 14 additions & 0 deletions osm-seed/templates/overpass-api/overpass-api-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-overpass-api
spec:
priorityClassName: {{ .Values.overpassApi.priorityClass | default "medium-priority" }}
containers:
- name: {{ .Chart.Name }}-overpass-api
image: "{{ .Values.overpassApi.image.name }}:{{ .Values.overpassApi.image.tag }}"
Expand Down Expand Up @@ -65,6 +66,19 @@ spec:
volumeMounts:
- mountPath: /db
name: overpass-api-storage
{{- if .Values.overpassApi.resources.enabled }}
resources:
{{- if .Values.overpassApi.resources.requests.enabled }}
requests:
memory: {{ .Values.overpassApi.resources.requests.memory }}
cpu: {{ .Values.overpassApi.resources.requests.cpu }}
{{- end }}
{{- if .Values.overpassApi.resources.limits.enabled }}
limits:
memory: {{ .Values.overpassApi.resources.limits.memory }}
cpu: {{ .Values.overpassApi.resources.limits.cpu }}
{{- end }}
{{- end }}
restartPolicy: Always
volumes:
- name: overpass-api-storage
Expand Down
23 changes: 23 additions & 0 deletions osm-seed/templates/priorityclass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
apiVersion: scheduling.k8s.io/v1
kind: PriorityClass
metadata:
name: high-priority
value: 100000
globalDefault: false
description: "High priority for critical services like web and db."
---
apiVersion: scheduling.k8s.io/v1
kind: PriorityClass
metadata:
name: medium-priority
value: 50000
globalDefault: false
description: "Medium priority for important services like Overpass, Tasking Manager, etc."
---
apiVersion: scheduling.k8s.io/v1
kind: PriorityClass
metadata:
name: low-priority
value: 10000
globalDefault: false
description: "Low priority for background jobs and caches."
5 changes: 5 additions & 0 deletions osm-seed/templates/taginfo/taginfo-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-taginfo-web
spec:
priorityClassName: {{ .Values.taginfo.priorityClass | default "medium-priority" }}
containers:
- name: {{ .Chart.Name }}-taginfo
image: "{{ .Values.taginfo.image.name }}:{{ .Values.taginfo.image.tag }}"
Expand All @@ -42,12 +43,16 @@ spec:
timeoutSeconds: 60
{{- if .Values.taginfo.resources.enabled }}
resources:
{{- if .Values.taginfo.resources.requests.enabled }}
requests:
memory: {{ .Values.taginfo.resources.requests.memory }}
cpu: {{ .Values.taginfo.resources.requests.cpu }}
{{- end }}
{{- if .Values.taginfo.resources.limits.enabled }}
limits:
memory: {{ .Values.taginfo.resources.limits.memory }}
cpu: {{ .Values.taginfo.resources.limits.cpu }}
{{- end }}
{{- end }}
envFrom:
- configMapRef:
Expand Down
5 changes: 5 additions & 0 deletions osm-seed/templates/tasking-manager-api/tm-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-tasking-manager-api
spec:
priorityClassName: {{ .Values.tmApi.priorityClass | default "medium-priority" }}
containers:
- name: {{ .Chart.Name }}-tasking-manager-api
image: "{{ .Values.tmApi.image.name }}:{{ .Values.tmApi.image.tag }}"
Expand All @@ -37,12 +38,16 @@ spec:
timeoutSeconds: 30
{{- if .Values.tmApi.resources.enabled }}
resources:
{{- if .Values.tmApi.resources.requests.enabled }}
requests:
memory: {{ .Values.tmApi.resources.requests.memory }}
cpu: {{ .Values.tmApi.resources.requests.cpu }}
{{- end }}
{{- if .Values.tmApi.resources.limits.enabled }}
limits:
memory: {{ .Values.tmApi.resources.limits.memory }}
cpu: {{ .Values.tmApi.resources.limits.cpu }}
{{- end }}
{{- end }}
envFrom:
- configMapRef:
Expand Down
5 changes: 5 additions & 0 deletions osm-seed/templates/tasking-manager-db/tm-db-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-tasking-manager-db
spec:
priorityClassName: {{ .Values.tmDb.priorityClass | default "medium-priority" }}
containers:
- name: {{ .Chart.Name }}-tm-db
image: "{{ .Values.tmDb.image.name }}:{{ .Values.tmDb.image.tag }}"
Expand Down Expand Up @@ -79,12 +80,16 @@ spec:
subPath: {{ .Values.tmDb.persistenceDisk.subPath }}
{{- if .Values.tmDb.resources.enabled }}
resources:
{{- if .Values.tmDb.resources.requests.enabled }}
requests:
memory: {{ .Values.tmDb.resources.requests.memory }}
cpu: {{ .Values.tmDb.resources.requests.cpu }}
{{- end }}
{{- if .Values.tmDb.resources.limits.enabled }}
limits:
memory: {{ .Values.tmDb.resources.limits.memory }}
cpu: {{ .Values.tmDb.resources.limits.cpu }}
{{- end }}
{{- end }}
volumes:
- name: postgres-storage
Expand Down
5 changes: 5 additions & 0 deletions osm-seed/templates/tiler-db/tiler-db-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-tiler-db
spec:
priorityClassName: {{ .Values.tilerDb.priorityClass | default "medium-priority" }}
containers:
- name: {{ .Chart.Name }}-tiler-db
image: "{{ .Values.tilerDb.image.name }}:{{ .Values.tilerDb.image.tag }}"
Expand Down Expand Up @@ -73,12 +74,16 @@ spec:
mountPath: /dev/shm
{{- if .Values.tilerDb.resources.enabled }}
resources:
{{- if .Values.tilerDb.resources.requests.enabled }}
requests:
memory: {{ .Values.tilerDb.resources.requests.memory }}
cpu: {{ .Values.tilerDb.resources.requests.cpu }}
{{- end }}
{{- if .Values.tilerDb.resources.limits.enabled }}
limits:
memory: {{ .Values.tilerDb.resources.limits.memory }}
cpu: {{ .Values.tilerDb.resources.limits.cpu }}
{{- end }}
{{- end }}
volumes:
- name: postgres-storage
Expand Down
5 changes: 5 additions & 0 deletions osm-seed/templates/tiler-imposm/tiler-imposm-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ spec:
labels:
app: {{ .Release.Name }}-tiler-imposm-sts
spec:
priorityClassName: {{ .Values.tilerImposm.priorityClass | default "medium-priority" }}
containers:
- name: {{ .Release.Name }}-tiler-imposm-sts
image: {{ .Values.tilerImposm.image.name }}:{{ .Values.tilerImposm.image.tag }}
Expand All @@ -35,12 +36,16 @@ spec:
failureThreshold: 3
{{- if .Values.tilerImposm.resources.enabled }}
resources:
{{- if .Values.tilerImposm.resources.requests.enabled }}
requests:
memory: {{ .Values.tilerImposm.resources.requests.memory }}
cpu: {{ .Values.tilerImposm.resources.requests.cpu }}
{{- end }}
{{- if .Values.tilerImposm.resources.limits.enabled }}
limits:
memory: {{ .Values.tilerImposm.resources.limits.memory }}
cpu: {{ .Values.tilerImposm.resources.limits.cpu }}
{{- end }}
{{- end }}
env:
# Tiler
Expand Down
5 changes: 5 additions & 0 deletions osm-seed/templates/tiler-server/tiler-server-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-tiler-server
spec:
priorityClassName: {{ .Values.tilerServer.priorityClass | default "medium-priority" }}
containers:
- name: {{ .Chart.Name }}-tiler-server
image: "{{ .Values.tilerServer.image.name }}:{{ .Values.tilerServer.image.tag }}"
Expand All @@ -39,12 +40,16 @@ spec:
timeoutSeconds: 30
{{- if .Values.tilerServer.resources.enabled }}
resources:
{{- if .Values.tilerServer.resources.requests.enabled }}
requests:
memory: {{ .Values.tilerServer.resources.requests.memory }}
cpu: {{ .Values.tilerServer.resources.requests.cpu }}
{{- end }}
{{- if .Values.tilerServer.resources.limits.enabled }}
limits:
memory: {{ .Values.tilerServer.resources.limits.memory }}
cpu: {{ .Values.tilerServer.resources.limits.cpu }}
{{- end }}
{{- end }}
envFrom:
- configMapRef:
Expand Down
5 changes: 5 additions & 0 deletions osm-seed/templates/tiler-server/tiler-server-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-tiler-server
spec:
priorityClassName: {{ .Values.tilerServer.priorityClass | default "medium-priority" }}
containers:
- name: {{ .Chart.Name }}-tiler-server
image: "{{ .Values.tilerServer.image.name }}:{{ .Values.tilerServer.image.tag }}"
Expand All @@ -40,12 +41,16 @@ spec:
timeoutSeconds: 30
{{- if .Values.tilerServer.resources.enabled }}
resources:
{{- if .Values.tilerServer.resources.requests.enabled }}
requests:
memory: {{ .Values.tilerServer.resources.requests.memory }}
cpu: {{ .Values.tilerServer.resources.requests.cpu }}
{{- end }}
{{- if .Values.tilerServer.resources.limits.enabled }}
limits:
memory: {{ .Values.tilerServer.resources.limits.memory }}
cpu: {{ .Values.tilerServer.resources.limits.cpu }}
{{- end }}
{{- end }}
envFrom:
- configMapRef:
Expand Down
5 changes: 5 additions & 0 deletions osm-seed/templates/web/web-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-web
spec:
priorityClassName: {{ .Values.web.priorityClass | default "high-priority" }}
containers:
- name: {{ .Chart.Name }}-web
image: "{{ .Values.web.image.name }}:{{ .Values.web.image.tag }}"
Expand Down Expand Up @@ -49,12 +50,16 @@ spec:
{{- end }}
{{- if .Values.web.resources.enabled }}
resources:
{{- if .Values.web.resources.requests.enabled }}
requests:
memory: {{ .Values.web.resources.requests.memory }}
cpu: {{ .Values.web.resources.requests.cpu }}
{{- end }}
{{- if .Values.web.resources.limits.enabled }}
limits:
memory: {{ .Values.web.resources.limits.memory }}
cpu: {{ .Values.web.resources.limits.cpu }}
{{- end }}
{{- end }}
env:
- name: GET_HOSTS_FROM
Expand Down
Loading
Loading