Skip to content

Commit e168ee7

Browse files
gtoonstragtoonstra
authored
fix: Add new monitors worker for temporal (#318)
1 parent 847c35f commit e168ee7

5 files changed

Lines changed: 110 additions & 106 deletions

File tree

‎charts/datafold-manager/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: datafold-manager
33
description: Helm chart for Datafold Operator
44
type: application
5-
version: 0.1.95
5+
version: 0.1.96
66
appVersion: "1.0.0"
77
icon: https://www.datafold.com/logo.png
88

‎charts/datafold-manager/templates/crds.yaml‎

Lines changed: 86 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -2249,9 +2249,9 @@ spec:
22492249
type: object
22502250
type: object
22512251
type: object
2252-
worker-realtime:
2253-
description: WorkerRealtime enables the realtime temporal worker
2254-
(interactive, api queues)
2252+
worker-monitors:
2253+
description: WorkerMonitors enables the monitors temporal worker
2254+
(monitors queue)
22552255
properties:
22562256
command:
22572257
description: Command is the container command (e.g. ["./manage.py",
@@ -2529,83 +2529,9 @@ spec:
25292529
format: int64
25302530
type: integer
25312531
type: object
2532-
worker-singletons:
2533-
description: WorkerSingletons enables the singletons worker
2534-
properties:
2535-
enabled:
2536-
description: Enabled specifies whether this component should
2537-
be installed
2538-
type: boolean
2539-
rawValues:
2540-
description: |-
2541-
RawValues contains arbitrary Helm values to pass directly to this component's subchart
2542-
These values will be merged with the component's default values and can override any
2543-
configuration option supported by the component's Helm chart
2544-
x-kubernetes-preserve-unknown-fields: true
2545-
replicas:
2546-
description: Replicas specifies the number of replicas for
2547-
this component
2548-
format: int32
2549-
type: integer
2550-
resources:
2551-
description: Resources specifies the resource requirements
2552-
for this component
2553-
properties:
2554-
limits:
2555-
description: Limits specifies the maximum resources that
2556-
can be used
2557-
properties:
2558-
cpu:
2559-
description: CPU specifies the maximum CPU resources
2560-
type: string
2561-
ephemeralStorage:
2562-
description: EphemeralStorage specifies the maximum
2563-
ephemeral storage (e.g. "10Gi")
2564-
type: string
2565-
hugepages1Gi:
2566-
description: Hugepages1Gi specifies the maximum 1Gi
2567-
hugepages (e.g. "1Gi"). Requests must equal limits
2568-
for hugepages.
2569-
type: string
2570-
hugepages2Mi:
2571-
description: Hugepages2Mi specifies the maximum 2Mi
2572-
hugepages (e.g. "128Mi"). Requests must equal limits
2573-
for hugepages.
2574-
type: string
2575-
memory:
2576-
description: Memory specifies the maximum memory resources
2577-
type: string
2578-
type: object
2579-
requests:
2580-
description: Requests specifies the minimum resources
2581-
that should be allocated
2582-
properties:
2583-
cpu:
2584-
description: CPU specifies the minimum CPU resources
2585-
type: string
2586-
ephemeralStorage:
2587-
description: EphemeralStorage specifies the minimum
2588-
ephemeral storage (e.g. "10Gi")
2589-
type: string
2590-
hugepages1Gi:
2591-
description: Hugepages1Gi specifies the minimum 1Gi
2592-
hugepages (e.g. "1Gi"). Must equal limits when both
2593-
are set.
2594-
type: string
2595-
hugepages2Mi:
2596-
description: Hugepages2Mi specifies the minimum 2Mi
2597-
hugepages (e.g. "128Mi"). Must equal limits when
2598-
both are set.
2599-
type: string
2600-
memory:
2601-
description: Memory specifies the minimum memory resources
2602-
type: string
2603-
type: object
2604-
type: object
2605-
type: object
2606-
worker-storage:
2607-
description: WorkerStorage enables the storage temporal worker
2608-
(localstorage, replication queues)
2532+
worker-realtime:
2533+
description: WorkerRealtime enables the realtime temporal worker
2534+
(interactive, api queues)
26092535
properties:
26102536
command:
26112537
description: Command is the container command (e.g. ["./manage.py",
@@ -2883,9 +2809,83 @@ spec:
28832809
format: int64
28842810
type: integer
28852811
type: object
2886-
worker-storage-high:
2887-
description: WorkerStorageHigh enables the high-capacity storage
2888-
temporal worker (localstorage-large queue)
2812+
worker-singletons:
2813+
description: WorkerSingletons enables the singletons worker
2814+
properties:
2815+
enabled:
2816+
description: Enabled specifies whether this component should
2817+
be installed
2818+
type: boolean
2819+
rawValues:
2820+
description: |-
2821+
RawValues contains arbitrary Helm values to pass directly to this component's subchart
2822+
These values will be merged with the component's default values and can override any
2823+
configuration option supported by the component's Helm chart
2824+
x-kubernetes-preserve-unknown-fields: true
2825+
replicas:
2826+
description: Replicas specifies the number of replicas for
2827+
this component
2828+
format: int32
2829+
type: integer
2830+
resources:
2831+
description: Resources specifies the resource requirements
2832+
for this component
2833+
properties:
2834+
limits:
2835+
description: Limits specifies the maximum resources that
2836+
can be used
2837+
properties:
2838+
cpu:
2839+
description: CPU specifies the maximum CPU resources
2840+
type: string
2841+
ephemeralStorage:
2842+
description: EphemeralStorage specifies the maximum
2843+
ephemeral storage (e.g. "10Gi")
2844+
type: string
2845+
hugepages1Gi:
2846+
description: Hugepages1Gi specifies the maximum 1Gi
2847+
hugepages (e.g. "1Gi"). Requests must equal limits
2848+
for hugepages.
2849+
type: string
2850+
hugepages2Mi:
2851+
description: Hugepages2Mi specifies the maximum 2Mi
2852+
hugepages (e.g. "128Mi"). Requests must equal limits
2853+
for hugepages.
2854+
type: string
2855+
memory:
2856+
description: Memory specifies the maximum memory resources
2857+
type: string
2858+
type: object
2859+
requests:
2860+
description: Requests specifies the minimum resources
2861+
that should be allocated
2862+
properties:
2863+
cpu:
2864+
description: CPU specifies the minimum CPU resources
2865+
type: string
2866+
ephemeralStorage:
2867+
description: EphemeralStorage specifies the minimum
2868+
ephemeral storage (e.g. "10Gi")
2869+
type: string
2870+
hugepages1Gi:
2871+
description: Hugepages1Gi specifies the minimum 1Gi
2872+
hugepages (e.g. "1Gi"). Must equal limits when both
2873+
are set.
2874+
type: string
2875+
hugepages2Mi:
2876+
description: Hugepages2Mi specifies the minimum 2Mi
2877+
hugepages (e.g. "128Mi"). Must equal limits when
2878+
both are set.
2879+
type: string
2880+
memory:
2881+
description: Memory specifies the minimum memory resources
2882+
type: string
2883+
type: object
2884+
type: object
2885+
type: object
2886+
worker-storage:
2887+
description: WorkerStorage enables the storage temporal worker
2888+
(localstorage, replication queues)
28892889
properties:
28902890
command:
28912891
description: Command is the container command (e.g. ["./manage.py",
@@ -3163,8 +3163,9 @@ spec:
31633163
format: int64
31643164
type: integer
31653165
type: object
3166-
worker-temporal:
3167-
description: WorkerTemporal enables the base temporal worker
3166+
worker-storage-high:
3167+
description: WorkerStorageHigh enables the high-capacity storage
3168+
temporal worker (localstorage-large queue)
31683169
properties:
31693170
command:
31703171
description: Command is the container command (e.g. ["./manage.py",

‎charts/datafold-manager/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ operator:
1818
# Operator image configuration
1919
image:
2020
repository: us-docker.pkg.dev/datadiff-mm/datafold/datafold-operator
21-
tag: "1.1.65"
21+
tag: "1.1.66"
2222
pullPolicy: Always
2323

2424
# Operator deployment configuration

‎charts/datafold/Chart.yaml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: datafold
33
description: Helm chart package to deploy Datafold on kubernetes.
44
type: application
5-
version: 0.10.79
5+
version: 0.10.80
66
appVersion: "1.0.0"
77
icon: https://www.datafold.com/logo.png
88

@@ -24,10 +24,6 @@ dependencies:
2424
version: "*.*.*"
2525
repository: file://charts/dfshell
2626
condition: dfshell.install
27-
- name: worker-temporal
28-
version: "*.*.*"
29-
repository: file://charts/worker-temporal
30-
condition: worker-temporal.install
3127
- name: worker-temporal
3228
version: "*.*.*"
3329
repository: file://charts/worker-temporal
@@ -58,6 +54,11 @@ dependencies:
5854
repository: file://charts/worker-temporal
5955
condition: worker-storage-high.install
6056
alias: worker-storage-high
57+
- name: worker-temporal
58+
version: "*.*.*"
59+
repository: file://charts/worker-temporal
60+
condition: worker-monitors.install
61+
alias: worker-monitors
6162
- name: operator
6263
version: "*.*.*"
6364
repository: file://charts/operator

‎charts/datafold/values.yaml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -230,20 +230,6 @@ toplevel:
230230
labels: {}
231231
annotations: {}
232232

233-
worker-temporal:
234-
install: false
235-
replicaCount: 0
236-
terminationGracePeriodSeconds: "30"
237-
temporal:
238-
taskQueues: "all"
239-
workerPoolType: "thread"
240-
resources:
241-
limits:
242-
memory: 4Gi
243-
requests:
244-
cpu: 500m
245-
memory: 4Gi
246-
247233
worker-io:
248234
install: true
249235
replicaCount: 0
@@ -334,6 +320,22 @@ worker-storage-high:
334320
cpu: 100m
335321
memory: 30Gi
336322

323+
worker-monitors:
324+
install: true
325+
replicaCount: 0
326+
terminationGracePeriodSeconds: "30"
327+
temporal:
328+
taskQueues: "monitors"
329+
workerPoolType: "process"
330+
keda:
331+
minReplicas: 0
332+
resources:
333+
limits:
334+
memory: 15Gi
335+
requests:
336+
cpu: 200m
337+
memory: 15Gi
338+
337339
worker:
338340
install: true
339341
replicaCount: 1

0 commit comments

Comments
 (0)