Cleanup cloud deploy guide (pangeo-data#698)

* more meeting info * summer meeting registration is closed * quick cleanup for cloud deployment
clyne · Aug 23, 2019 · 376ce34 · 376ce34
1 parent 9cad4fb
commit 376ce34
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 58 deletions.
diff --git a/docs/setup_guides/cloud.rst b/docs/setup_guides/cloud.rst
@@ -144,12 +144,6 @@ you can do so by running::
   gcloud compute addresses create pangeo-jhubip --region $REGION
   gcloud compute addresses list | grep pangeo-jhubip
 
-Other things you might want to configure, but that can be left as is:
-
-  - EXTRA_PIP_PACKAGES: for adding some python modules to your user environment.
-  - GCSFUSE_BUCKET: for mounting some google cloud storage bucket as a standard
-    file system.
-
 The other file is `secret_config.yaml`_, which specifies cluster specific
 encryption tokens.
 

diff --git a/gce/setup-guide/4_upgrade_helm.sh b/gce/setup-guide/4_upgrade_helm.sh
@@ -3,6 +3,5 @@
 set -e
 
 helm upgrade --force --recreate-pods --devel pangeohub pangeo/pangeo \
-#   --version=$VERSION \
    -f secret_config.yaml \
    -f jupyter_config.yaml
diff --git a/gce/setup-guide/gce-pangeo-environment.sh b/gce/setup-guide/gce-pangeo-environment.sh
@@ -15,6 +15,3 @@ export CLUSTER_NAME='pangeo-cluster'
 # https://cloud.google.com/compute/pricing
 # change the machine typer based on your computing needs
 export WORKER_MACHINE_TYPE='n1-standard-4'
-
-# HELM Pangeo version if needed
-export VERSION="0.1.1-c02878a"
diff --git a/gce/setup-guide/jupyter_config.yaml b/gce/setup-guide/jupyter_config.yaml
@@ -2,61 +2,13 @@
 
 jupyterhub:
   singleuser:
-    extraEnv:
-      EXTRA_PIP_PACKAGES: >-
-      GCSFUSE_BUCKET: pangeo-data
-    storage:
-      extraVolumes:
-        - name: fuse
-          hostPath:
-            path: /dev/fuse
-      extraVolumeMounts:
-        - name: fuse
-          mountPath: /dev/fuse
-    cloudMetadata:
-      enabled: true
     cpu:
       limit: 4
       guarantee: 1
     memory:
       limit: 14G
       guarantee: 4G
 
-  hub:
-    extraConfig:
-      customPodHook: |
-        from kubernetes import client
-        def modify_pod_hook(spawner, pod):
-            pod.spec.containers[0].security_context = client.V1SecurityContext(
-                privileged=True,
-                capabilities=client.V1Capabilities(
-                    add=['SYS_ADMIN']
-                )
-            )
-            return pod
-        c.KubeSpawner.modify_pod_hook = modify_pod_hook
-        c.JupyterHub.logo_file = '/usr/local/share/jupyterhub/static/custom/images/logo.png'
-        c.JupyterHub.template_paths = ['/usr/local/share/jupyterhub/custom_templates/',
-                                      '/usr/local/share/jupyterhub/templates/']
-    extraVolumes:
-      - name: custom-templates
-        gitRepo:
-          repository: "https://github.com/pangeo-data/pangeo-custom-jupyterhub-templates.git"
-          revision: "b09721bb1a1248dc115730d3c8a791600eae257e"
-    extraVolumeMounts:
-      - mountPath: /usr/local/share/jupyterhub/custom_templates
-        name: custom-templates
-        subPath: "pangeo-custom-jupyterhub-templates/templates"
-      - mountPath: /usr/local/share/jupyterhub/static/custom
-        name: custom-templates
-        subPath: "pangeo-custom-jupyterhub-templates/assets"
-
-  cull:
-    enabled: true
-    users: false
-    timeout: 1200
-    every: 600
-
   # this section specifies the IP address for pangeo
   proxy:
     service: