Skip to content

Commit 166c956

Browse files
authored
Update Priority class and add sidecard init container for tasking manager (#360)
* Add release name on prefix for PriorityClass * Add sidecard container for tm * Rename container init for tm
1 parent ddd8b4b commit 166c956

File tree

16 files changed

+25
-18
lines changed

16 files changed

+25
-18
lines changed

osm-seed/templates/db/db-statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
release: {{ .Release.Name }}
2424
run: {{ .Release.Name }}-db
2525
spec:
26-
priorityClassName: {{ .Values.db.priorityClass | default "high-priority" }}
26+
priorityClassName: {{ .Release.Name }}-{{ .Values.db.priorityClass | default "high-priority" }}
2727
containers:
2828
- name: {{ .Chart.Name }}-db
2929
image: "{{ .Values.db.image.name }}:{{ .Values.db.image.tag }}"

osm-seed/templates/jobs/replication-job-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
labels:
1919
app: {{ template "osm-seed.name" . }}
2020
spec:
21-
priorityClassName: {{ .Values.replicationJob.priorityClass | default "high-priority" }}
21+
priorityClassName: {{ .Release.Name }}-{{ .Values.replicationJob.priorityClass | default "high-priority" }}
2222
containers:
2323
- name: {{ .Release.Name }}-replication-job-deployment
2424
image: {{ .Values.replicationJob.image.name }}:{{ .Values.replicationJob.image.tag }}

osm-seed/templates/memcached/memcached-deployment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
release: {{ .Release.Name }}
2323
run: {{ .Release.Name }}-memcached
2424
spec:
25-
priorityClassName: {{ .Values.memcached.priorityClass | default "high-priority" }}
25+
priorityClassName: {{ .Release.Name }}-{{ .Values.memcached.priorityClass | default "high-priority" }}
2626
containers:
2727
- name: {{ .Chart.Name }}-memcached
2828
image: "memcached"

osm-seed/templates/nominatim-api/nominatim-api-statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
release: {{ .Release.Name }}
2424
run: {{ .Release.Name }}-nominatim-api
2525
spec:
26-
priorityClassName: {{ .Values.nominatimApi.priorityClass | default "medium-priority" }}
26+
priorityClassName: {{ .Release.Name }}-{{ .Values.nominatimApi.priorityClass | default "medium-priority" }}
2727
containers:
2828
- name: {{ .Chart.Name }}-nominatim-api
2929
image: "{{ .Values.nominatimApi.image.name }}:{{ .Values.nominatimApi.image.tag }}"

osm-seed/templates/osmcha-app/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
volumeMounts:
3737
- name: staticfiles
3838
mountPath: /app/staticfiles
39-
priorityClassName: {{ .Values.osmchaApi.priorityClass | default "medium-priority" }}
39+
priorityClassName: {{ .Release.Name }}-{{ .Values.osmchaApi.priorityClass | default "medium-priority" }}
4040
containers:
4141
- name: osmcha-api
4242
image: "{{ .Values.osmchaApi.image.name }}:{{ .Values.osmchaApi.image.tag }}"

osm-seed/templates/osmcha-db/osmcha-db-statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
volumeMounts:
3232
- name: postgres-storage
3333
mountPath: /var/lib/postgresql/data
34-
priorityClassName: {{ .Values.osmchaDb.priorityClass | default "medium-priority" }}
34+
priorityClassName: {{ .Release.Name }}-{{ .Values.osmchaDb.priorityClass | default "medium-priority" }}
3535
containers:
3636
- name: {{ .Chart.Name }}-osmcha-db
3737
image: "{{ .Values.osmchaDb.image.name }}:{{ .Values.osmchaDb.image.tag }}"

osm-seed/templates/overpass-api/overpass-api-statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
release: {{ .Release.Name }}
2424
run: {{ .Release.Name }}-overpass-api
2525
spec:
26-
priorityClassName: {{ .Values.overpassApi.priorityClass | default "medium-priority" }}
26+
priorityClassName: {{ .Release.Name }}-{{ .Values.overpassApi.priorityClass | default "medium-priority" }}
2727
containers:
2828
- name: {{ .Chart.Name }}-overpass-api
2929
image: "{{ .Values.overpassApi.image.name }}:{{ .Values.overpassApi.image.tag }}"
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
apiVersion: scheduling.k8s.io/v1
22
kind: PriorityClass
33
metadata:
4-
name: high-priority
4+
name: {{ .Release.Name }}-high-priority
55
value: 100000
66
globalDefault: false
77
description: "High priority for critical services like web and db."
88
---
99
apiVersion: scheduling.k8s.io/v1
1010
kind: PriorityClass
1111
metadata:
12-
name: medium-priority
12+
name: {{ .Release.Name }}-medium-priority
1313
value: 50000
1414
globalDefault: false
1515
description: "Medium priority for important services like Overpass, Tasking Manager, etc."
1616
---
1717
apiVersion: scheduling.k8s.io/v1
1818
kind: PriorityClass
1919
metadata:
20-
name: low-priority
20+
name: {{ .Release.Name }}-low-priority
2121
value: 10000
2222
globalDefault: false
2323
description: "Low priority for background jobs and caches."

osm-seed/templates/taginfo/taginfo-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
release: {{ .Release.Name }}
2323
run: {{ .Release.Name }}-taginfo-web
2424
spec:
25-
priorityClassName: {{ .Values.taginfo.priorityClass | default "medium-priority" }}
25+
priorityClassName: {{ .Release.Name }}-{{ .Values.taginfo.priorityClass | default "medium-priority" }}
2626
containers:
2727
- name: {{ .Chart.Name }}-taginfo
2828
image: "{{ .Values.taginfo.image.name }}:{{ .Values.taginfo.image.tag }}"

osm-seed/templates/tasking-manager-api/tm-deployment.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,14 @@ spec:
2222
release: {{ .Release.Name }}
2323
run: {{ .Release.Name }}-tasking-manager-api
2424
spec:
25-
priorityClassName: {{ .Values.tmApi.priorityClass | default "medium-priority" }}
25+
priorityClassName: {{ .Release.Name }}-{{ .Values.tmApi.priorityClass | default "medium-priority" }}
26+
initContainers:
27+
- name: db-upgrade
28+
image: "{{ .Values.tmApi.image.name }}:{{ .Values.tmApi.image.tag }}"
29+
command: ["flask", "db", "upgrade"]
30+
envFrom:
31+
- configMapRef:
32+
name: {{ .Release.Name }}-tm-common-env
2633
containers:
2734
- name: {{ .Chart.Name }}-tasking-manager-api
2835
image: "{{ .Values.tmApi.image.name }}:{{ .Values.tmApi.image.tag }}"

0 commit comments

Comments
 (0)