From b72ea4489c527dc6e6fc790455f759477c304606 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 20 Dec 2024 13:24:02 -0700 Subject: [PATCH] Replace affinity with simpler node selector --- applications/nublado/values-idfdev.yaml | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/applications/nublado/values-idfdev.yaml b/applications/nublado/values-idfdev.yaml index d7e4f3edcf..a7395393b6 100644 --- a/applications/nublado/values-idfdev.yaml +++ b/applications/nublado/values-idfdev.yaml @@ -4,16 +4,9 @@ controller: config: logLevel: "DEBUG" fileserver: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: "node_pool" - operator: "In" - values: - - "user-lab-pool" enabled: true + nodeSelector: + node_pool: "user-lab-pool" tolerations: - key: "nublado.lsst.io/permitted" operator: "Exists" @@ -29,15 +22,6 @@ controller: repository: "sciplat" image: "sciplat-lab" lab: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: "node_pool" - operator: "In" - values: - - "user-lab-pool" env: AUTO_REPO_SPECS: "https://github.com/lsst-sqre/system-test@prod,https://github.com/rubin-dp0/tutorial-notebooks@prod" AWS_SHARED_CREDENTIALS_FILE: "/opt/lsst/software/jupyterlab/secrets/aws-credentials.ini" @@ -55,6 +39,8 @@ controller: volumeMounts: - containerPath: "/home" volumeName: "home" + nodeSelector: + node_pool: "user-lab-pool" secrets: - secretName: "nublado-lab-secret" secretKey: "aws-credentials.ini"