Prod -> staging (#513)

* bump * trigger ci * Nest under dask-gateway? * use pangeo-image * Revert "Merge pull request #506 from TomAugspurger/match-default-image" This reverts commit bd106c8, reversing changes made to 6dd8830. * use local config * trivial change to trigger rebuild * Bump build timeouts * pin versions (ocean) (#514)
pangeo-data · Jan 26, 2020 · 72d7f56 · 72d7f56
1 parent f8c5652
commit 72d7f56
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 50 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -49,6 +49,7 @@ jobs:
       - run:
           name: Test building dev.pangeo.io image if needed
           when: always
+          no_output_timeout: 60m
           command: |
             hubploy build dev --commit-range ${COMMIT_RANGE}
 
@@ -62,6 +63,7 @@ jobs:
       - run:
           name: Test building hydro.pangeo.io image if needed
           when: always
+          no_output_timeout: 60m
           command: |
             hubploy build hydro --commit-range ${COMMIT_RANGE}
 
@@ -168,6 +170,7 @@ jobs:
       - run:
           name: Build dev.pangeo.io image if needed
           when: always
+          no_output_timeout: 60m
           command: |
             hubploy build dev --check-registry --push
 
@@ -181,6 +184,7 @@ jobs:
       - run:
           name: Build hydro.pangeo.io image if needed
           when: always
+          no_output_timeout: 60m
           command: |
             hubploy build hydro --check-registry --push
 

diff --git a/deployments/dev/image/binder/dask_config.yaml b/deployments/dev/image/binder/dask_config.yaml
@@ -49,3 +49,5 @@ gateway:
   proxy-address: tls://35.225.202.35:8786
   auth:
     type: jupyterhub
+  cluster:
+    image: ${JUPYTER_IMAGE_SPEC}
diff --git a/deployments/ocean/image/binder/dask_config.yaml b/deployments/ocean/image/binder/dask_config.yaml
@@ -27,8 +27,8 @@ kubernetes:
           - "11.5GB"
           - --death-timeout
           - '60'
-        image: ${JUPYTER_IMAGE_SPEC}
         name: dask-${JUPYTERHUB_USER}
+        image: ${JUPYTER_IMAGE_SPEC}
         resources:
           limits:
             cpu: 16

diff --git a/deployments/ocean/image/binder/environment.yml b/deployments/ocean/image/binder/environment.yml
@@ -2,23 +2,25 @@ name: pangeo
 channels:
   - conda-forge
 dependencies:
-  - cc-plugin-ncei
-  - ciso
+  - cc-plugin-ncei==2.0.2
+  - ciso==0.1.0
   - compliance-checker
-  - ctd
-  - geolinks
-  - gridgeo
-  - ioos-tools
-  - nc-time-axis
-  - pocean-core
-  - podaacpy
-  - pyarrow
-  - pyoos
-  - retrying
-  - unyt
-  - utide
-  - xlrd
-  - nbdime
+  - ctd==1.0.0
+  - geolinks==0.2.0
+  - gridgeo==1.5.2
+  - ioos-tools==1.4.0
+  - nc-time-axis==1.2.0
+  - pocean-core==1.9.3
+  - podaacpy==2.4.0
+  - pyarrow==0.15.1
+  - pyoos==0.8.4
+  - python=3.7
+  - retrying==1.3.3
+  - unyt==2.6.0
+  - utide==0.2.5
+  - xlrd==1.2.0
+  - nbdime==1.1.0
+  - pip
   - pip:
     - git+https://github.com/xgcm/xgcm.git@master
     - git+https://github.com/intake/filesystem_spec.git@master

diff --git a/pangeo-deploy/values.yaml b/pangeo-deploy/values.yaml
@@ -37,39 +37,44 @@ pangeo:
         enabled: true
       userPlaceholder:
         enabled: false
-  gateway:
-    clusterManager:
-      clusterStartTimeout: 600
-      workerStartTimeout: 600
-      worker:
-        extraPodConfig:
-          tolerations:
-            - key: "k8s.dask.org_dedicated"
-              operator: "Equal"
-              value: "worker"
-      scheduler:
-        extraPodConfig:
-          tolerations:
-            - key: "k8s.dask.org_dedicated"
-              operator: "Equal"
-              value: "worker"
-    extraConfig: |
-      from dask_gateway_server.options import Options, Integer, Float, String
-      def option_handler(options):
-          if ":" not in options.image:
-              raise ValueError("When specifying an image you must also provide a tag")
-          return {
-              "worker_cores_limit": options.worker_cores,
-              "worker_cores": min(options.worker_cores / 2, 1),
-              "worker_memory": "%fG" % options.worker_memory,
-              "image": options.image,
-          }
-      c.DaskGateway.cluster_manager_options = Options(
-          Integer("worker_cores", 2, min=1, max=4, label="Worker Cores"),
-          Float("worker_memory", 4, min=1, max=8, label="Worker Memory (GiB)"),
-          String("image", default="daskgateway/dask-gateway:0.6.1", label="Image"),
-          handler=option_handler,
-      )
+  dask-gateway:
+    gateway:
+      clusterManager:
+        image:
+          name: pangeo/base-notebook
+          tag: 2019.12.24
+        clusterStartTimeout: 600
+        workerStartTimeout: 600
+        worker:
+          extraPodConfig:
+            tolerations:
+              - key: "k8s.dask.org_dedicated"
+                operator: "Equal"
+                value: "worker"
+        scheduler:
+          extraPodConfig:
+            tolerations:
+              - key: "k8s.dask.org_dedicated"
+                operator: "Equal"
+                value: "worker"
+      extraConfig: |
+        from dask_gateway_server.options import Options, Integer, Float, String
+
+        def option_handler(options):
+            if ":" not in options.image:
+                raise ValueError("When specifying an image you must also provide a tag")
+            return {
+                "worker_cores_limit": options.worker_cores,
+                "worker_cores": min(options.worker_cores / 2, 1),
+                "worker_memory": "%fG" % options.worker_memory,
+                "image": options.image,
+            }
+        c.DaskGateway.cluster_manager_options = Options(
+            Integer("worker_cores", 2, min=1, max=4, label="Worker Cores"),
+            Float("worker_memory", 4, min=1, max=8, label="Worker Memory (GiB)"),
+            String("image", default="pangeo/base-notebook:2019.12.24", label="Image"),
+            handler=option_handler,
+        )
 
 homeDirectories:
   nfs: