Merge branch 'master' into tidy_issue_handler

armadaproject · Jun 22, 2023 · 1fc0300 · 1fc0300
2 parents cbb35d5 + 3411e77
commit 1fc0300
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/config/scheduler/config.yaml b/config/scheduler/config.yaml
@@ -104,8 +104,10 @@ scheduling:
  resourceScarcity:
  cpu: 1.0
  indexedResources:
- - cpu
- - memory
+ - name: "cpu"
+ resolution: "100m"
+ - name: "memory"
+ resolution: "1Mi"
  gangIdAnnotation: armadaproject.io/gangId
  gangCardinalityAnnotation: armadaproject.io/gangCardinality