diff --git a/jupyterhub_config-workspace.sh b/jupyterhub_config-workspace.sh index 9317201..e69de29 100644 --- a/jupyterhub_config-workspace.sh +++ b/jupyterhub_config-workspace.sh @@ -1,7 +0,0 @@ -KUBERNETES_SERVER_URL="https://$KUBERNETES_SERVICE_HOST:$KUBERNETES_SERVICE_PORT" -OAUTH_METADATA_URL="$KUBERNETES_SERVER_URL/.well-known/oauth-authorization-server" -OAUTH_ISSUER_ADDRESS=`curl -ks $OAUTH_METADATA_URL | grep '"issuer":' | sed -e 's%.*https://%https://%' -e 's%",%%'` - -export OPENSHIFT_URL=$OAUTH_ISSUER_ADDRESS -export OPENSHIFT_REST_API_URL=$KUBERNETES_SERVER_URL -export OPENSHIFT_AUTH_API_URL=$OAUTH_ISSUER_ADDRESS diff --git a/jupyterhub_config.sh b/jupyterhub_config.sh index af8fd9d..092df25 100644 --- a/jupyterhub_config.sh +++ b/jupyterhub_config.sh @@ -1,3 +1,11 @@ +KUBERNETES_SERVER_URL="https://$KUBERNETES_SERVICE_HOST:$KUBERNETES_SERVICE_PORT" +OAUTH_METADATA_URL="$KUBERNETES_SERVER_URL/.well-known/oauth-authorization-server" +OAUTH_ISSUER_ADDRESS=`curl -ks $OAUTH_METADATA_URL | grep '"issuer":' | sed -e 's%.*https://%https://%' -e 's%",%%'` + +export OPENSHIFT_URL=$OAUTH_ISSUER_ADDRESS +export OPENSHIFT_REST_API_URL=$KUBERNETES_SERVER_URL +export OPENSHIFT_AUTH_API_URL=$OAUTH_ISSUER_ADDRESS + if [ x"$CONFIGURATION_TYPE" != x"" ]; then if [ -f /opt/app-root/etc/jupyterhub_config-$CONFIGURATION_TYPE.sh ]; then . /opt/app-root/etc/jupyterhub_config-$CONFIGURATION_TYPE.sh diff --git a/requirements.txt b/requirements.txt index 3b28219..b015d39 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ kubernetes==9.0.1 -jupyterhub==1.0.0 -#jupyterhub-kubespawner==0.10.1 -git+https://github.com/jupyterhub/kubespawner.git@a945ef01410867b39e0c174d362a8702bbaa15e9#egg=jupyterhub-kubespawner +jupyterhub==1.1.0 +jupyterhub-kubespawner==0.12.0 +#git+https://github.com/jupyterhub/kubespawner.git@a945ef01410867b39e0c174d362a8702bbaa15e9#egg=jupyterhub-kubespawner git+https://github.com/jupyterhub/wrapspawner.git@5f2b7075f77d0c1c49066682a8e8adad0dab76db jupyterhub-tmpauthenticator==0.6 -oauthenticator==0.9.0 +oauthenticator==0.11.0 jupyterhub-ldapauthenticator==1.2.2 psycopg2==2.8.4 openshift==0.10.0