Skip to content

Commit

Permalink
Merge branch 'main' of github.com:dask/dask-kubernetes into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobtomlinson committed Jan 5, 2024
2 parents 220ab7a + 90c7d9b commit 8e7bbac
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- uses: actions/checkout@v2
- name: Lint Helm Chart
run: helm lint dask_kubernetes/operator/deployment/helm/dask-kubernetes-operator
- name: Download Pluto
- name: Install Pluto
uses: FairwindsOps/pluto/[email protected]
- name: Check for deprecated APIs
run: helm template --include-crds dask-operator dask_kubernetes/operator/deployment/helm/dask-kubernetes-operator | pluto detect -
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ The following table lists the configurable parameters of the Dask-kubernetes-ope
| `nodeSelector` | Node selector | `{}` |
| `tolerations` | Tolerations | `[]` |
| `affinity` | Affinity | `{}` |
| `priorityClassName` | Priority class | `null` |
| `kopfArgs` | Command line flags to pass to kopf on start up | `["--all-namespaces"]` |
| `metrics.scheduler.enabled` | Enable scheduler metrics. Pip package [prometheus-client](https://pypi.org/project/prometheus-client/) should be present on scheduler. | `false` |
| `metrics.scheduler.serviceMonitor.enabled` | Enable scheduler servicemonitor. | `false` |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,6 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.priorityClassName }}
priorityClassName: {{ . | quote }}
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ tolerations: [] # Tolerations

affinity: {} # Affinity

priorityClassName: null # Priority class

kopfArgs: # Command line flags to pass to kopf on start up
- --all-namespaces

Expand Down
8 changes: 7 additions & 1 deletion dask_kubernetes/operator/kubecluster/kubecluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ class KubeCluster(Cluster):
used to create the cluster instead of generating one from the other keyword arguments.
scheduler_forward_port: int (optional)
The port to use when forwarding the scheduler dashboard. Will utilize a random port by default
quiet: bool
If enabled, suppress all printed output.
Defaults to ``False``.
**kwargs: dict
Additional keyword arguments to pass to LocalCluster
Expand Down Expand Up @@ -175,6 +178,7 @@ def __init__(
jupyter: bool = False,
loop: Optional[IOLoop] = None,
asynchronous: bool = False,
quiet: bool = False,
**kwargs,
):
name = dask.config.get("kubernetes.name", override_with=name)
Expand Down Expand Up @@ -258,7 +262,9 @@ def __init__(
self._rich_spinner = Spinner("dots", speed=0.5)
self._startup_component_status: dict = {}

super().__init__(name=name, loop=loop, asynchronous=asynchronous, **kwargs)
super().__init__(
name=name, loop=loop, asynchronous=asynchronous, quiet=quiet, **kwargs
)

# If https://github.com/dask/distributed/pull/7941 is merged we can
# simplify the next 8 lines to ``if not self.called_from_running_loop:``
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ kubernetes-asyncio>=12.0.1
kopf>=1.35.3
pykube-ng>=22.9.0
rich>=12.5.1
kr8s>=0.9.0
kr8s==0.9.0

0 comments on commit 8e7bbac

Please sign in to comment.