Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion osm-seed/templates/db/db-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-db
spec:
priorityClassName: {{ .Values.db.priorityClass | default "high-priority" }}
priorityClassName: {{ .Release.Name }}-{{ .Values.db.priorityClass | default "high-priority" }}
containers:
- name: {{ .Chart.Name }}-db
image: "{{ .Values.db.image.name }}:{{ .Values.db.image.tag }}"
Expand Down
2 changes: 1 addition & 1 deletion osm-seed/templates/jobs/replication-job-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
labels:
app: {{ template "osm-seed.name" . }}
spec:
priorityClassName: {{ .Values.replicationJob.priorityClass | default "high-priority" }}
priorityClassName: {{ .Release.Name }}-{{ .Values.replicationJob.priorityClass | default "high-priority" }}
containers:
- name: {{ .Release.Name }}-replication-job-deployment
image: {{ .Values.replicationJob.image.name }}:{{ .Values.replicationJob.image.tag }}
Expand Down
2 changes: 1 addition & 1 deletion osm-seed/templates/memcached/memcached-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-memcached
spec:
priorityClassName: {{ .Values.memcached.priorityClass | default "high-priority" }}
priorityClassName: {{ .Release.Name }}-{{ .Values.memcached.priorityClass | default "high-priority" }}
containers:
- name: {{ .Chart.Name }}-memcached
image: "memcached"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-nominatim-api
spec:
priorityClassName: {{ .Values.nominatimApi.priorityClass | default "medium-priority" }}
priorityClassName: {{ .Release.Name }}-{{ .Values.nominatimApi.priorityClass | default "medium-priority" }}
containers:
- name: {{ .Chart.Name }}-nominatim-api
image: "{{ .Values.nominatimApi.image.name }}:{{ .Values.nominatimApi.image.tag }}"
Expand Down
2 changes: 1 addition & 1 deletion osm-seed/templates/osmcha-app/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
volumeMounts:
- name: staticfiles
mountPath: /app/staticfiles
priorityClassName: {{ .Values.osmchaApi.priorityClass | default "medium-priority" }}
priorityClassName: {{ .Release.Name }}-{{ .Values.osmchaApi.priorityClass | default "medium-priority" }}
containers:
- name: osmcha-api
image: "{{ .Values.osmchaApi.image.name }}:{{ .Values.osmchaApi.image.tag }}"
Expand Down
2 changes: 1 addition & 1 deletion osm-seed/templates/osmcha-db/osmcha-db-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
volumeMounts:
- name: postgres-storage
mountPath: /var/lib/postgresql/data
priorityClassName: {{ .Values.osmchaDb.priorityClass | default "medium-priority" }}
priorityClassName: {{ .Release.Name }}-{{ .Values.osmchaDb.priorityClass | default "medium-priority" }}
containers:
- name: {{ .Chart.Name }}-osmcha-db
image: "{{ .Values.osmchaDb.image.name }}:{{ .Values.osmchaDb.image.tag }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-overpass-api
spec:
priorityClassName: {{ .Values.overpassApi.priorityClass | default "medium-priority" }}
priorityClassName: {{ .Release.Name }}-{{ .Values.overpassApi.priorityClass | default "medium-priority" }}
containers:
- name: {{ .Chart.Name }}-overpass-api
image: "{{ .Values.overpassApi.image.name }}:{{ .Values.overpassApi.image.tag }}"
Expand Down
6 changes: 3 additions & 3 deletions osm-seed/templates/priorityclass.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
apiVersion: scheduling.k8s.io/v1
kind: PriorityClass
metadata:
name: high-priority
name: {{ .Release.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
name: {{ .Release.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
name: {{ .Release.Name }}-low-priority
value: 10000
globalDefault: false
description: "Low priority for background jobs and caches."
2 changes: 1 addition & 1 deletion osm-seed/templates/taginfo/taginfo-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-taginfo-web
spec:
priorityClassName: {{ .Values.taginfo.priorityClass | default "medium-priority" }}
priorityClassName: {{ .Release.Name }}-{{ .Values.taginfo.priorityClass | default "medium-priority" }}
containers:
- name: {{ .Chart.Name }}-taginfo
image: "{{ .Values.taginfo.image.name }}:{{ .Values.taginfo.image.tag }}"
Expand Down
9 changes: 8 additions & 1 deletion osm-seed/templates/tasking-manager-api/tm-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,14 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-tasking-manager-api
spec:
priorityClassName: {{ .Values.tmApi.priorityClass | default "medium-priority" }}
priorityClassName: {{ .Release.Name }}-{{ .Values.tmApi.priorityClass | default "medium-priority" }}
initContainers:
- name: db-upgrade
image: "{{ .Values.tmApi.image.name }}:{{ .Values.tmApi.image.tag }}"
command: ["flask", "db", "upgrade"]
envFrom:
- configMapRef:
name: {{ .Release.Name }}-tm-common-env
containers:
- name: {{ .Chart.Name }}-tasking-manager-api
image: "{{ .Values.tmApi.image.name }}:{{ .Values.tmApi.image.tag }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-tasking-manager-db
spec:
priorityClassName: {{ .Values.tmDb.priorityClass | default "medium-priority" }}
priorityClassName: {{ .Release.Name }}-{{ .Values.tmDb.priorityClass | default "medium-priority" }}
containers:
- name: {{ .Chart.Name }}-tm-db
image: "{{ .Values.tmDb.image.name }}:{{ .Values.tmDb.image.tag }}"
Expand Down
2 changes: 1 addition & 1 deletion osm-seed/templates/tiler-db/tiler-db-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-tiler-db
spec:
priorityClassName: {{ .Values.tilerDb.priorityClass | default "medium-priority" }}
priorityClassName: {{ .Release.Name }}-{{ .Values.tilerDb.priorityClass | default "medium-priority" }}
containers:
- name: {{ .Chart.Name }}-tiler-db
image: "{{ .Values.tilerDb.image.name }}:{{ .Values.tilerDb.image.tag }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
labels:
app: {{ .Release.Name }}-tiler-imposm-sts
spec:
priorityClassName: {{ .Values.tilerImposm.priorityClass | default "medium-priority" }}
priorityClassName: {{ .Release.Name }}-{{ .Values.tilerImposm.priorityClass | default "medium-priority" }}
containers:
- name: {{ .Release.Name }}-tiler-imposm-sts
image: {{ .Values.tilerImposm.image.name }}:{{ .Values.tilerImposm.image.tag }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-tiler-server
spec:
priorityClassName: {{ .Values.tilerServer.priorityClass | default "medium-priority" }}
priorityClassName: {{ .Release.Name }}-{{ .Values.tilerServer.priorityClass | default "medium-priority" }}
containers:
- name: {{ .Chart.Name }}-tiler-server
image: "{{ .Values.tilerServer.image.name }}:{{ .Values.tilerServer.image.tag }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-tiler-server
spec:
priorityClassName: {{ .Values.tilerServer.priorityClass | default "medium-priority" }}
priorityClassName: {{ .Release.Name }}-{{ .Values.tilerServer.priorityClass | default "medium-priority" }}
containers:
- name: {{ .Chart.Name }}-tiler-server
image: "{{ .Values.tilerServer.image.name }}:{{ .Values.tilerServer.image.tag }}"
Expand Down
2 changes: 1 addition & 1 deletion osm-seed/templates/web/web-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
release: {{ .Release.Name }}
run: {{ .Release.Name }}-web
spec:
priorityClassName: {{ .Values.web.priorityClass | default "high-priority" }}
priorityClassName: {{ .Release.Name }}-{{ .Values.web.priorityClass | default "high-priority" }}
containers:
- name: {{ .Chart.Name }}-web
image: "{{ .Values.web.image.name }}:{{ .Values.web.image.tag }}"
Expand Down
Loading