Skip to content

Commit b293d54

Browse files
Rub21Rub21
authored
Update charts to support Karpenter (#377)
* Add affinity config - web * update config for nodeAffinity and tolerations * Remove tolerations * Keep nodeselector just in case * Add affinity config * Add serviceAccount config * Fix image value * Update service account for tiler server * Fix typo * Add automountServiceAccountToken for serviceAccountName
1 parent b1bc774 commit b293d54

26 files changed

+637
-52
lines changed

‎osm-seed/templates/cgimap/cgimap-deployment.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,18 @@ spec:
7272
nodeSelector:
7373
{{ .Values.cgimap.nodeSelector.label_key }} : {{ .Values.cgimap.nodeSelector.label_value }}
7474
{{- end }}
75+
# Affinity settings
76+
{{- if .Values.cgimap.nodeAffinity.enabled }}
77+
affinity:
78+
nodeAffinity:
79+
requiredDuringSchedulingIgnoredDuringExecution:
80+
nodeSelectorTerms:
81+
- matchExpressions:
82+
- key: {{ .Values.cgimap.nodeAffinity.key }}
83+
operator: In
84+
values:
85+
{{- range .Values.cgimap.nodeAffinity.values }}
86+
- {{ . | quote }}
87+
{{- end }}
88+
{{- end }}
7589
{{- end }}

‎osm-seed/templates/db/db-backup-job.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ spec:
1919
ttlSecondsAfterFinished: 300
2020
template:
2121
spec:
22+
{{- if $job.serviceAccount.enabled }}
23+
serviceAccountName: {{ $job.serviceAccount.name }}
24+
automountServiceAccountToken: true
25+
{{- end }}
2226
containers:
2327
- name: {{ $job.name }}-backup-job
2428
image: {{ $.Values.dbBackupRestore.image.name }}:{{ $.Values.dbBackupRestore.image.tag }}
@@ -155,6 +159,19 @@ spec:
155159
nodeSelector:
156160
{{ $job.nodeSelector.label_key }} : {{ $job.nodeSelector.label_value }}
157161
{{- end }}
162+
{{- if $job.nodeAffinity.enabled }}
163+
affinity:
164+
nodeAffinity:
165+
requiredDuringSchedulingIgnoredDuringExecution:
166+
nodeSelectorTerms:
167+
- matchExpressions:
168+
- key: {{ $job.nodeAffinity.key }}
169+
operator: In
170+
values:
171+
{{- range $job.nodeAffinity.values }}
172+
- {{ . | quote }}
173+
{{- end }}
174+
{{- end }}
158175
---
159176
{{- end }}
160177
{{- end }}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,17 @@ spec:
118118
nodeSelector:
119119
{{ .Values.db.nodeSelector.label_key }} : {{ .Values.db.nodeSelector.label_value }}
120120
{{- end }}
121+
{{- if .Values.db.nodeAffinity.enabled }}
122+
affinity:
123+
nodeAffinity:
124+
requiredDuringSchedulingIgnoredDuringExecution:
125+
nodeSelectorTerms:
126+
- matchExpressions:
127+
- key: {{ .Values.db.nodeAffinity.key }}
128+
operator: In
129+
values:
130+
{{- range .Values.db.nodeAffinity.values }}
131+
- {{ . | quote }}
132+
{{- end }}
133+
{{- end }}
121134
{{- end }}

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ spec:
1818
labels:
1919
app: {{ template "osm-seed.name" . }}
2020
spec:
21+
{{- if .Values.changesetReplicationJob.serviceAccount.enabled }}
22+
serviceAccountName: {{ .Values.changesetReplicationJob.serviceAccount.name }}
23+
automountServiceAccountToken: true
24+
{{- end }}
2125
containers:
2226
- name: {{ .Release.Name }}-changeset-replication-job-deployment
2327
image: {{ .Values.changesetReplicationJob.image.name }}:{{ .Values.changesetReplicationJob.image.tag }}
@@ -72,4 +76,18 @@ spec:
7276
nodeSelector:
7377
{{ .Values.changesetReplicationJob.nodeSelector.label_key }} : {{ .Values.changesetReplicationJob.nodeSelector.label_value }}
7478
{{- end }}
79+
# Affinity settings
80+
{{- if .Values.changesetReplicationJob.nodeAffinity.enabled }}
81+
affinity:
82+
nodeAffinity:
83+
requiredDuringSchedulingIgnoredDuringExecution:
84+
nodeSelectorTerms:
85+
- matchExpressions:
86+
- key: {{ .Values.changesetReplicationJob.nodeAffinity.key }}
87+
operator: In
88+
values:
89+
{{- range .Values.changesetReplicationJob.nodeAffinity.values }}
90+
- {{ . | quote }}
91+
{{- end }}
92+
{{- end }}
7593
{{- end }}

‎osm-seed/templates/jobs/full-history-job.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ spec:
1919
ttlSecondsAfterFinished: 300
2020
template:
2121
spec:
22+
{{- if .Values.fullHistory.serviceAccount.enabled }}
23+
serviceAccountName: {{ .Values.fullHistory.serviceAccount.name }}
24+
automountServiceAccountToken: true
25+
{{- end }}
2226
containers:
2327
- name: {{ .Release.Name }}-full-history-job
2428
image: {{ .Values.fullHistory.image.name }}:{{ .Values.fullHistory.image.tag }}
@@ -82,5 +86,19 @@ spec:
8286
nodeSelector:
8387
{{ .Values.fullHistory.nodeSelector.label_key }} : {{ .Values.fullHistory.nodeSelector.label_value }}
8488
{{- end }}
89+
# Affinity settings
90+
{{- if .Values.fullHistory.nodeAffinity.enabled }}
91+
affinity:
92+
nodeAffinity:
93+
requiredDuringSchedulingIgnoredDuringExecution:
94+
nodeSelectorTerms:
95+
- matchExpressions:
96+
- key: {{ .Values.fullHistory.nodeAffinity.key }}
97+
operator: In
98+
values:
99+
{{- range .Values.fullHistory.nodeAffinity.values }}
100+
- {{ . | quote }}
101+
{{- end }}
102+
{{- end }}
85103
backoffLimit: 3
86104
{{- end }}

‎osm-seed/templates/jobs/osm-simple-metrics-job.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ spec:
1919
ttlSecondsAfterFinished: 300
2020
template:
2121
spec:
22+
{{- if .Values.osmSimpleMetrics.serviceAccount.enabled }}
23+
serviceAccountName: {{ .Values.osmSimpleMetrics.serviceAccount.name }}
24+
automountServiceAccountToken: true
25+
{{- end }}
2226
containers:
2327
- name: {{ .Release.Name }}-osm-simple-metrics-job
2428
image: {{ .Values.osmSimpleMetrics.image.name }}:{{ .Values.osmSimpleMetrics.image.tag }}
@@ -66,4 +70,18 @@ spec:
6670
nodeSelector:
6771
{{ .Values.osmSimpleMetrics.nodeSelector.label_key }}: {{ .Values.osmSimpleMetrics.nodeSelector.label_value }}
6872
{{- end }}
73+
# Affinity settings
74+
{{- if .Values.osmSimpleMetrics.nodeAffinity.enabled }}
75+
affinity:
76+
nodeAffinity:
77+
requiredDuringSchedulingIgnoredDuringExecution:
78+
nodeSelectorTerms:
79+
- matchExpressions:
80+
- key: {{ .Values.osmSimpleMetrics.nodeAffinity.key }}
81+
operator: In
82+
values:
83+
{{- range .Values.osmSimpleMetrics.nodeAffinity.values }}
84+
- {{ . | quote }}
85+
{{- end }}
86+
{{- end }}
6987
{{- end }}

‎osm-seed/templates/jobs/planet-dump-job.yaml‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ spec:
1919
ttlSecondsAfterFinished: 300
2020
template:
2121
spec:
22-
{{- if .Values.planetDump.nodeSelector.enabled }}
23-
nodeSelector:
24-
{{ .Values.planetDump.nodeSelector.label_key }} : {{ .Values.planetDump.nodeSelector.label_value }}
22+
{{- if .Values.planetDump.serviceAccount.enabled }}
23+
serviceAccountName: {{ .Values.planetDump.serviceAccount.name }}
24+
automountServiceAccountToken: true
2525
{{- end }}
2626
containers:
2727
- name: {{ .Release.Name }}-planet-dump-job
@@ -82,5 +82,23 @@ spec:
8282
value: {{ .Values.planetDump.resources.requests.memory | default "2Gi" | quote}}
8383
{{- end }}
8484
restartPolicy: OnFailure
85+
{{- if .Values.planetDump.nodeSelector.enabled }}
86+
nodeSelector:
87+
{{ .Values.planetDump.nodeSelector.label_key }} : {{ .Values.planetDump.nodeSelector.label_value }}
88+
{{- end }}
89+
# Affinity settings
90+
{{- if .Values.planetDump.nodeAffinity.enabled }}
91+
affinity:
92+
nodeAffinity:
93+
requiredDuringSchedulingIgnoredDuringExecution:
94+
nodeSelectorTerms:
95+
- matchExpressions:
96+
- key: {{ .Values.planetDump.nodeAffinity.key }}
97+
operator: In
98+
values:
99+
{{- range .Values.planetDump.nodeAffinity.values }}
100+
- {{ . | quote }}
101+
{{- end }}
102+
{{- end }}
85103
backoffLimit: 3
86104
{{- end }}

‎osm-seed/templates/jobs/populate-apidb-job.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ metadata:
1111
spec:
1212
template:
1313
spec:
14+
{{- if .Values.populateApidb.serviceAccount.enabled }}
15+
serviceAccountName: {{ .Values.populateApidb.serviceAccount.name }}
16+
automountServiceAccountToken: true
17+
{{- end }}
1418
containers:
1519
- name: {{ .Release.Name }}-populate-apidb-job
1620
image: {{ .Values.populateApidb.image.name }}:{{ .Values.populateApidb.image.tag }}
@@ -44,4 +48,18 @@ spec:
4448
nodeSelector:
4549
{{ .Values.populateApidb.nodeSelector.label_key }} : {{ .Values.populateApidb.nodeSelector.label_value }}
4650
{{- end }}
51+
# Affinity settings
52+
{{- if .Values.populateApidb.nodeAffinity.enabled }}
53+
affinity:
54+
nodeAffinity:
55+
requiredDuringSchedulingIgnoredDuringExecution:
56+
nodeSelectorTerms:
57+
- matchExpressions:
58+
- key: {{ .Values.populateApidb.nodeAffinity.key }}
59+
operator: In
60+
values:
61+
{{- range .Values.populateApidb.nodeAffinity.values }}
62+
- {{ . | quote }}
63+
{{- end }}
64+
{{- end }}
4765
{{- end }}

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ spec:
1818
labels:
1919
app: {{ template "osm-seed.name" . }}
2020
spec:
21+
{{- if .Values.replicationJob.serviceAccount.enabled }}
22+
serviceAccountName: {{ .Values.replicationJob.serviceAccount.name }}
23+
automountServiceAccountToken: true
24+
{{- end }}
2125
priorityClassName: {{ .Release.Name }}-{{ .Values.replicationJob.priorityClass | default "high-priority" }}
2226
containers:
2327
- name: {{ .Release.Name }}-replication-job-deployment
@@ -89,4 +93,18 @@ spec:
8993
nodeSelector:
9094
{{ .Values.replicationJob.nodeSelector.label_key }} : {{ .Values.replicationJob.nodeSelector.label_value }}
9195
{{- end }}
96+
# Affinity settings
97+
{{- if .Values.replicationJob.nodeAffinity.enabled }}
98+
affinity:
99+
nodeAffinity:
100+
requiredDuringSchedulingIgnoredDuringExecution:
101+
nodeSelectorTerms:
102+
- matchExpressions:
103+
- key: {{ .Values.replicationJob.nodeAffinity.key }}
104+
operator: In
105+
values:
106+
{{- range .Values.replicationJob.nodeAffinity.values }}
107+
- {{ . | quote }}
108+
{{- end }}
109+
{{- end }}
92110
{{- end }}

‎osm-seed/templates/jobs/replication-monitoring-job.yaml‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ spec:
1919
ttlSecondsAfterFinished: 60
2020
template:
2121
spec:
22-
{{- if .Values.monitoringReplication.nodeSelector.enabled }}
23-
nodeSelector:
24-
{{ .Values.monitoringReplication.nodeSelector.label_key }} : {{ .Values.monitoringReplication.nodeSelector.label_value }}
22+
{{- if .Values.monitoringReplication.serviceAccount.enabled }}
23+
serviceAccountName: {{ .Values.monitoringReplication.serviceAccount.name }}
24+
automountServiceAccountToken: true
2525
{{- end }}
2626
containers:
2727
- name: {{ .Release.Name }}-replication-monitoring-job
@@ -78,5 +78,23 @@ spec:
7878
value: {{ .Values.monitoringReplication.resources.requests.memory | default "2Gi" | quote}}
7979
{{- end }}
8080
restartPolicy: OnFailure
81+
{{- if .Values.monitoringReplication.nodeSelector.enabled }}
82+
nodeSelector:
83+
{{ .Values.monitoringReplication.nodeSelector.label_key }} : {{ .Values.monitoringReplication.nodeSelector.label_value }}
84+
{{- end }}
85+
# Affinity settings
86+
{{- if .Values.monitoringReplication.nodeAffinity.enabled }}
87+
affinity:
88+
nodeAffinity:
89+
requiredDuringSchedulingIgnoredDuringExecution:
90+
nodeSelectorTerms:
91+
- matchExpressions:
92+
- key: {{ .Values.monitoringReplication.nodeAffinity.key }}
93+
operator: In
94+
values:
95+
{{- range .Values.monitoringReplication.nodeAffinity.values }}
96+
- {{ . | quote }}
97+
{{- end }}
98+
{{- end }}
8199
backoffLimit: 3
82100
{{- end }}

0 commit comments

Comments
 (0)