Skip to content

Commit b2222fd

Browse files
nicktrnnicktrn
committed
podAnnotations for all services
1 parent f39d93d commit b2222fd

File tree

8 files changed

+64
-31
lines changed

8 files changed

+64
-31
lines changed

‎hosting/k8s/helm/templates/clickhouse.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ spec:
1414
{{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 6 }}
1515
template:
1616
metadata:
17+
{{- with .Values.clickhouse.podAnnotations }}
18+
annotations:
19+
{{- toYaml . | nindent 8 }}
20+
{{- end }}
1721
labels:
1822
{{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 8 }}
1923
spec:

‎hosting/k8s/helm/templates/electric.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ spec:
1313
{{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 6 }}
1414
template:
1515
metadata:
16+
{{- with .Values.electric.podAnnotations }}
17+
annotations:
18+
{{- toYaml . | nindent 8 }}
19+
{{- end }}
1620
labels:
1721
{{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 8 }}
1822
spec:

‎hosting/k8s/helm/templates/minio.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ spec:
1414
{{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 6 }}
1515
template:
1616
metadata:
17+
{{- with .Values.minio.podAnnotations }}
18+
annotations:
19+
{{- toYaml . | nindent 8 }}
20+
{{- end }}
1721
labels:
1822
{{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 8 }}
1923
spec:

‎hosting/k8s/helm/templates/postgresql.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ spec:
1414
{{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 6 }}
1515
template:
1616
metadata:
17+
{{- with .Values.postgresql.podAnnotations }}
18+
annotations:
19+
{{- toYaml . | nindent 8 }}
20+
{{- end }}
1721
labels:
1822
{{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 8 }}
1923
spec:

‎hosting/k8s/helm/templates/redis.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ spec:
1414
{{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 6 }}
1515
template:
1616
metadata:
17+
{{- with .Values.redis.podAnnotations }}
18+
annotations:
19+
{{- toYaml . | nindent 8 }}
20+
{{- end }}
1721
labels:
1822
{{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 8 }}
1923
spec:

‎hosting/k8s/helm/templates/registry.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ spec:
1414
{{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 6 }}
1515
template:
1616
metadata:
17+
{{- with .Values.registry.podAnnotations }}
18+
annotations:
19+
{{- toYaml . | nindent 8 }}
20+
{{- end }}
1721
labels:
1822
{{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 8 }}
1923
spec:

‎hosting/k8s/helm/templates/supervisor.yaml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,10 @@ spec:
6464
metadata:
6565
labels:
6666
{{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 8 }}
67+
{{- with .Values.supervisor.podAnnotations }}
6768
annotations:
68-
prometheus.io/scrape: "true"
69-
prometheus.io/port: "{{ .Values.supervisor.service.ports.metrics }}"
70-
prometheus.io/path: "/metrics"
71-
{{- with .Values.podAnnotations }}
7269
{{- toYaml . | nindent 8 }}
73-
{{- end }}
70+
{{- end }}
7471
spec:
7572
serviceAccountName: {{ include "trigger-v4.supervisorServiceAccountName" . }}
7673
{{- with .Values.supervisor.podSecurityContext }}
@@ -218,15 +215,15 @@ spec:
218215
{{- else }}
219216
emptyDir: {}
220217
{{- end }}
221-
{{- with .Values.nodeSelector }}
218+
{{- with .Values.supervisor.nodeSelector }}
222219
nodeSelector:
223220
{{- toYaml . | nindent 8 }}
224221
{{- end }}
225-
{{- with .Values.affinity }}
222+
{{- with .Values.supervisor.affinity }}
226223
affinity:
227224
{{- toYaml . | nindent 8 }}
228225
{{- end }}
229-
{{- with .Values.tolerations }}
226+
{{- with .Values.supervisor.tolerations }}
230227
tolerations:
231228
{{- toYaml . | nindent 8 }}
232229
{{- end }}

‎hosting/k8s/helm/values.yaml‎

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -105,29 +105,23 @@ webapp:
105105
basicAuth: {}
106106

107107
# OpenTelemetry configuration
108-
# internal:
109-
# otel:
110-
# trace:
111-
# exporterUrl: ""
112-
# exporterAuthHeaders: ""
113-
# loggingEnabled: "1"
114-
# samplingRate: "20"
115-
# instrumentPrismaEnabled: "0"
116-
# disabled: "0"
117-
# log:
118-
# exporterUrl: ""
119-
# # Log auth headers are currently set to trace.exporterAuthHeaders
120-
# metric:
121-
# exporterUrl: ""
122-
# exporterAuthHeaders: ""
123-
# exporterEnabled: "0"
124-
# exporterIntervalMs: 30000
125-
126-
nodeSelector: {}
127-
128-
tolerations: []
129-
130-
affinity: {}
108+
internal:
109+
otel:
110+
trace:
111+
exporterUrl: ""
112+
exporterAuthHeaders: ""
113+
loggingEnabled: "1"
114+
samplingRate: "20"
115+
instrumentPrismaEnabled: "0"
116+
disabled: "0"
117+
log:
118+
exporterUrl: ""
119+
# Log auth headers are currently set to trace.exporterAuthHeaders
120+
metric:
121+
exporterUrl: ""
122+
exporterAuthHeaders: ""
123+
exporterEnabled: "0"
124+
exporterIntervalMs: 30000
131125

132126
# Shared application configuration (used by multiple services)
133127
config:
@@ -171,6 +165,8 @@ postgresql:
171165
password: "postgres"
172166
database: "main"
173167

168+
podAnnotations: {}
169+
174170
# podSecurityContext:
175171
# fsGroup: 1000
176172

@@ -213,6 +209,8 @@ redis:
213209
auth:
214210
enabled: false
215211

212+
podAnnotations: {}
213+
216214
# podSecurityContext:
217215
# fsGroup: 1000
218216

@@ -251,6 +249,8 @@ electric:
251249
insecure: true
252250
usageReporting: false
253251

252+
podAnnotations: {}
253+
254254
# podSecurityContext:
255255
# fsGroup: 1000
256256

@@ -281,6 +281,8 @@ clickhouse:
281281
adminUser: "default"
282282
adminPassword: "password"
283283

284+
podAnnotations: {}
285+
284286
# podSecurityContext:
285287
# fsGroup: 1000
286288

@@ -314,6 +316,8 @@ minio:
314316
rootUser: "admin"
315317
rootPassword: "very-safe-password"
316318

319+
podAnnotations: {}
320+
317321
# podSecurityContext:
318322
# fsGroup: 1000
319323

@@ -350,6 +354,8 @@ registry:
350354
username: "registry-user"
351355
password: "very-secure-indeed"
352356

357+
podAnnotations: {}
358+
353359
# podSecurityContext:
354360
# fsGroup: 1000
355361

@@ -388,6 +394,8 @@ supervisor:
388394
tag: "" # Defaults to Chart.appVersion when empty
389395
pullPolicy: IfNotPresent
390396

397+
podAnnotations: {}
398+
391399
# podSecurityContext:
392400
# fsGroup: 1000
393401

@@ -459,6 +467,10 @@ supervisor:
459467
labels: {}
460468
basicAuth: {}
461469

470+
nodeSelector: {}
471+
tolerations: []
472+
affinity: {}
473+
462474
# Shared persistent volumes
463475
persistence:
464476
# This is used for the worker token file

0 commit comments

Comments
 (0)