Merge pull request #1968 from berkeley-dsep-infra/staging

Merge #1961, #1964, #1966, #1967 to prod
berkeley-dsep-infra · Nov 17, 2020 · 49700fd · 49700fd
2 parents 275eb56 + 62d1a1a
commit 49700fd
Show file tree

Hide file tree

Showing 15 changed files with 65 additions and 41 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -33,9 +33,10 @@ orbs:
                 python3 -m venv venv
                 source venv/bin/activate
                 pip install --upgrade -r requirements.txt
-                # Install repo2docker master to fix offline-notebook
+                # Install repo2docker master to fix offline-notebook and julia
                 # See https://github.com/berkeley-dsep-infra/datahub/pull/1937
-                pip install --upgrade git+https://github.com/jupyter/repo2docker.git@30ef2209cc767826e2647886854fac12469a06c1
+                # See https://github.com/jupyterhub/repo2docker/pull/975
+                pip install --upgrade git+https://github.com/jupyter/repo2docker.git@968cc43a9e238916b5032edbf84e309c8d4ff35e
                 echo 'export PATH="${HOME}/repo/venv/bin:$PATH"' >> ${BASH_ENV}
 
           - unless:
@@ -116,8 +117,9 @@ jobs:
             python3 -m venv venv
             source venv/bin/activate
             pip install --upgrade -r requirements.txt
-            # Install latest repo2docker to get https://github.com/jupyter/repo2docker/pull/859
-            pip install --upgrade git+https://github.com/jupyter/repo2docker@bbc3ee02c0755b15ea456f9ae18dd76b904568e7
+
+            # Keep same repo2docker version in build & deploy jobs
+            pip install --upgrade git+https://github.com/jupyter/repo2docker.git@968cc43a9e238916b5032edbf84e309c8d4ff35e
 
             # Can be removed once https://github.com/docker/docker-py/issues/2225 is merged and released
             pip install --upgrade git+https://github.com/docker/docker-py.git@b6f6e7270ef1acfe7398b99b575d22d0d37ae8bf
@@ -176,10 +178,10 @@ jobs:
           command: |
             hubploy deploy biology hub ${CIRCLE_BRANCH}
 
-      - run:
-          name: Deploy julia
-          command: |
-            hubploy deploy julia hub ${CIRCLE_BRANCH}
+      # - run:
+      #     name: Deploy julia
+      #     command: |
+      #       hubploy deploy julia hub ${CIRCLE_BRANCH}
 
       - run:
           name: Deploy R
@@ -319,15 +321,15 @@ workflows:
                 ignore:
                 - staging
                 - prod
-      - hubploy/build-image:
-          deployment: julia
-          name: julia hub image build
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                ignore:
-                - staging
-                - prod
+      # - hubploy/build-image:
+      #     deployment: julia
+      #     name: julia hub image build
+      #     # Filters can only be per-job? wtf
+      #     filters:
+      #         branches:
+      #           ignore:
+      #           - staging
+      #           - prod
 #      - hubploy/build-image:
 #          deployment: stat89a
 #          name: stat89a image build
@@ -426,16 +428,16 @@ workflows:
                 only:
                 - staging
                 - prod
-      - hubploy/build-image:
-          deployment: julia
-          name: julia hub image build
-          push: true
-          # Filters can only be per-job? wtf
-          filters:
-              branches:
-                only:
-                - staging
-                - prod
+      # - hubploy/build-image:
+      #     deployment: julia
+      #     name: julia hub image build
+      #     push: true
+      #     # Filters can only be per-job? wtf
+      #     filters:
+      #         branches:
+      #           only:
+      #           - staging
+      #           - prod
 #      - hubploy/build-image:
 #          deployment: stat89a
 #          name: stat89a image build
@@ -503,7 +505,7 @@ workflows:
               - biology image build
               - r hub image build
 #              - stat89a image build
-              - julia hub image build
+              # - julia hub image build
               - data102 image build
               - data100 image build
               - data8x image build

diff --git a/deployments/biology/image/infra-requirements.txt b/deployments/biology/image/infra-requirements.txt
@@ -14,7 +14,8 @@ nbconvert==5.6.1
 nbformat==5.0.7
 jupyterlab==2.2.4
 nbgitpuller==0.9.0
-nbresuse==0.3.6
+# Temporary fix until https://github.com/yuvipanda/nbresuse/pull/68/commits/87c306f7a604e866e83c6b1f6d4cc8b4015143c6 is merged
+git+https://github.com/yuvipanda/nbresuse.git@87c306f7a604e866e83c6b1f6d4cc8b4015143c6
 jupyterhub==1.1.0
 appmode==0.8.0
 ipywidgets==7.5.1

diff --git a/deployments/data100/image/infra-requirements.txt b/deployments/data100/image/infra-requirements.txt
@@ -14,7 +14,8 @@ nbconvert==5.6.1
 nbformat==5.0.7
 jupyterlab==2.2.4
 nbgitpuller==0.9.0
-nbresuse==0.3.6
+# Temporary fix until https://github.com/yuvipanda/nbresuse/pull/68/commits/87c306f7a604e866e83c6b1f6d4cc8b4015143c6 is merged
+git+https://github.com/yuvipanda/nbresuse.git@87c306f7a604e866e83c6b1f6d4cc8b4015143c6
 jupyterhub==1.1.0
 appmode==0.8.0
 ipywidgets==7.5.1

diff --git a/deployments/data102/image/infra-requirements.txt b/deployments/data102/image/infra-requirements.txt
@@ -14,7 +14,8 @@ nbconvert==5.6.1
 nbformat==5.0.7
 jupyterlab==2.2.4
 nbgitpuller==0.9.0
-nbresuse==0.3.6
+# Temporary fix until https://github.com/yuvipanda/nbresuse/pull/68/commits/87c306f7a604e866e83c6b1f6d4cc8b4015143c6 is merged
+git+https://github.com/yuvipanda/nbresuse.git@87c306f7a604e866e83c6b1f6d4cc8b4015143c6
 jupyterhub==1.1.0
 appmode==0.8.0
 ipywidgets==7.5.1

diff --git a/deployments/data8x/image/infra-requirements.txt b/deployments/data8x/image/infra-requirements.txt
@@ -14,7 +14,8 @@ nbconvert==5.6.1
 nbformat==5.0.7
 jupyterlab==2.2.4
 nbgitpuller==0.9.0
-nbresuse==0.3.6
+# Temporary fix until https://github.com/yuvipanda/nbresuse/pull/68/commits/87c306f7a604e866e83c6b1f6d4cc8b4015143c6 is merged
+git+https://github.com/yuvipanda/nbresuse.git@87c306f7a604e866e83c6b1f6d4cc8b4015143c6
 jupyterhub==1.1.0
 appmode==0.8.0
 ipywidgets==7.5.1

diff --git a/deployments/datahub/images/default/infra-requirements.txt b/deployments/datahub/images/default/infra-requirements.txt
@@ -14,7 +14,8 @@ nbconvert==5.6.1
 nbformat==5.0.7
 jupyterlab==2.2.4
 nbgitpuller==0.9.0
-nbresuse==0.3.6
+# Temporary fix until https://github.com/yuvipanda/nbresuse/pull/68/commits/87c306f7a604e866e83c6b1f6d4cc8b4015143c6 is merged
+git+https://github.com/yuvipanda/nbresuse.git@87c306f7a604e866e83c6b1f6d4cc8b4015143c6
 jupyterhub==1.1.0
 appmode==0.8.0
 ipywidgets==7.5.1

diff --git a/deployments/eecs/image/infra-requirements.txt b/deployments/eecs/image/infra-requirements.txt
@@ -14,7 +14,8 @@ nbconvert==5.6.1
 nbformat==5.0.7
 jupyterlab==2.2.4
 nbgitpuller==0.9.0
-nbresuse==0.3.6
+# Temporary fix until https://github.com/yuvipanda/nbresuse/pull/68/commits/87c306f7a604e866e83c6b1f6d4cc8b4015143c6 is merged
+git+https://github.com/yuvipanda/nbresuse.git@87c306f7a604e866e83c6b1f6d4cc8b4015143c6
 jupyterhub==1.1.0
 appmode==0.8.0
 ipywidgets==7.5.1

diff --git a/deployments/highschool/image/infra-requirements.txt b/deployments/highschool/image/infra-requirements.txt
@@ -14,7 +14,8 @@ nbconvert==5.6.1
 nbformat==5.0.7
 jupyterlab==2.2.4
 nbgitpuller==0.9.0
-nbresuse==0.3.6
+# Temporary fix until https://github.com/yuvipanda/nbresuse/pull/68/commits/87c306f7a604e866e83c6b1f6d4cc8b4015143c6 is merged
+git+https://github.com/yuvipanda/nbresuse.git@87c306f7a604e866e83c6b1f6d4cc8b4015143c6
 jupyterhub==1.1.0
 appmode==0.8.0
 ipywidgets==7.5.1

diff --git a/deployments/julia/image/infra-requirements.txt b/deployments/julia/image/infra-requirements.txt
@@ -14,7 +14,8 @@ nbconvert==5.6.1
 nbformat==5.0.7
 jupyterlab==2.2.4
 nbgitpuller==0.9.0
-nbresuse==0.3.6
+# Temporary fix until https://github.com/yuvipanda/nbresuse/pull/68/commits/87c306f7a604e866e83c6b1f6d4cc8b4015143c6 is merged
+git+https://github.com/yuvipanda/nbresuse.git@87c306f7a604e866e83c6b1f6d4cc8b4015143c6
 jupyterhub==1.1.0
 appmode==0.8.0
 ipywidgets==7.5.1

diff --git a/deployments/prob140/image/infra-requirements.txt b/deployments/prob140/image/infra-requirements.txt
@@ -14,7 +14,8 @@ nbconvert==5.6.1
 nbformat==5.0.7
 jupyterlab==2.2.4
 nbgitpuller==0.9.0
-nbresuse==0.3.6
+# Temporary fix until https://github.com/yuvipanda/nbresuse/pull/68/commits/87c306f7a604e866e83c6b1f6d4cc8b4015143c6 is merged
+git+https://github.com/yuvipanda/nbresuse.git@87c306f7a604e866e83c6b1f6d4cc8b4015143c6
 jupyterhub==1.1.0
 appmode==0.8.0
 ipywidgets==7.5.1

diff --git a/deployments/r/image/infra-requirements.txt b/deployments/r/image/infra-requirements.txt
@@ -14,7 +14,8 @@ nbconvert==5.6.1
 nbformat==5.0.7
 jupyterlab==2.2.4
 nbgitpuller==0.9.0
-nbresuse==0.3.6
+# Temporary fix until https://github.com/yuvipanda/nbresuse/pull/68/commits/87c306f7a604e866e83c6b1f6d4cc8b4015143c6 is merged
+git+https://github.com/yuvipanda/nbresuse.git@87c306f7a604e866e83c6b1f6d4cc8b4015143c6
 jupyterhub==1.1.0
 appmode==0.8.0
 ipywidgets==7.5.1

diff --git a/deployments/stat89a/image/infra-requirements.txt b/deployments/stat89a/image/infra-requirements.txt
@@ -14,7 +14,8 @@ nbconvert==5.6.1
 nbformat==5.0.7
 jupyterlab==2.2.4
 nbgitpuller==0.9.0
-nbresuse==0.3.6
+# Temporary fix until https://github.com/yuvipanda/nbresuse/pull/68/commits/87c306f7a604e866e83c6b1f6d4cc8b4015143c6 is merged
+git+https://github.com/yuvipanda/nbresuse.git@87c306f7a604e866e83c6b1f6d4cc8b4015143c6
 jupyterhub==1.1.0
 appmode==0.8.0
 ipywidgets==7.5.1

diff --git a/deployments/template/{{cookiecutter.hub_name}}/image/infra-requirements.txt b/deployments/template/{{cookiecutter.hub_name}}/image/infra-requirements.txt
@@ -14,7 +14,8 @@ nbconvert==5.6.1
 nbformat==5.0.7
 jupyterlab==2.2.4
 nbgitpuller==0.9.0
-nbresuse==0.3.6
+# Temporary fix until https://github.com/yuvipanda/nbresuse/pull/68/commits/87c306f7a604e866e83c6b1f6d4cc8b4015143c6 is merged
+git+https://github.com/yuvipanda/nbresuse.git@87c306f7a604e866e83c6b1f6d4cc8b4015143c6
 jupyterhub==1.1.0
 appmode==0.8.0
 ipywidgets==7.5.1

diff --git a/scripts/infra-packages/requirements.txt b/scripts/infra-packages/requirements.txt
@@ -14,7 +14,8 @@ nbconvert==5.6.1
 nbformat==5.0.7
 jupyterlab==2.2.4
 nbgitpuller==0.9.0
-nbresuse==0.3.6
+# Temporary fix until https://github.com/yuvipanda/nbresuse/pull/68/commits/87c306f7a604e866e83c6b1f6d4cc8b4015143c6 is merged
+git+https://github.com/yuvipanda/nbresuse.git@87c306f7a604e866e83c6b1f6d4cc8b4015143c6
 jupyterhub==1.1.0
 appmode==0.8.0
 ipywidgets==7.5.1

diff --git a/support/values.yaml b/support/values.yaml
@@ -1,4 +1,13 @@
 prometheus:
+  # We were using network tags to restrict NFS access to just nodes from hub-cluster
+  # However, it turns out packets coming from *pods* are *not* tagged with that, just from the nodes!
+  # I'm guessing this is an intersection of how GKE works? I'm not sure.
+  # Either way, I allowed TCP to port 9100 from 10.0.0.0/8 and it works fine.
+  extraScrapeConfigs: |
+    - job_name: prometheus-nfsd-server
+      static_configs:
+        - targets:
+          - nfsserver-01:9100
   networkPolicy:
     enabled: true
   alertmanager: