Skip to content

Commit

Permalink
Prepare release 2.0.0rc2
Browse files Browse the repository at this point in the history
  • Loading branch information
kevin-bates committed Jun 20, 2019
1 parent 20cc905 commit c616043
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ SA:=source activate
ENV:=enterprise-gateway-dev
SHELL:=/bin/bash

VERSION:=2.0.0.dev2
VERSION:=2.0.0rc2

ifeq (dev, $(findstring dev, $(VERSION)))
TAG:=dev
Expand Down
2 changes: 1 addition & 1 deletion docs/source/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ Note that because the Apache Toree kernel, and its supporting libraries, will be

#### Sample kernelspecs

We provide sample kernel configuration and launcher tar files as part of [each release](https://github.com/jupyter/enterprise_gateway/releases) (e.g. [jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz](https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc1/jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz)) that can be extracted and modified to fit your configuration.
We provide sample kernel configuration and launcher tar files as part of [each release](https://github.com/jupyter/enterprise_gateway/releases) (e.g. [jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz](https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc2/jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz)) that can be extracted and modified to fit your configuration.

For information about how to build your own kernel-based docker image for use by Enterprise Gateway see [Custom kernel images](docker.html#custom-kernel-images).

Expand Down
4 changes: 2 additions & 2 deletions docs/source/kernel-distributed.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ The following sample kernelspecs are currently available on Distributed mode:
Install the `python_distributed` kernelspec on all nodes.

``` Bash
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc1/jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc2/jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz
KERNELS_FOLDER=/usr/local/share/jupyter/kernels
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz --strip 1 --directory $KERNELS_FOLDER/python_distributed/ python_distributed/
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz --strip 1 --directory $KERNELS_FOLDER/python_distributed/ python_distributed/
```

The `python_distributed` kernelspec uses `DistributedProcessProxy` which is responsible for the launch and management of kernels distributed across and explicitly defined set of hosts using ssh. Hosts are determined via a round-robin algorithm (that we should make pluggable someday).
Expand Down
16 changes: 8 additions & 8 deletions docs/source/kernel-spark-standalone.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ EG_REMOTE_HOSTS=elyra-node-1.fyre.ibm.com,elyra-node-2.fyre.ibm.com,elyra-node-3
Although Enterprise Gateway does not currently provide sample kernelspecs for Spark standalone, here are the steps necessary to convert a yarn_client kernelspec to standalone.

For each supported Jupyter Kernel, we have provided sample kernel configurations and launchers as part of the release
[jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz](https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc1/jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz).
[jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz](https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc2/jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz).

Considering we would like to enable the IPython Kernel that comes pre-installed with Anaconda to run on
Spark Standalone, we would have to copy the sample configuration folder **spark_python_yarn_client**
to where the Jupyter kernels are installed (e.g. jupyter kernelspec list) and rename it to **spark_python_spark_standalone***

``` Bash
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc1/jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc2/jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz
SCALA_KERNEL_DIR="$(jupyter kernelspec list | grep -w "python3" | awk '{print $2}')"
KERNELS_FOLDER="$(dirname "${SCALA_KERNEL_DIR}")"
tar -zxvf enterprise_gateway_kernelspecs.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_python_yarn_client/ spark_python_yarn_client/
Expand Down Expand Up @@ -85,9 +85,9 @@ Follow the steps below to install/configure the Toree kernel:
Considering we would like to enable the Scala Kernel to run on YARN Cluster and Client mode we would have to copy the sample configuration folder **spark_scala_yarn_client** to where the Jupyter kernels are installed (e.g. jupyter kernelspec list)

``` Bash
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc1/jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc2/jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz
KERNELS_FOLDER=/usr/local/share/jupyter/kernels
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_scala_yarn_client/ spark_scala_yarn_client/
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_scala_yarn_client/ spark_scala_yarn_client/
mv $KERNELS_FOLDER/spark_scala_yarn_client $KERNELS_FOLDER/spark_scala_spark_standalone
```

Expand All @@ -102,9 +102,9 @@ The IPython kernel comes pre-installed with Anaconda and we have tested with its
Considering we would like to enable the IPython kernel to run on YARN Cluster and Client mode we would have to copy the sample configuration folder **spark_python_yarn_client** to where the Jupyter kernels are installed (e.g. jupyter kernelspec list)

``` Bash
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc1/jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc2/jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz
KERNELS_FOLDER=/usr/local/share/jupyter/kernels
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_python_yarn_client/ spark_python_yarn_client/
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_python_yarn_client/ spark_python_yarn_client/
mv $KERNELS_FOLDER/spark_python_yarn_client $KERNELS_FOLDER/spark_python_spark_standalone
```

Expand Down Expand Up @@ -137,9 +137,9 @@ ls $ANACONDA_HOME/lib/R/library
Considering we would like to enable the IRkernel to run on YARN Cluster and Client mode we would have to copy the sample configuration folder **spark_R_yarn_client** to where the Jupyter kernels are installed (e.g. jupyter kernelspec list)

``` Bash
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc1/jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc2/jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz
KERNELS_FOLDER=/usr/local/share/jupyter/kernels
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_R_yarn_client/ spark_R_yarn_client/
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_R_yarn_client/ spark_R_yarn_client/
mv $KERNELS_FOLDER/spark_R_yarn_client $KERNELS_FOLDER/spark_R_spark_standalone
```

Expand Down
16 changes: 8 additions & 8 deletions docs/source/kernel-yarn-client-mode.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ EG_REMOTE_HOSTS=elyra-node-1.fyre.ibm.com,elyra-node-2.fyre.ibm.com,elyra-node-3
```

For each supported Jupyter Kernel, we have provided sample kernel configurations and launchers as part of the release
[jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz](https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc1/jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz).
[jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz](https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc2/jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz).

Considering we would like to enable the IPython Kernel that comes pre-installed with Anaconda to run on
Yarn Client mode, we would have to copy the sample configuration folder **spark_python_yarn_client**
to where the Jupyter kernels are installed (e.g. jupyter kernelspec list)

``` Bash
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc1/jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc2/jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz
SCALA_KERNEL_DIR="$(jupyter kernelspec list | grep -w "python3" | awk '{print $2}')"
KERNELS_FOLDER="$(dirname "${SCALA_KERNEL_DIR}")"
tar -zxvf enterprise_gateway_kernelspecs.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_python_yarn_client/ spark_python_yarn_client/
Expand Down Expand Up @@ -82,9 +82,9 @@ Follow the steps below to install/configure the Toree kernel:
Considering we would like to enable the Scala Kernel to run on YARN Cluster and Client mode we would have to copy the sample configuration folder **spark_scala_yarn_client** to where the Jupyter kernels are installed (e.g. jupyter kernelspec list)

``` Bash
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc1/jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc2/jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz
KERNELS_FOLDER=/usr/local/share/jupyter/kernels
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_scala_yarn_client/ spark_scala_yarn_client/
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_scala_yarn_client/ spark_scala_yarn_client/
```

For more information about the Scala kernel, please visit the [Apache Toree](http://toree.apache.org/) page.
Expand All @@ -98,9 +98,9 @@ The IPython kernel comes pre-installed with Anaconda and we have tested with its
Considering we would like to enable the IPython kernel to run on YARN Cluster and Client mode we would have to copy the sample configuration folder **spark_python_yarn_client** to where the Jupyter kernels are installed (e.g. jupyter kernelspec list)

``` Bash
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc1/jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc2/jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz
KERNELS_FOLDER=/usr/local/share/jupyter/kernels
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_python_yarn_client/ spark_python_yarn_client/
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_python_yarn_client/ spark_python_yarn_client/
```

For more information about the IPython kernel, please visit the [IPython kernel](http://ipython.readthedocs.io/en/stable/) page.
Expand Down Expand Up @@ -132,9 +132,9 @@ ls $ANACONDA_HOME/lib/R/library
Considering we would like to enable the IRkernel to run on YARN Cluster and Client mode we would have to copy the sample configuration folder **spark_R_yarn_client** to where the Jupyter kernels are installed (e.g. jupyter kernelspec list)

``` Bash
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc1/jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc2/jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz
KERNELS_FOLDER=/usr/local/share/jupyter/kernels
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_R_yarn_client/ spark_R_yarn_client/
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_R_yarn_client/ spark_R_yarn_client/
```

For more information about the iR kernel, please visit the [IRkernel](https://irkernel.github.io/) page.
Expand Down
18 changes: 9 additions & 9 deletions docs/source/kernel-yarn-cluster-mode.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ EG_ALT_YARN_ENDPOINT=http://${ALT_YARN_RESOURCE_MANAGER_FQDN}:8088/ws/v1/cluster

### Configuring Kernels for YARN Cluster mode

For each supported Jupyter Kernel, we have provided sample kernel configurations and launchers as part of the release [jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz](https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc1/jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz).
For each supported Jupyter Kernel, we have provided sample kernel configurations and launchers as part of the release [jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz](https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc2/jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz).

Considering we would like to enable the IPython Kernel that comes pre-installed with Anaconda to run on Yarn Cluster mode, we would have to copy the sample configuration folder **spark_python_yarn_cluster** to where the Jupyter kernels are installed (e.g. jupyter kernelspec list)

``` Bash
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc1/jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc2/jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz
SCALA_KERNEL_DIR="$(jupyter kernelspec list | grep -w "python3" | awk '{print $2}')"
KERNELS_FOLDER="$(dirname "${SCALA_KERNEL_DIR}")"
mkdir $KERNELS_FOLDER/spark_python_yarn_cluster/
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_python_yarn_cluster/ spark_python_yarn_cluster/
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_python_yarn_cluster/ spark_python_yarn_cluster/
```

After that, you should have a `kernel.json` that looks similar to the one below:
Expand Down Expand Up @@ -80,9 +80,9 @@ Follow the steps below to install/configure the Toree kernel:
Considering we would like to enable the Scala Kernel to run on YARN Cluster and Client mode we would have to copy the sample configuration folder **spark_scala_yarn_cluster** to where the Jupyter kernels are installed (e.g. jupyter kernelspec list)

``` Bash
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc1/jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc2/jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz
KERNELS_FOLDER=/usr/local/share/jupyter/kernels
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_scala_yarn_cluster/ spark_scala_yarn_cluster/
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_scala_yarn_cluster/ spark_scala_yarn_cluster/
```

For more information about the Scala kernel, please visit the [Apache Toree](http://toree.apache.org/) page.
Expand All @@ -96,9 +96,9 @@ The IPython kernel comes pre-installed with Anaconda and we have tested with its
Considering we would like to enable the IPython kernel to run on YARN Cluster and Client mode we would have to copy the sample configuration folder **spark_python_yarn_cluster** to where the Jupyter kernels are installed (e.g. jupyter kernelspec list)

``` Bash
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc1/jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc2/jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz
KERNELS_FOLDER=/usr/local/share/jupyter/kernels
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_python_yarn_cluster/ spark_python_yarn_cluster/
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_python_yarn_cluster/ spark_python_yarn_cluster/
```

For more information about the IPython kernel, please visit the [IPython kernel](http://ipython.readthedocs.io/en/stable/) page.
Expand Down Expand Up @@ -130,9 +130,9 @@ ls $ANACONDA_HOME/lib/R/library
Considering we would like to enable the IRkernel to run on YARN Cluster and Client mode we would have to copy the sample configuration folder **spark_R_yarn_cluster** to where the Jupyter kernels are installed (e.g. jupyter kernelspec list)

``` Bash
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc1/jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz
wget https://github.com/jupyter/enterprise_gateway/releases/download/v2.0.0rc2/jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz
KERNELS_FOLDER=/usr/local/share/jupyter/kernels
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc1.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_R_yarn_cluster/ spark_R_yarn_cluster/
tar -zxvf jupyter_enterprise_gateway_kernelspecs-2.0.0rc2.tar.gz --strip 1 --directory $KERNELS_FOLDER/spark_R_yarn_cluster/ spark_R_yarn_cluster/
```

For more information about the iR kernel, please visit the [IRkernel](https://irkernel.github.io/) page.
Expand Down
2 changes: 1 addition & 1 deletion enterprise_gateway/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.

__version__ = '2.0.0.dev2'
__version__ = '2.0.0rc2'
2 changes: 1 addition & 1 deletion etc/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ version: "3.3"
services:

enterprise-gateway:
image: elyra/enterprise-gateway:dev
image: elyra/enterprise-gateway:2.0.0rc2
user: root
volumes:
- "/var/run/docker.sock:/var/run/docker.sock"
Expand Down
4 changes: 2 additions & 2 deletions etc/kubernetes/enterprise-gateway.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ spec:
value: "['r_kubernetes','python_kubernetes','python_tf_kubernetes','python_tf_gpu_kubernetes','scala_kubernetes','spark_r_kubernetes','spark_python_kubernetes','spark_scala_kubernetes']"

# Ensure the following VERSION tag is updated to the version of Enterprise Gateway you wish to run
image: elyra/enterprise-gateway:dev
image: elyra/enterprise-gateway:2.0.0rc2
# Use IfNotPresent policy so that dev-based systems don't automatically
# update. This provides more control. Since formal tags will be release-specific
# this policy should be sufficient for them as well.
Expand Down Expand Up @@ -177,7 +177,7 @@ spec:
spec:
containers:
- name: kernel-image-puller
image: elyra/kernel-image-puller:dev
image: elyra/kernel-image-puller:2.0.0rc2
env:
- name: KIP_GATEWAY_HOST
value: "http://enterprise-gateway.enterprise-gateway:8888"
Expand Down
4 changes: 2 additions & 2 deletions etc/kubernetes/helm/enterprise-gateway/values.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Enterprise Gateway image name and tag to use.
image: elyra/enterprise-gateway:dev
image: elyra/enterprise-gateway:2.0.0rc2
# Enterprise Gateway image pull policy.
imagePullPolicy: IfNotPresent
# The primary port on which Enterprise Gateway is servicing requests.
Expand Down Expand Up @@ -61,7 +61,7 @@ ingress:
kip:
enabled: true
# Kernel Image Puller image name and tag to use.
image: elyra/kernel-image-puller:dev
image: elyra/kernel-image-puller:2.0.0rc2
# Kernel Image Puller image pull policy.
imagePullPolicy: IfNotPresent
# Determines whether the Kernel Image Puller will pull kernel images it has previously pulled
Expand Down

0 comments on commit c616043

Please sign in to comment.