initial attempt to bring back aws hub

.circleci/config.yml

@@ -72,13 +72,13 @@ jobs:
       #     environment:
       #       PYTHONIOENCODING: utf-8
 
-      # - run:
-      #     name: Test building icesat2.pangeo.io image if needed
-      #     when: always
-      #     command: |
-      #       hubploy build icesat2 --commit-range ${COMMIT_RANGE}
-      #     environment:
-      #       PYTHONIOENCODING: utf-8
+       - run:
+           name: Test building aws-uswest2.pangeo.io image if needed
+           when: always
+           command: |
+             hubploy build aws-uswest2 --commit-range ${COMMIT_RANGE}
+           environment:
+             PYTHONIOENCODING: utf-8
 
       # - run:
       #     name: Test building esip.pangeo.io image if needed
@@ -131,7 +131,8 @@ jobs:
             pip install --upgrade -r requirements.txt
 
             curl -sSL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-226.0.0-linux-x86_64.tar.gz | tar -C venv/ -xzf -
-            curl -o aws-iam-authenticator https://amazon-eks.s3-us-west-2.amazonaws.com/1.13.7/2019-06-11/bin/linux/amd64/aws-iam-authenticator > venv/bin/aws-iam-authenticator
+            # Can remove this: https://docs.aws.amazon.com/eks/latest/userguide/create-kubeconfig.html
+            curl -o aws-iam-authenticator https://amazon-eks.s3-us-west-2.amazonaws.com/1.14.6/2019-08-22/bin/linux/amd64/aws-iam-authenticator
             chmod +x venv/bin/aws-iam-authenticator
             # https://github.com/awslabs/amazon-ecr-credential-helper/issues/101
             # Can simplify to sudo apt install amazon-ecr-credential-helper if running Ubuntu 19.04 and newer
@@ -190,13 +191,13 @@ jobs:
       #     environment:
       #       PYTHONIOENCODING: utf-8
 
-      # - run:
-      #     name: Build icesat2.pangeo.io image if needed
-      #     when: always
-      #     command: |
-      #       hubploy build icesat2 --check-registry --push
-      #     environment:
-      #       PYTHONIOENCODING: utf-8
+       - run:
+           name: Build aws-uswest2.pangeo.io image if needed
+           when: always
+           command: |
+             hubploy build aws-uswest2 --check-registry --push
+           environment:
+             PYTHONIOENCODING: utf-8
 
       # - run:
       #     name: Build esip.pangeo.io image if needed
@@ -219,10 +220,11 @@ jobs:
           name: Install helm
           when: always
           command: |
-            curl https://get.helm.sh/helm-v2.14.3-linux-amd64.tar.gz | \
+            curl https://get.helm.sh/helm-v2.15.2-linux-amd64.tar.gz | \
               tar -xzf -
             sudo mv linux-amd64/helm /usr/local/bin
             helm init --client-only
+            helm plugin install https://github.com/rimusz/helm-tiller
             helm repo add pangeo https://pangeo-data.github.io/helm-chart/
             helm repo add jupyterhub https://jupyterhub.github.io/helm-chart/
             helm repo update
@@ -251,11 +253,13 @@ jobs:
       #     command: |
       #       hubploy deploy nasa pangeo-deploy ${CIRCLE_BRANCH}
 
-      # - run:
-      #     name: Deploy icesat2.pangeo.io
-      #     when: always
-      #     command: |
-      #       hubploy deploy icesat2 pangeo-deploy ${CIRCLE_BRANCH}
+       - run:
+           name: Deploy aws-uswest2.pangeo.io
+           when: always
+           command: |
+             helm tiller startci
+             hubploy deploy aws-uswest2 pangeo-deploy ${CIRCLE_BRANCH}
+             helm tiller stop
       
       # - run:
       #     name: Deploy esip.pangeo.io

.gitattributes

@@ -1,6 +1,6 @@
 deployments/ocean/secrets/** filter=git-crypt diff=git-crypt
 deployments/dev/secrets/** filter=git-crypt diff=git-crypt
-deployments/icesat2/secrets/** filter=git-crypt diff=git-crypt
+deployments/aws-uswest2/secrets/** filter=git-crypt diff=git-crypt
 deployments/hydro/secrets/** filter=git-crypt diff=git-crypt
 deployments/nasa/secrets/** filter=git-crypt diff=git-crypt
 deployments/esip/secrets/** filter=git-crypt diff=git-crypt

deployments/icesat2/config/common.yaml → deployments/aws-uswest2/config/common.yaml

@@ -133,9 +133,9 @@ pangeo:
         customPodHook: |
           c.JupyterHub.template_paths = ['/srv/jupyterhub/style/templates']
           c.JupyterHub.template_vars = {
-            'pangeo_hub_title': 'icesat2.pangeo.io',
-            'pangeo_hub_subtitle': 'a community hub for icesat2 hackweek',
-            'pangeo_welcome': """Welcome to icesat2.pangeo.io, the computational environment for <a href="https://icesat-2hackweek.github.io">Icesat-2 Hackweek</a>! This hub lives in AWS region <code>us-west-2</code>. It is maintained by the <a href="http://pangeo.io">Pangeo project</a> and is supported by <a href="https://github.com/pangeo-data/nasa-access-17">NASA Grant #17-ACCESS17-0003</a> and cloud credits from Amazon. Access is currently limited to the <a href="https://github.com/ICESAT-2HackWeek">ICESAT-2HackWeek GitHub Organization</a>. The hub's configuration is stored in this <a href="https://github.com/pangeo-data/pangeo-cloud-federation/">github repository</a>. To provide feedback and report any technical problems, please use the <a href="https://github.com/pangeo-data/pangeo-cloud-federation/issues">github issue tracker</a>."""
+            'pangeo_hub_title': 'aws-uswest.pangeo.io',
+            'pangeo_hub_subtitle': 'a community hub for the pangeo project',
+            'pangeo_welcome': """Welcome to aws-uswest2.pangeo.io, the computational environment for <a href="https://icesat-2hackweek.github.io">Icesat-2 Hackweek</a>! This hub lives in AWS region <code>us-west-2</code>. It is maintained by the <a href="http://pangeo.io">Pangeo project</a> and is supported by <a href="https://github.com/pangeo-data/nasa-access-17">NASA Grant #17-ACCESS17-0003</a> and cloud credits from Amazon. This is a prototype and should be treated accordingly. We make no promises that the hub will remain active. Do not store passwords or confidential data in your home directory, as we can't guarantee restricted access. Access is currently limited to the <a href="https://github.com/pangeo-data">Pangeo GitHub Organization members</a>. To provide feedback and report any technical problems, please use the <a href="https://github.com/pangeo-data/pangeo-cloud-federation/issues">github issue tracker</a>."""
           }
       extraVolumes:
         - name: custom-assets

deployments/icesat2/config/prod.yaml → deployments/aws-uswest2/config/prod.yaml

@@ -4,11 +4,11 @@ pangeo:
     proxy:
       https:
         hosts:
-        - icesat2.pangeo.io
+        - aws-uswest2.pangeo.io
         letsencrypt:
           contactEmail: [email protected]
       service:
         loadBalancerIP: aa19367a4573811e9a9ef06d2bcc51c9-1125496385.us-west-2.elb.amazonaws.com
     auth:
       github:
-        callbackUrl: "https://icesat2.pangeo.io/hub/oauth_callback"
+        callbackUrl: "https://aws-uswest2.pangeo.io/hub/oauth_callback"

deployments/icesat2/config/staging.yaml → deployments/aws-uswest2/config/staging.yaml

@@ -4,11 +4,11 @@ pangeo:
     proxy:
       https:
         hosts:
-        - staging.icesat2.pangeo.io
+        - staging.aws-uswest2.pangeo.io
         letsencrypt:
           contactEmail: [email protected]
       service:
         loadBalancerIP: a070b2175523111e9924302ea5ee1624-1148941357.us-west-2.elb.amazonaws.com
     auth:
       github:
-        callbackUrl: "https://staging.icesat2.pangeo.io/hub/oauth_callback"
+        callbackUrl: "https://staging.aws-uswest2.pangeo.io/hub/oauth_callback"