Skip to content

Commit 63fbbaf

Browse files
committed
chore: migrate all scheduler instances to single helm instance
1 parent 5c77d1a commit 63fbbaf

File tree

10 files changed

+9
-82
lines changed

10 files changed

+9
-82
lines changed

ops/helm-charts/scheduler/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{ range .Values.app.queues }}
1+
{{- range .Values.app.queues -}}
22
{{ $resources := .resources | default $.Values.app.resources }}
33
{{ $tolerations := .tolerations | default $.Values.app.tolerations }}
44
{{ $nodeSelector := .nodeSelector | default $.Values.app.nodeSelector }}

ops/k8s-apps/base/scheduler/scheduler.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
spec:
77
chart:
88
spec:
9-
chart: ./ops/helm-charts/generic
9+
chart: ./ops/helm-charts/scheduler
1010
sourceRef:
1111
kind: GitRepository
1212
name: flux-system

ops/k8s-apps/production/kustomization.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,4 @@ resources:
1515
- ./agent
1616
- ./open-policy-agent
1717
- ./podinfo
18-
- ./scheduler-data-ingestion
19-
- ./scheduler-data-model
20-
- ./scheduler-query
18+
- ./scheduler

ops/k8s-apps/production/scheduler-data-ingestion/custom-helm-values.yaml

Lines changed: 0 additions & 23 deletions
This file was deleted.

ops/k8s-apps/production/scheduler-data-ingestion/kustomization.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

ops/k8s-apps/production/scheduler-query/custom-helm-values.yaml

Lines changed: 0 additions & 23 deletions
This file was deleted.

ops/k8s-apps/production/scheduler-query/kustomization.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

ops/k8s-apps/production/scheduler-data-model/custom-helm-values.yaml renamed to ops/k8s-apps/production/scheduler/custom-helm-values.yaml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: helm.toolkit.fluxcd.io/v2
22
kind: HelmRelease
33
metadata:
4-
name: production-scheduler-data-model
4+
name: production-scheduler
55
spec:
66
postRenderers:
77
- kustomize:
@@ -11,14 +11,11 @@ spec:
1111
newTag: deploy-20260106083403-a00c0dd # {"$imagepolicy": "flux-system:oso:tag"}
1212
values:
1313
app:
14-
name: "oso-scheduler-data-model"
15-
args:
16-
- run
17-
- --directory
18-
- warehouse/scheduler
19-
- scheduler
20-
- run
21-
- data_model_run_requests
14+
queues:
15+
- name: "data_model_run_requests"
16+
- name: "data_ingestion_run_requests"
17+
- name: "query_run_requests"
18+
name: "oso-scheduler"
2219
# This only needs to appear in one of the scheduler instances for now. We
2320
# should likely combine these into a single scheduler chart at some point.
2421
roles:

ops/k8s-apps/production/scheduler-data-model/kustomization.yaml renamed to ops/k8s-apps/production/scheduler/kustomization.yaml

File renamed without changes.

ops/k8s-apps/production/scheduler-data-model/namespace.yaml renamed to ops/k8s-apps/production/scheduler/namespace.yaml

File renamed without changes.

0 commit comments

Comments
 (0)