Skip to content

Commit 3fc1a10

Browse files
justcoonjustcoon
authored
Helm chart updates (#129)
1 parent 6872208 commit 3fc1a10

File tree

4 files changed

+139
-107
lines changed

4 files changed

+139
-107
lines changed

‎kube/golem-chart/templates/deployment.yaml‎

Lines changed: 88 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ spec:
109109
- name: REDIS_HOST
110110
value: {{ .Values.redis.host }}
111111
- name: GOLEM__TEMPLATE_SERVICE__CONFIG__HOST
112-
value: service-golem-service-{{.Values.env}}
112+
value: service-template-service-{{.Values.env}}
113113
- name: GOLEM__TEMPLATE_SERVICE__CONFIG__PORT
114-
value: "{{ .Values.golemService.ports.grpc }}"
114+
value: "{{ .Values.templateService.ports.grpc }}"
115115
- name: GOLEM__TEMPLATE_SERVICE__CONFIG__ACCESS_TOKEN
116116
value: "2A354594-7A63-4091-A46B-CC58D379F677"
117117
- name: GOLEM__SHARD_MANAGER_SERVICE__CONFIG__HOST
@@ -159,6 +159,12 @@ spec:
159159
value: "{{ .Values.workerExecutor.ports.http }}"
160160
- name: GOLEM__PORT
161161
value: "{{ .Values.workerExecutor.ports.grpc }}"
162+
- name: GOLEM__PUBLIC_WORKER_API__HOST
163+
value: service-worker-service-{{.Values.env}}
164+
- name: GOLEM__PUBLIC_WORKER_API__PORT
165+
value: "{{ .Values.workerService.ports.grpc }}"
166+
- name: GOLEM__PUBLIC_WORKER_API__ACCESS_TOKEN
167+
value: "2A354594-7A63-4091-A46B-CC58D379F677"
162168
{{- if eq .Values.templateCompiledStore.type "pvc" }}
163169
- name: GOLEM__COMPILED_TEMPLATE_SERVICE__TYPE
164170
value: "Local"
@@ -235,40 +241,46 @@ spec:
235241
apiVersion: apps/v1
236242
kind: Deployment
237243
metadata:
238-
name: deployment-worker-bridge-{{.Values.env}}
244+
name: deployment-worker-service-{{.Values.env}}
239245
labels:
240246
env: {{.Values.env}}
241247
spec:
242-
replicas: {{ .Values.workerBridge.replica }}
248+
replicas: {{ .Values.workerService.replica }}
243249
selector:
244250
matchLabels:
245-
app: worker-bridge-app-{{.Values.env}}
251+
app: worker-service-app-{{.Values.env}}
246252
template:
247253
metadata:
248254
labels:
249-
app: worker-bridge-app-{{.Values.env}}
255+
app: worker-service-app-{{.Values.env}}
250256
env: {{.Values.env}}
251257
spec:
252258
{{- if .Values.serviceAccountName }}
253259
serviceAccountName: {{ .Values.serviceAccountName }}
254260
{{- end }}
255-
{{- if .Values.workerBridge.nodeSelector }}
256-
nodeSelector: {{- .Values.workerBridge.nodeSelector | toYaml | nindent 8 }}
261+
{{- if .Values.workerService.nodeSelector }}
262+
nodeSelector: {{- .Values.workerService.nodeSelector | toYaml | nindent 8 }}
257263
{{- end }}
258264
containers:
259-
- name: worker-bridge-app-{{.Values.env}}
260-
image: "{{ .Values.workerBridge.image }}"
261-
imagePullPolicy: {{.Values.workerBridge.imagePullPolicy}}
265+
- name: worker-service-app-{{.Values.env}}
266+
image: "{{ .Values.workerService.image }}"
267+
imagePullPolicy: {{.Values.workerService.imagePullPolicy}}
262268
env:
263269
- name: ENVIRONMENT
264270
value: {{.Values.env}}
271+
- name: GOLEM__ENVIRONMENT
272+
value: {{.Values.env}}
265273
- name: REDIS_HOST
266274
value: {{ .Values.redis.host }}
267-
- name: GOLEM__TEMPLATE_SERVICE__CONFIG__HOST
268-
value: service-golem-service-{{.Values.env}}
269-
- name: GOLEM__TEMPLATE_SERVICE__CONFIG__PORT
270-
value: "{{ .Values.golemService.ports.grpc }}"
271-
- name: GOLEM__TEMPLATE_SERVICE__CONFIG__ACCESS_TOKEN
275+
- name: GOLEM__ROUTING_TABLE__HOST
276+
value: service-shard-manager-{{.Values.env}}
277+
- name: GOLEM__ROUTING_TABLE__PORT
278+
value: "{{ .Values.shardManager.ports.grpc }}"
279+
- name: GOLEM__TEMPLATE_SERVICE__HOST
280+
value: service-template-service-{{.Values.env}}
281+
- name: GOLEM__TEMPLATE_SERVICE__PORT
282+
value: "{{ .Values.templateService.ports.grpc }}"
283+
- name: GOLEM__TEMPLATE_SERVICE__ACCESS_TOKEN
272284
value: "2A354594-7A63-4091-A46B-CC58D379F677"
273285
- name: GOLEM__REDIS__KEY_PREFIX
274286
value: {{.Values.env}}
@@ -297,66 +309,66 @@ spec:
297309
value: "info"
298310
- name: GOLEM__ENABLE_JSON_LOG
299311
value: "{{ .Values.logging.json }}"
300-
- name: GOLEM__HTTP_PORT
301-
value: "{{ .Values.workerBridge.ports.requestHttp }}"
302-
- name: GOLEM__MANAGEMENT_PORT
303-
value: "{{ .Values.workerBridge.ports.mgmtHttp }}"
312+
- name: GOLEM__CUSTOM_REQUEST_PORT
313+
value: "{{ .Values.workerService.ports.requestHttp }}"
314+
- name: GOLEM__PORT
315+
value: "{{ .Values.workerService.ports.http }}"
316+
- name: GOLEM__WORKER_GRPC_PORT
317+
value: "{{ .Values.workerService.ports.grpc }}"
304318
ports:
305-
- name: mhttp
306-
containerPort: {{ .Values.workerBridge.ports.mgmtHttp }}
307319
- name: rhttp
308-
containerPort: {{ .Values.workerBridge.ports.requestHttp }}
309-
{{/* livenessProbe:*/}}
310-
{{/* httpGet:*/}}
311-
{{/* path: "/healthcheck"*/}}
312-
{{/* port: mhttp*/}}
313-
{{/* periodSeconds: 10*/}}
314-
{{/* failureThreshold: 5*/}}
315-
{{/* initialDelaySeconds: 45*/}}
316-
{{/* timeoutSeconds: 2*/}}
317-
{{/* readinessProbe:*/}}
318-
{{/* httpGet:*/}}
319-
{{/* path: "/healthcheck"*/}}
320-
{{/* port: mhttp*/}}
321-
{{/* periodSeconds: 10*/}}
322-
{{/* failureThreshold: 5*/}}
323-
{{/* initialDelaySeconds: 20*/}}
320+
containerPort: {{ .Values.workerService.ports.requestHttp }}
321+
- name: http
322+
containerPort: {{ .Values.workerService.ports.http }}
323+
- name: grpc
324+
containerPort: {{ .Values.workerService.ports.grpc }}
325+
livenessProbe:
326+
httpGet:
327+
path: "/healthcheck"
328+
port: http
329+
periodSeconds: 10
330+
failureThreshold: 5
331+
initialDelaySeconds: 45
332+
timeoutSeconds: 2
333+
readinessProbe:
334+
httpGet:
335+
path: "/healthcheck"
336+
port: http
337+
periodSeconds: 10
338+
failureThreshold: 5
339+
initialDelaySeconds: 20
324340
---
325341

326342
apiVersion: apps/v1
327343
kind: Deployment
328344
metadata:
329-
name: deployment-golem-service-{{.Values.env}}
345+
name: deployment-template-service-{{.Values.env}}
330346
labels:
331347
env: {{.Values.env}}
332348
spec:
333-
replicas: {{ .Values.golemService.replica }}
349+
replicas: {{ .Values.templateService.replica }}
334350
selector:
335351
matchLabels:
336-
app: golem-service-app-{{.Values.env}}
352+
app: template-service-app-{{.Values.env}}
337353
template:
338354
metadata:
339355
labels:
340-
app: golem-service-app-{{.Values.env}}
356+
app: template-service-app-{{.Values.env}}
341357
env: {{.Values.env}}
342358
spec:
343359
{{- if .Values.serviceAccountName }}
344360
serviceAccountName: {{ .Values.serviceAccountName }}
345361
{{- end }}
346-
{{- if .Values.golemService.nodeSelector }}
347-
nodeSelector: {{- .Values.golemService.nodeSelector | toYaml | nindent 8 }}
362+
{{- if .Values.templateService.nodeSelector }}
363+
nodeSelector: {{- .Values.templateService.nodeSelector | toYaml | nindent 8 }}
348364
{{- end }}
349365
containers:
350-
- name: golem-service-app-{{.Values.env}}
351-
image: "{{ .Values.golemService.image }}"
352-
imagePullPolicy: {{.Values.golemService.imagePullPolicy}}
366+
- name: template-service-app-{{.Values.env}}
367+
image: "{{ .Values.templateService.image }}"
368+
imagePullPolicy: {{.Values.templateService.imagePullPolicy}}
353369
env:
354370
- name: ENVIRONMENT
355371
value: {{.Values.env}}
356-
- name: GOLEM__ROUTING_TABLE__HOST
357-
value: service-shard-manager-{{.Values.env}}
358-
- name: GOLEM__ROUTING_TABLE__PORT
359-
value: "{{ .Values.shardManager.ports.grpc }}"
360372
- name: RUST_BACKTRACE
361373
value: "1"
362374
- name: RUST_LOG
@@ -387,46 +399,46 @@ spec:
387399
key: {{ .Values.postgres.password.fromSecret.key }}
388400
{{- end }}
389401
- name: GOLEM__HTTP_PORT
390-
value: "{{ .Values.golemService.ports.http }}"
402+
value: "{{ .Values.templateService.ports.http }}"
391403
- name: GOLEM__GRPC_PORT
392-
value: "{{ .Values.golemService.ports.grpc }}"
404+
value: "{{ .Values.templateService.ports.grpc }}"
393405
{{- if eq .Values.templateStore.type "pvc" }}
394-
- name: GOLEM__TEMPLATES__STORE__TYPE
406+
- name: GOLEM__TEMPLATE_STORE__TYPE
395407
value: "Local"
396-
- name: GOLEM__TEMPLATES__STORE__CONFIG__ROOT_PATH
408+
- name: GOLEM__TEMPLATE_STORE__CONFIG__ROOT_PATH
397409
value: "/golem/template"
398-
- name: GOLEM__TEMPLATES__STORE__CONFIG__OBJECT_PREFIX
410+
- name: GOLEM__TEMPLATE_STORE__CONFIG__OBJECT_PREFIX
399411
value: ""
400412
{{- end }}
401413
{{- if eq .Values.templateStore.type "s3" }}
402-
- name: GOLEM__TEMPLATES__STORE__TYPE
414+
- name: GOLEM__TEMPLATE_STORE__TYPE
403415
value: "S3"
404-
- name: GOLEM__TEMPLATES__STORE__REGION
416+
- name: GOLEM__TEMPLATE_STORE__REGION
405417
value: {{ .Values.templateStore.s3.region }}
406-
- name: GOLEM__TEMPLATES__STORE__CONFIG__OBJECT_PREFIX
418+
- name: GOLEM__TEMPLATE_STORE__CONFIG__OBJECT_PREFIX
407419
value: {{ .Values.templateStore.s3.objectPrefix }}
408-
- name: GOLEM__TEMPLATES__STORE__CONFIG__BUCKET_NAME
420+
- name: GOLEM__TEMPLATE_STORE__CONFIG__BUCKET_NAME
409421
value: {{ .Values.templateStore.s3.bucket }}
410422
{{- end }}
411423
ports:
412424
- name: http
413-
containerPort: {{ .Values.golemService.ports.http }}
425+
containerPort: {{ .Values.templateService.ports.http }}
414426
- name: grpc
415-
containerPort: {{ .Values.golemService.ports.grpc }}
416-
{{/* livenessProbe:*/}}
417-
{{/* httpGet:*/}}
418-
{{/* path: "/healthcheck"*/}}
419-
{{/* port: http*/}}
420-
{{/* periodSeconds: 10*/}}
421-
{{/* failureThreshold: 5*/}}
422-
{{/* initialDelaySeconds: 20*/}}
423-
{{/* readinessProbe:*/}}
424-
{{/* httpGet:*/}}
425-
{{/* path: "/healthcheck"*/}}
426-
{{/* port: http */}}
427-
{{/* periodSeconds: 10*/}}
428-
{{/* failureThreshold: 5*/}}
429-
{{/* initialDelaySeconds: 20*/}}
427+
containerPort: {{ .Values.templateService.ports.grpc }}
428+
livenessProbe:
429+
httpGet:
430+
path: "/healthcheck"
431+
port: http
432+
periodSeconds: 10
433+
failureThreshold: 5
434+
initialDelaySeconds: 20
435+
readinessProbe:
436+
httpGet:
437+
path: "/healthcheck"
438+
port: http
439+
periodSeconds: 10
440+
failureThreshold: 5
441+
initialDelaySeconds: 20
430442
{{- if eq .Values.templateStore.type "pvc" }}
431443
volumeMounts:
432444
- name: golem-template-store-{{.Values.env}}

‎kube/golem-chart/templates/ingress.yaml‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,32 @@ spec:
1313
rules:
1414
- http:
1515
paths:
16-
- path: /v1/api
17-
pathType: Prefix
16+
- path: "/v1/api"
17+
pathType: ImplementationSpecific
1818
backend:
1919
service:
20-
name: service-worker-bridge-{{.Values.env}}
20+
name: service-worker-service-{{.Values.env}}
2121
port:
22-
number: {{ .Values.workerBridge.ports.mgmtHttp }}
22+
number: {{ .Values.workerService.ports.http }}
23+
- path: "/v2/templates/[^/]+/workers/[^/]+/connect$"
24+
pathType: ImplementationSpecific
25+
backend:
26+
service:
27+
name: service-worker-service-{{.Values.env}}
28+
port:
29+
number: {{ .Values.workerService.ports.http }}
30+
- path: "/v2/templates/[^/]+/workers(.*)"
31+
pathType: ImplementationSpecific
32+
backend:
33+
service:
34+
name: service-worker-service-{{.Values.env}}
35+
port:
36+
number: {{ .Values.workerService.ports.http }}
2337
- path: /
24-
pathType: Prefix
38+
pathType: ImplementationSpecific
2539
backend:
2640
service:
27-
name: service-golem-service-{{.Values.env}}
41+
name: service-template-service-{{.Values.env}}
2842
port:
29-
number: {{ .Values.golemService.ports.http }}
43+
number: {{ .Values.templateService.ports.http }}
3044
{{- end }}

‎kube/golem-chart/templates/service.yaml‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,42 +45,46 @@ spec:
4545
apiVersion: v1
4646
kind: Service
4747
metadata:
48-
name: service-worker-bridge-{{.Values.env}}
48+
name: service-worker-service-{{.Values.env}}
4949
labels:
50-
app: worker-bridge-app-{{.Values.env}}
50+
app: worker-service-app-{{.Values.env}}
5151
env: {{.Values.env}}
5252
spec:
53-
type: {{ .Values.workerBridge.service.type }}
53+
type: {{ .Values.workerService.service.type }}
5454
selector:
55-
app: worker-bridge-app-{{.Values.env}}
55+
app: worker-service-app-{{.Values.env}}
5656
ports:
5757
- protocol: TCP
58-
name: mhttp
59-
port: {{ .Values.workerBridge.ports.mgmtHttp }}
60-
targetPort: {{ .Values.workerBridge.ports.mgmtHttp }}
58+
name: http
59+
port: {{ .Values.workerService.ports.http }}
60+
targetPort: {{ .Values.workerService.ports.http }}
6161
- protocol: TCP
6262
name: rhttp
63-
port: {{ .Values.workerBridge.ports.requestHttp }}
64-
targetPort: {{ .Values.workerBridge.ports.requestHttp }}
63+
port: {{ .Values.workerService.ports.requestHttp }}
64+
targetPort: {{ .Values.workerService.ports.requestHttp }}
65+
- protocol: TCP
66+
name: grpc
67+
port: {{ .Values.workerService.ports.grpc }}
68+
targetPort: {{ .Values.workerService.ports.grpc }}
6569
---
6670

6771
apiVersion: v1
6872
kind: Service
6973
metadata:
70-
name: service-golem-service-{{.Values.env}}
74+
name: service-template-service-{{.Values.env}}
7175
labels:
72-
app: golem-service-app-{{.Values.env}}
76+
app: template-service-app-{{.Values.env}}
7377
env: {{.Values.env}}
7478
spec:
75-
type: {{ .Values.golemService.service.type }}
79+
type: {{ .Values.templateService.service.type }}
7680
selector:
77-
app: golem-service-app-{{.Values.env}}
81+
app: template-service-app-{{.Values.env}}
7882
ports:
7983
- protocol: TCP
8084
name: http
81-
port: {{ .Values.golemService.ports.http }}
82-
targetPort: {{ .Values.golemService.ports.http }}
85+
port: {{ .Values.templateService.ports.http }}
86+
targetPort: {{ .Values.templateService.ports.http }}
8387
- protocol: TCP
8488
name: grpc
85-
port: {{ .Values.golemService.ports.grpc }}
86-
targetPort: {{ .Values.golemService.ports.grpc }}
89+
port: {{ .Values.templateService.ports.grpc }}
90+
targetPort: {{ .Values.templateService.ports.grpc }}

0 commit comments

Comments
 (0)