Skip to content
This repository has been archived by the owner on Jun 22, 2021. It is now read-only.

Commit

Permalink
Remove instructions on DNS & static IP sets
Browse files Browse the repository at this point in the history
We have a wildcard domain from *.datahub.berkele.edu
to our nginx-ingress IP. This simplifies new hub creation a
*lot*.

Ref #2167
  • Loading branch information
yuvipanda committed Feb 5, 2021
1 parent b7d3835 commit 63e65cf
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 44 deletions.
17 changes: 8 additions & 9 deletions deployments/template/{{cookiecutter.hub_name}}/config/prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@ jupyterhub-ssh:
hubUrl: https://{{ cookiecutter.hub_name }}.datahub.berkeley.edu

jupyterhub:
proxy:
# service:
# FIXME: make the IP static in google cloud console so we won't lose it
# then specify it here so if we redeploy we get the same stuff
# loadBalancerIP: <IP of {{cookiecutter.hub_name}}.datahub.berkeley.edu
# https:
# hosts:
# FIXME: Make a DNS entry for the service IP first before uncommenting it
# - {{cookiecutter.hub_name}}.datahub.berkeley.edu
ingress:
enabled: true
hosts:
- {{cookiecutter.hub_name}}.datahub.berkeley.edu
tls:
- secretName: tls-cert
hosts:
- {{cookiecutter.hub_name}}.datahub.berkeley.edu
auth:
custom:
config:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ jupyterhub:
config:
client_id: '10720000000000471'
oauth_callback_url: 'https://{{ cookiecutter.hub_name }}-staging.berkeley.edu/hub/oauth_callback'
proxy:
# service:
# make the IP static in google cloud console so we won't lose it
# then specify it here so if we redeploy we get the same stuff
# loadBalancerIP: <IP of {{cookiecutter.hub_name}}.datahub.berkeley.edu
# uncomment once DNS entry has been made
# https:
# hosts:
# - {{cookiecutter.hub_name}}-staging.datahub.berkeley.edu
ingress:
enabled: true
hosts:
- {{cookiecutter.hub_name}}-staging.datahub.berkeley.edu
tls:
- secretName: tls-cert
hosts:
- {{cookiecutter.hub_name}}-staging.datahub.berkeley.edu
33 changes: 7 additions & 26 deletions docs/admins/howto/new-hub.rst
Original file line number Diff line number Diff line change
Expand Up @@ -87,32 +87,13 @@ we provide that sets up a blank hub that can be customized.
cp deployments/datahub/secrets/gcr-key.json deployments/<hub-name>/secrets
#. Commit the hub directory, and make a PR to the the ``staging`` branch in the
GitHub repo. Once tests pass, merge the PR to get a working staging hub! It
should be accessible by an external IP address that you can find with
``kubectl --namespace=<hub-name>-staging get svc proxy-public``. However,
HTTPS and authentication would not work on the staging hub yet.

#. Make a :ref:`dns entry <howto/dns>` for the staging hub
(``<hub-name>-staging.datahub.berkeley.edu>``) pointing to the public IP.
Wait to make sure it resolves correctly, otherwise HTTPS requisition might
not work.

#. Uncomment the values under ``jupyterhub.proxy.https`` under
``config/staging.yaml`` to enable HTTPS. Run this through CI and make sure
HTTPS is set up on the staging hub.

#. User logins should now work in the staging hub. Verify and validate to make
sure things are working as they should.
GitHub repo. Once tests pass, merge the PR to get a working staging hub! You
can log into it at https://<hub-name>-staging.datahub.berkeley.edu. Test it out
and make sure things work as you think they should.

#. Make a PR from the ``staging`` branch to the ``prod`` branch. When this PR is
merged, it'll deploy the production hub. It should be accessible by an
external IP address that you can find with
``kubectl --namespace=<hub-name>-prod get svc proxy-public``. However, HTTPS
and authentication would not work for the production hub yet.

#. Make a :ref:`dns entry <howto/dns>` for the prod hub (``<hub-name>.datahub.berkeley.edu>``)
pointing to the public IP. Wait to make sure it resolves correctly,
otherwise HTTPS requisition might not work.
merged, it'll deploy the production hub. You can log into it at
https://<hub-name>.datahub.berkeley.edu. Test it out and make sure things
work as you think they should.

#. Everything should work now! Try logging in to production, and make sure
everything works out ok.
#. All done!

0 comments on commit 63e65cf

Please sign in to comment.