Merge pull request #746 from pangeo-data/staging

staging -> prod
pangeo-data · Sep 18, 2020 · 9330ad7 · 9330ad7
2 parents 33114ce + 629c97d
commit 9330ad7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -188,7 +188,7 @@ jobs:
           name: Add Runner IP to EKS Kubernetes API Whitelist
           when: always
           command: |
-            AWS_SHARED_CREDENTIALS_FILE=./deployments/icesat2/secrets/aws-config.txt
+            export AWS_SHARED_CREDENTIALS_FILE=./deployments/icesat2/secrets/aws-config.txt
             RUNNERIP=`curl --silent https://checkip.amazonaws.com`
             aws --version
             aws eks update-cluster-config --region us-west-2 --name pangeo --resources-vpc-config publicAccessCidrs=${RUNNERIP}/32 > /dev/null

diff --git a/pangeo-deploy/values.yaml b/pangeo-deploy/values.yaml
@@ -56,6 +56,15 @@ daskhub:
         scheduler:
           extraPodConfig:
             serviceAccountName: pangeo
+            tolerations:
+              - key: "k8s.dask.org/dedicated"
+                operator: "Equal"
+                value: "scheduler"
+                effect: "NoSchedule"
+              - key: "k8s.dask.org_dedicated"
+                operator: "Equal"
+                value: "scheduler"
+                effect: "NoSchedule"
         worker:
           extraContainerConfig:
             securityContext:
@@ -66,6 +75,15 @@ daskhub:
             automountServiceAccountToken: true
             securityContext:
               fsGroup: 1000
+            tolerations:
+              - key: "k8s.dask.org/dedicated"
+                operator: "Equal"
+                value: "worker"
+                effect: "NoSchedule"
+              - key: "k8s.dask.org_dedicated"
+                operator: "Equal"
+                value: "worker"
+                effect: "NoSchedule"
 
         # TODO: figure out a replacement for userLimits.
       extraConfig: