Change naming from jupyter to jupyterhub when referring to hub (kubef…

…low#642)

* Change naming from jupyter to jupyterhub when referencing the hub

* Change jupyter to jupyterhub when referring to the hub

* Change references to jupyter to jupyterhub when hub is being used

* Rename jupyterhub spawner to kubeform_spawner

* update docs for name changes

components/jupyterhub/README.md

@@ -42,7 +42,8 @@ Jupyter notebooks. JupyterHub delegates the launching of
 single-user notebooks to pluggable components called “spawners”. JupyterHub
 has a sub-project named kubespawner, maintained by the
 community, that enables users to provision single-user Jupyter notebooks backed by Kubernetes pods - the notebooks themselves are
-Kubernetes pods.
+Kubernetes pods. kubeform_spawner extends kubespawner to enable users to have
+a form to specify cpu, memory, gpu, and desired image.
 
 ## Quick Start
 

docs_dev/releasing.md

@@ -126,7 +126,7 @@ ks param set --env=${ENV} workflows prow_env  \
 ks apply ${ENV} -c workflows
 ```
 
-Create a PR to update [jupyterhub_spawner.py](https://github.com/kubeflow/kubeflow/blob/master/kubeflow/core/jupyterhub_spawner.py#L15) 
+Create a PR to update [kubeform_spawner.py](https://github.com/kubeflow/kubeflow/blob/master/kubeflow/core/kubeform_spawner.py#L15) 
 to point to the newly built Jupyter notebook images.
 
 ## Create a release branch (if necessary)

kubeflow/core/all.libsonnet

@@ -1,14 +1,14 @@
 {
   parts(params):: {
     local ambassador = import "kubeflow/core/ambassador.libsonnet",
-    local jupyter = import "kubeflow/core/jupyterhub.libsonnet",
+    local jupyterhub = import "kubeflow/core/jupyterhub.libsonnet",
     local nfs = import "kubeflow/core/nfs.libsonnet",
     local tfjob = import "kubeflow/core/tf-job.libsonnet",
     local spartakus = import "kubeflow/core/spartakus.libsonnet",
     local centraldashboard = import "kubeflow/core/centraldashboard.libsonnet",
     local version = import "kubeflow/core/version.libsonnet",
 
-    all:: jupyter.all(params)
+    all:: jupyterhub.all(params)
           + tfjob.all(params)
           + ambassador.all(params)
           + nfs.all(params)

kubeflow/core/jupyterhub.libsonnet

@@ -19,7 +19,7 @@
 
     kubeSpawner(authenticator, volumeClaims=[]): {
       // TODO(jlewi): We should make whether we use PVC configurable.
-      local baseKubeConfigSpawner = importstr "jupyterhub_spawner.py",
+      local baseKubeConfigSpawner = importstr "kubeform_spawner.py",
 
       authenticatorOptions:: {
 

kubeflow/core/tests/jupyterhub_test.jsonnet

@@ -8,7 +8,7 @@ local params = {
   jupyterNotebookPVCMount: "/home/jovyan/work",
 };
 
-local baseSpawner = importstr "../jupyterhub_spawner.py";
+local baseSpawner = importstr "../kubeform_spawner.py";
 
 // TODO(jlewi): We should be able to use std.startsWidth in later versions of jsonnet.
 //

testing/test_deploy.py

@@ -238,9 +238,9 @@ def deploy_kubeflow(args):
   util.wait_for_deployment(api_client, namespace, tf_job_deployment_name)
 
   # Verify that JupyterHub is actually deployed.
-  jupyter_name = "tf-hub"
+  jupyterhub_name = "tf-hub"
   logging.info("Verifying TfHub started.")
-  util.wait_for_statefulset(api_client, namespace, jupyter_name)
+  util.wait_for_statefulset(api_client, namespace, jupyterhub_name)
 
 
 def deploy_model(args):

testing/workflows/vendor/kubeflow/core/prototypes/all.jsonnet

@@ -15,7 +15,7 @@
 // because ksonnet doesn't support inheriting it from the environment yet.
 
 local k = import "k.libsonnet";
-local jupyter = import "kubeflow/core/jupyterhub.libsonnet";
+local jupyterhub = import "kubeflow/core/jupyterhub.libsonnet";
 local tfjob = import "kubeflow/core/tf-job.libsonnet";
 local nfs = import "kubeflow/core/nfs.libsonnet";
 
@@ -32,9 +32,9 @@ local diskNames = if diskParam != "null" && std.length(diskParam) > 0 then
   std.split(diskParam, ",")
 else [];
 
-local jupyterConfigMap = if std.length(diskNames) == 0 then
-  jupyter.parts(namespace).jupyterHubConfigMap
-else jupyter.parts(namespace).jupyterHubConfigMapWithVolumes(diskNames);
+local jupyterHubConfigMap = if std.length(diskNames) == 0 then
+  jupyterhub.parts(namespace).jupyterHubConfigMap
+else jupyterhub.parts(namespace).jupyterHubConfigMapWithVolumes(diskNames);
 
 local tfJobImage = import "param://tfJobImage";
 local tfDefaultImage = import "param://tfDefaultImage";
@@ -64,13 +64,13 @@ local nfsComponents =
 
 std.prune(k.core.v1.list.new([
   // jupyterHub components
-  jupyterConfigMap,
-  jupyter.parts(namespace).jupyterHubService,
-  jupyter.parts(namespace).jupyterHubLoadBalancer(jupyterHubServiceType),
-  jupyter.parts(namespace).jupyterHub(jupyterHubImage),
-  jupyter.parts(namespace).jupyterHubRole,
-  jupyter.parts(namespace).jupyterHubServiceAccount,
-  jupyter.parts(namespace).jupyterHubRoleBinding,
+  jupyterHubConfigMap,
+  jupyterhub.parts(namespace).jupyterHubService,
+  jupyterhub.parts(namespace).jupyterHubLoadBalancer(jupyterHubServiceType),
+  jupyterhub.parts(namespace).jupyterHub(jupyterHubImage),
+  jupyterhub.parts(namespace).jupyterHubRole,
+  jupyterhub.parts(namespace).jupyterHubServiceAccount,
+  jupyterhub.parts(namespace).jupyterHubRoleBinding,
 
   // TfJob controller
   tfjob.parts(namespace).tfJobDeploy(tfJobImage),