Skip to content

Fix: allow defining topologySpreadConstraints properly #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Manan-Kothari wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: allow defining topologySpreadConstraints properly #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion helm-chart/ray-cluster/templates/raycluster-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ spec:
{{ if .Values.head.volumes }}
volumes: {{- toYaml .Values.head.volumes | nindent 10 }}
{{- end }}
{{- if .Values.head.topologySpreadConstraints.enabled }}
{{- if .Values.head.topologySpreadConstraints }}
topologySpreadConstraints: {{- toYaml .Values.head.topologySpreadConstraints | nindent 10 }}
{{- end }}
affinity: {{- toYaml .Values.head.affinity | nindent 10 }}
Expand Down Expand Up @@ -298,6 +298,9 @@ spec:
{{ if .Values.worker.volumes }}
volumes: {{- toYaml .Values.worker.volumes | nindent 10 }}
{{- end }}
{{- if .Values.worker.topologySpreadConstraints }}
topologySpreadConstraints: {{- toYaml .Values.worker.topologySpreadConstraints | nindent 10 }}
{{- end }}
affinity: {{- toYaml .Values.worker.affinity | nindent 10 }}
{{ if .Values.worker.priorityClassName }}
priorityClassName: {{- toYaml .Values.worker.priorityClassName | nindent 10 }}
Expand Down
68 changes: 33 additions & 35 deletions helm-chart/ray-cluster/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ nameOverride: "kuberay"
fullnameOverride: ""

imagePullSecrets: []
# - name: an-existing-secret
# - name: an-existing-secret

# common defined values shared between the head and worker
common:
Expand All @@ -34,24 +34,24 @@ head:
# autoscalerOptions is an OPTIONAL field specifying configuration overrides for the Ray autoscaler.
# The example configuration shown below represents the DEFAULT values.
# autoscalerOptions:
# upscalingMode: Default
# idleTimeoutSeconds is the number of seconds to wait before scaling down a worker pod which is not using Ray resources.
# idleTimeoutSeconds: 60
# imagePullPolicy optionally overrides the autoscaler container's default image pull policy (IfNotPresent).
# imagePullPolicy: IfNotPresent
# Optionally specify the autoscaler container's securityContext.
# securityContext: {}
# env: []
# envFrom: []
# resources specifies optional resource request and limit overrides for the autoscaler container.
# For large Ray clusters, we recommend monitoring container resource usage to determine if overriding the defaults is required.
# resources:
# limits:
# cpu: "500m"
# memory: "512Mi"
# requests:
# cpu: "500m"
# memory: "512Mi"
# upscalingMode: Default
# idleTimeoutSeconds is the number of seconds to wait before scaling down a worker pod which is not using Ray resources.
# idleTimeoutSeconds: 60
# imagePullPolicy optionally overrides the autoscaler container's default image pull policy (IfNotPresent).
# imagePullPolicy: IfNotPresent
# Optionally specify the autoscaler container's securityContext.
# securityContext: {}
# env: []
# envFrom: []
# resources specifies optional resource request and limit overrides for the autoscaler container.
# For large Ray clusters, we recommend monitoring container resource usage to determine if overriding the defaults is required.
# resources:
# limits:
# cpu: "500m"
# memory: "512Mi"
# requests:
# cpu: "500m"
# memory: "512Mi"
labels: {}
# Note: From KubeRay v0.6.0, users need to create the ServiceAccount by themselves if they specify the `serviceAccountName`
# in the headGroupSpec. See https://github.com/ray-project/kuberay/pull/1128 for more details.
Expand All @@ -64,8 +64,8 @@ head:
# - name: EXAMPLE_ENV
# value: "1"
envFrom: []
# - secretRef:
# name: my-env-secret
# - secretRef:
# name: my-env-secret
# ports optionally allows specifying ports for the Ray container.
# ports: []
# resource requests and limits for the Ray head container.
Expand Down Expand Up @@ -111,9 +111,9 @@ head:
# Optional, for the user to provide any additional fields to the service.
# See https://pkg.go.dev/k8s.io/Kubernetes/pkg/api/v1#Service
headService: {}
# metadata:
# annotations:
# prometheus.io/scrape: "true"
# metadata:
# annotations:
# prometheus.io/scrape: "true"

# Custom pod DNS configuration
# See https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config
Expand All @@ -126,8 +126,7 @@ head:
# - name: ndots
# value: "2"
# - name: edns0
topologySpreadConstraints: {}

topologySpreadConstraints: []

worker:
# If you want to disable the default workergroup
Expand All @@ -147,8 +146,8 @@ worker:
# - name: EXAMPLE_ENV
# value: "1"
envFrom: []
# - secretRef:
# name: my-env-secret
# - secretRef:
# name: my-env-secret
# ports optionally allows specifying ports for the Ray container.
# ports: []
# resource requests and limits for the Ray head container.
Expand Down Expand Up @@ -190,8 +189,7 @@ worker:
# container command for worker Pod.
command: []
args: []
topologySpreadConstraints: {}

topologySpreadConstraints: []

# Custom pod DNS configuration
# See https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config
Expand Down Expand Up @@ -222,11 +220,11 @@ additionalWorkerGroups:
# containerEnv specifies environment variables for the Ray container,
# Follows standard K8s container env schema.
containerEnv: []
# - name: EXAMPLE_ENV
# value: "1"
# - name: EXAMPLE_ENV
# value: "1"
envFrom: []
# - secretRef:
# name: my-env-secret
# - secretRef:
# name: my-env-secret
# ports optionally allows specifying ports for the Ray container.
# ports: []
# resource requests and limits for the Ray head container.
Expand Down Expand Up @@ -269,7 +267,7 @@ additionalWorkerGroups:

# Topology Spread Constraints for worker pods
# See: https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/
topologySpreadConstraints: {}
topologySpreadConstraints: []

# Custom pod DNS configuration
# See https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config
Expand Down