Merge branch 'release/3.3.1'

opendatahub-io-contrib · Nov 12, 2019 · 8b8250d · 8b8250d
2 parents d5ce79e + 178ade3
commit 8b8250d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/build-configs/jupyterhub.json b/build-configs/jupyterhub.json
@@ -39,7 +39,7 @@
                     "type": "Git",
                     "git": {
                         "uri": "https://github.com/jupyter-on-openshift/jupyterhub-quickstart.git",
-                        "ref": "3.3.0"
+                        "ref": "3.3.1"
                     }
                 },
                 "strategy": {
@@ -55,7 +55,7 @@
                 "output": {
                     "to": {
                         "kind": "ImageStreamTag",
-                        "name": "jupyterhub:3.3.0"
+                        "name": "jupyterhub:3.3.1"
                     }
                 }
             }

diff --git a/image-streams/jupyterhub.json b/image-streams/jupyterhub.json
@@ -14,10 +14,10 @@
                 },
                 "tags": [
                     {
-                        "name": "3.3.0",
+                        "name": "3.3.1",
                         "from": {
                             "kind": "DockerImage",
-                            "name": "quay.io/jupyteronopenshift/jupyterhub:3.3.0"
+                            "name": "quay.io/jupyteronopenshift/jupyterhub:3.3.1"
                         }
                     }
                 ]

diff --git a/templates/jupyterhub-builder.json b/templates/jupyterhub-builder.json
@@ -18,7 +18,7 @@
         },
         {
             "name": "BUILDER_IMAGE",
-            "value": "jupyterhub:3.3.0",
+            "value": "jupyterhub:3.3.1",
             "required": true
         },
         {

diff --git a/templates/jupyterhub-deployer.json b/templates/jupyterhub-deployer.json
@@ -18,7 +18,7 @@
         },
         {
             "name": "JUPYTERHUB_IMAGE",
-            "value": "jupyterhub:3.3.0",
+            "value": "jupyterhub:3.3.1",
             "required": true
         },
         {
@@ -89,6 +89,11 @@
                 "name": "${APPLICATION_NAME}-hub",
                 "labels": {
                     "app": "${APPLICATION_NAME}"
+                },
+                "annotations": {
+                    "serviceaccounts.openshift.io/oauth-redirectreference.first": "{\"kind\":\"OAuthRedirectReference\",\"apiVersion\":\"v1\",\"reference\":{\"kind\":\"Route\",\"name\":\"${APPLICATION_NAME}\"}}",
+                    "serviceaccounts.openshift.io/oauth-redirecturi.first": "hub/oauth_callback",
+                    "serviceaccounts.openshift.io/oauth-want-challenges": "false"
                 }
             }
         },
@@ -108,8 +113,8 @@
                 }
             ],
             "roleRef": {
-		"apiGroup": "rbac.authorization.k8s.io",
-		"kind": "ClusterRole",
+                "apiGroup": "rbac.authorization.k8s.io",
+                "kind": "ClusterRole",
                 "name": "edit"
             }
         },

diff --git a/templates/jupyterhub-quickstart.json b/templates/jupyterhub-quickstart.json
@@ -18,7 +18,7 @@
         },
         {
             "name": "JUPYTERHUB_IMAGE",
-            "value": "jupyterhub:3.3.0",
+            "value": "jupyterhub:3.3.1",
             "required": true
         },
         {
@@ -162,6 +162,11 @@
                 "name": "${APPLICATION_NAME}-hub",
                 "labels": {
                     "app": "${APPLICATION_NAME}"
+                },
+                "annotations": {
+                    "serviceaccounts.openshift.io/oauth-redirectreference.first": "{\"kind\":\"OAuthRedirectReference\",\"apiVersion\":\"v1\",\"reference\":{\"kind\":\"Route\",\"name\":\"${APPLICATION_NAME}\"}}",
+                    "serviceaccounts.openshift.io/oauth-redirecturi.first": "hub/oauth_callback",
+                    "serviceaccounts.openshift.io/oauth-want-challenges": "false"
                 }
             }
         },
@@ -181,8 +186,8 @@
                 }
             ],
             "roleRef": {
-		"apiGroup": "rbac.authorization.k8s.io",
-		"kind": "ClusterRole",
+                "apiGroup": "rbac.authorization.k8s.io",
+                "kind": "ClusterRole",
                 "name": "edit"
             }
         },