diff --git a/hack/test-external-login.sh b/hack/test-external-login.sh index 4d5e9cc9..c986727a 100644 --- a/hack/test-external-login.sh +++ b/hack/test-external-login.sh @@ -12,12 +12,13 @@ rendered="$( --set controller.externalConfig.host=controller.example \ --set controller.externalConfig.port=6817 \ --set login.enabled=true \ + --set-json 'login.readinessProbe={"exec":{"command":["/usr/bin/test","-f","/tmp/ready"]},"periodSeconds":5}' \ --set slurmKeyRef.name=external-auth \ --set slurmKeyRef.key=custom.key \ --show-only templates/login/login-deployment.yaml )" -for expected in 'key: "custom.key"' 'path: slurm.key'; do +for expected in 'key: "custom.key"' 'path: slurm.key' 'readinessProbe:' '/tmp/ready'; do if [[ "$rendered" != *"$expected"* ]]; then printf 'external login render is missing %q\n' "$expected" >&2 exit 1 diff --git a/helm/slurm/Chart.yaml b/helm/slurm/Chart.yaml index 9169c4ba..b7173df7 100644 --- a/helm/slurm/Chart.yaml +++ b/helm/slurm/Chart.yaml @@ -6,7 +6,7 @@ name: slurm description: Slurm Cluster type: application appVersion: "25.11" -version: 1.0.3 +version: 1.0.4 annotations: license: Apache-2.0 diff --git a/helm/slurm/templates/login/login-deployment.yaml b/helm/slurm/templates/login/login-deployment.yaml index ae8bb13d..15a79fbb 100644 --- a/helm/slurm/templates/login/login-deployment.yaml +++ b/helm/slurm/templates/login/login-deployment.yaml @@ -85,6 +85,10 @@ spec: resources: {{- toYaml . | nindent 10 }} {{- end }} + {{- with .Values.login.readinessProbe }} + readinessProbe: + {{- toYaml . | nindent 10 }} + {{- end }} env: - name: SLURM_CLUSTER_NAME value: {{ include "slurm.fullname" . }} diff --git a/helm/slurm/values.yaml b/helm/slurm/values.yaml index 5cd08eba..3eec5649 100644 --- a/helm/slurm/values.yaml +++ b/helm/slurm/values.yaml @@ -742,6 +742,10 @@ login: # limits: # cpu: 2 # memory: 4Gi + # + # -- (object) + # Configure the login container readiness probe. + readinessProbe: {} # # Slurm compute (slurmd) configurations.