Skip to content

Commit

Permalink
converting to pandas theme and some reorganization for clarity
Browse files Browse the repository at this point in the history
  • Loading branch information
choldgraf committed Nov 9, 2019
1 parent d06f7b8 commit 1b4cbf3
Show file tree
Hide file tree
Showing 44 changed files with 55 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ instance/

# Sphinx documentation
doc/build/
doc/source/reference.md
doc/source/reference/reference.md

# PyBuilder
target/
Expand Down
2 changes: 1 addition & 1 deletion doc/doc-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ sphinx>=1.7
recommonmark==0.4.0
pyyaml
sphinx-copybutton
alabaster_jupyterhub
git+https://github.com/pandas-dev/pandas-sphinx-theme.git@master
2 changes: 1 addition & 1 deletion doc/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ dependencies:
- recommonmark==0.4.0
- pyyaml
- sphinx-copybutton
- alabaster_jupyterhub
- r doc-requirements.txt
Binary file modified doc/source/_static/images/logo/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
28 changes: 14 additions & 14 deletions doc/source/amazon/step-zero-aws-eks.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. _amazon-aws-eks:

Step Zero: Kubernetes on Amazon Web Services (AWS) with Elastic Container with Kubernetes (EKS)
-----------------------------------------------------------------------------------------------
Kubernetes on Amazon Web Services (AWS) with Elastic Container with Kubernetes (EKS)
------------------------------------------------------------------------------------

AWS has released native support for Kubernetes, which is available in `selected regions`_.

Expand All @@ -18,21 +18,21 @@ Procedure
* AmazonEKSClusterPolicy
* AmazonEKSServicePolicy
* AmazonEC2ContainerRegistryReadOnly
(From the user interface, select EKS as the service, then follow the default steps)

(From the user interface, select EKS as the service, then follow the default steps)

2. Create a VPC if you don't already have one.

This step has a lot of variability so it is left to the user. However, one deployment can be found at `Getting Started with Amazon EKS`_, under *Create your Amazon EKS Cluster VPC*

3. Create a Security Group for the EKS Control Plane to use

You do not need to set any permissions on this. The steps below will automatically define access control between the EKS Control Plane and the individual nodes

4. Create your EKS cluster (using the user interface)

Use the IAM Role in step 1 and Security Group defined in step 3. The cluster name is going to be used throughout. We'll use ``Z2JHKubernetesCluster`` as an example.

5. Install **kubectl** and **aws-iam-authenticator**

Refer to `Getting Started with Amazon EKS`_ on *Configure kubectl for Amazon EKS*
Expand All @@ -42,7 +42,7 @@ Procedure
Also see `Getting Started with Amazon EKS`_ *Step 2: Configure kubectl for Amazon EKS*

From the user interface on AWS you can retrieve the ``endpoint-url``, ``base64-encoded-ca-cert``. ``cluster-name`` is the name given in step 4. If you are using profiles in your AWS configuration, you can uncomment the ``env`` block and specify your profile as ``aws-profile``.::

apiVersion: v1
clusters:
- cluster:
Expand Down Expand Up @@ -76,20 +76,20 @@ Procedure

.. code-block:: bash
kubectl get svc
kubectl get svc
should return ``kubernetes`` and ``ClusterIP``

8. Create the nodes using CloudFormation

See `Getting Started with Amazon EKS`_ *Step 3: Launch and Configure Amazon EKS Worker Nodes*

**Warning** if you are endeavoring to deploy on a private network, the cloudformation template creates a public IP for each worker node though there is no route to get there if you specified only private subnets. Regardless, if you wish to correct this, you can edit the cloudformation template by changing ``Resources.NodeLaunchConfig.Properties.AssociatePublicIpAddress`` from ``'true'`` to ``'false'``

9. Create a AWS authentication ConfigMap

This is necessary for the workers to find the master plane.

See `Getting Started with Amazon EKS`_ *Step 3: Launch and Configure Amazon EKS Worker Nodes*

10. Preparing authenticator for Helm
Expand Down
4 changes: 2 additions & 2 deletions doc/source/amazon/step-zero-aws.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. _amazon-aws:

Step Zero: Kubernetes on Amazon Web Services (AWS)
--------------------------------------------------
Kubernetes on Amazon Web Services (AWS)
---------------------------------------

AWS does not have native support for Kubernetes, however there are
many organizations that have put together their own solutions and
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
============================
Resources from the community
============================
===================
Community Resources
===================

This section gives the community a space to provide information on setting
up, managing, and maintaining JupyterHub.
Expand All @@ -18,7 +18,7 @@ up, managing, and maintaining JupyterHub.

We hope that you will use this section to share deployments with on a variety
of infrastructure and for different use cases.
There is also a :doc:`community maintained list <users-list>` of users of this
There is also a :doc:`community maintained list <community/users-list>` of users of this
Guide and the JupyterHub Helm Chart.

Please submit a pull request to add to this section. Thanks.
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,13 @@ def parse_yaml(yaml, count=0, pre=''):
parse_yaml(data)

# Generate the `.md` file
with open('reference.txt', 'r') as f:
with open('reference/reference.txt', 'r') as f:
new_lines = f.readlines()
new_lines = new_lines[1:]
new_lines = [ln.strip('\n') for ln in new_lines]
new_lines += lines

with open('reference.md', 'w') as f:
with open('reference/reference.md', 'w') as f:
f.write('\n'.join(new_lines))


Expand Down
4 changes: 2 additions & 2 deletions doc/source/create-k8s-cluster.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. _create-k8s-cluster:

Setup a Kubernetes Cluster
==========================
Setup Kubernetes
================

Kubernetes' documentation describes the many `ways to set up a cluster`_.
We attempt to provide quick instructions for the most painless and popular ways of setting up
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions doc/source/digital-ocean/step-zero-digital-ocean.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. _digital-ocean:

Step Zero: Kubernetes on Digital Ocean
--------------------------------------
Kubernetes on Digital Ocean
---------------------------

You can create a Kubernetes cluster `either through the Digital Ocean website, or using the Digital Ocean command line tools <https://www.digitalocean.com/>`_.

Expand All @@ -10,8 +10,8 @@ If you prefer to use the Digital Ocean portal see the `Digital Ocean Get Started


#. Prepare your Digital Ocean shell environment.
a. **Install command-line tools locally**. You'll need at least v1.13.0.

a. **Install command-line tools locally**. You'll need at least v1.13.0.

You can either follow the `installation instructions <https://github.com/digitalocean/doctl/blob/master/README.md>` or use the commands below:

Expand Down
4 changes: 2 additions & 2 deletions doc/source/google/step-zero-gcp.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. _google-cloud:

Step Zero: Kubernetes on `Google Cloud <https://cloud.google.com/>`_ (GKE)
--------------------------------------------------------------------------
Kubernetes on `Google Cloud <https://cloud.google.com/>`_ (GKE)
---------------------------------------------------------------

`Google Kubernetes Engine <https://cloud.google.com/kubernetes-engine/>`_
(GKE) is the simplest and most common way of setting
Expand Down
20 changes: 10 additions & 10 deletions doc/source/ibm/step-zero-ibm.rst
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
.. _ibm_cloud:

Step Zero: Kubernetes on IBM Cloud
----------------------------------
Kubernetes on IBM Cloud
-----------------------

This guide shows how to deploy JupyterHub on the IBM Cloud using their `Kubernetes service <https://console.bluemix.net/containers-kubernetes/catalog/cluster)>`_.
This guide shows how to deploy JupyterHub on the IBM Cloud using their `Kubernetes service <https://console.bluemix.net/containers-kubernetes/catalog/cluster)>`_.
It should provide you with enough knowledge to create a cluster, deploy your application using a Docker image and use a custom domain to use the deployed app.

Before you begin:

* Understand the basics of Kubernetes_.
* Understand the basics of Kubernetes_.
.. _Kubernetes: https://kubernetes.io/docs/tutorials/kubernetes-basics/)
* Install the IBM Cloud Developer Tools
* Install the IBM Cloud Developer Tools
- Install the `IBM Cloud CLI <https://console.bluemix.net/docs/cli/index.html#overview)>`_.
- `curl -sL https://ibm.biz/idt-installer | bash`
- Verify your installation
Expand Down Expand Up @@ -41,13 +41,13 @@ Procedure:

.. image:: ../_static/images/ibm/create-paid-kubernetes-cluster-ibm-cloud.png
:align: center

3. Check the status of your **Cluster** and **Worker Nodes** and wait for them to be **ready**.

Or, if you prefer, create the cluster using the `IBM Cloud CLI tools <https://console.bluemix.net/docs/containers/cs_clusters.html#clusters_cli)>`_

2. Configure kubectl

`kubectl <https://kubernetes.io/docs/user-guide/kubectl-overview/)>`_ is a CLI tool to interact with a Kubernetes cluster. In this occasion, you will use it to point forward to the created Kubernetes cluster.

1. Use `ibmcloud login` to log in interactively into the IBM Cloud. Provide the organization (org), location and space under which the cluster is created. You can reconfirm the details by running `ibmcloud target` command.
Expand All @@ -60,7 +60,7 @@ Procedure:
.. code-block:: bash
export KUBECONFIG=/Users/user/.bluemix/plugins/container-service/clusters/JupyterHub/kube-config-***-JupyterHub.yml
To verify whether the KUBECONFIG environment variable is set correctly or not, run the following command:
.. code-block:: bash
Expand All @@ -70,7 +70,7 @@ Procedure:
.. code-block:: bash
kubectl cluster-info
.. image:: ../_static/images/ibm/kubectl-cluster-info.png
:align: center
Expand All @@ -80,4 +80,4 @@ Hooray! You have your Kubernetes cluster running; it's time to begin :ref:`creat

More info and readings:
- https://console.bluemix.net/docs/tutorials/scalable-webapp-kubernetes.html#deploy-a-scalable-web-application-on-kubernetes
- https://github.com/IBM-Cloud/get-started-python
- https://github.com/IBM-Cloud/get-started-python
12 changes: 6 additions & 6 deletions doc/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ an initial deployment.
:maxdepth: 1
:caption: Setup JupyterHub

index-setup-jupyterhub
setup-jupyterhub/index

.. _customization-guide:

Expand All @@ -94,7 +94,7 @@ used configurable helm chart fields.
:maxdepth: 2
:caption: Customization Guide

index-customization-guide
customizing/index

.. _administrator-guide:

Expand All @@ -109,7 +109,7 @@ cloud-based deployments and tips for maintaining your deployment.
:maxdepth: 2
:caption: Administrator Guide

index-administrator-guide
administrator/index

.. _community-resources:

Expand All @@ -132,7 +132,7 @@ up, managing, and maintaining JupyterHub.

We hope that you will use this section to share deployments with on a variety
of infrastructure and for different use cases.
There is also a :doc:`community maintained list <users-list>` of users of this
There is also a :doc:`community maintained list <community/users-list>` of users of this
Guide and the JupyterHub Helm Chart.

Please submit a pull request to add to this section. Thanks.
Expand All @@ -141,7 +141,7 @@ Please submit a pull request to add to this section. Thanks.
:maxdepth: 1
:caption: Community section

index-community-resources
community/index

.. _reference:

Expand All @@ -152,7 +152,7 @@ Reference
:maxdepth: 1
:caption: Reference

index-reference
reference/index

Institutional support
---------------------
Expand Down
4 changes: 2 additions & 2 deletions doc/source/microsoft/step-zero-azure-autoscale.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. _microsoft-azure:

Step Zero: Kubernetes on Microsoft Azure Kubernetes Service (AKS) with Autoscaling
----------------------------------------------------------------------------------
Kubernetes on Microsoft Azure Kubernetes Service (AKS) with Autoscaling
-----------------------------------------------------------------------

.. warning::

Expand Down
4 changes: 2 additions & 2 deletions doc/source/microsoft/step-zero-azure.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. _microsoft-azure:

Step Zero: Kubernetes on Microsoft Azure Kubernetes Service (AKS)
-----------------------------------------------------------------
Kubernetes on Microsoft Azure Kubernetes Service (AKS)
------------------------------------------------------

You can create a Kubernetes cluster `either through the Azure portal website, or using the Azure command line tools <https://docs.microsoft.com/en-us/azure/aks/>`_.

Expand Down
4 changes: 2 additions & 2 deletions doc/source/redhat/step-zero-openshift.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. _redhat-openshift:

Step Zero: Kubernetes on Red Hat OpenShift
------------------------------------------
Kubernetes on Red Hat OpenShift
-------------------------------

`OpenShift <https://www.okd.io/>`_ from RedHat is a cluster manager based on Kubernetes.

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 1b4cbf3

Please sign in to comment.