Merge branch 'release/6.0.1'

kubernetes-homeroom · Sep 5, 2019 · da6933c · da6933c
2 parents ccecc44 + b3abf08
commit da6933c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/jupyterhub/src/jupyterhub_config.py b/jupyterhub/src/jupyterhub_config.py
@@ -1191,6 +1191,8 @@ def create_service_account(spawner, pod):
     user_account_name = '%s-%s' % (hub, short_name)
     hub_account_name = '%s-hub' % hub
 
+    owner_uid = None
+
     while True:
         try:
             text = service_account_template.safe_substitute(

diff --git a/templates/hosted-workshop-production.json b/templates/hosted-workshop-production.json
@@ -72,7 +72,7 @@
         },
         {
             "name": "SPAWNER_IMAGE",
-            "value": "quay.io/openshifthomeroom/workshop-spawner:6.0.0",
+            "value": "quay.io/openshifthomeroom/workshop-spawner:6.0.1",
             "required": true
         },
         {

diff --git a/templates/jumpbox-server-production.json b/templates/jumpbox-server-production.json
@@ -45,12 +45,12 @@
         },
         {
             "name": "SPAWNER_IMAGE",
-            "value": "quay.io/openshifthomeroom/workshop-spawner:6.0.0",
+            "value": "quay.io/openshifthomeroom/workshop-spawner:6.0.1",
             "required": true
         },
         {
             "name": "KEYCLOAK_IMAGE",
-            "value": "quay.io/openshifthomeroom/workshop-keycloak:6.0.0",
+            "value": "quay.io/openshifthomeroom/workshop-keycloak:6.0.1",
             "required": true
         },
         {

diff --git a/templates/learning-portal-production.json b/templates/learning-portal-production.json
@@ -77,7 +77,7 @@
         },
         {
             "name": "SPAWNER_IMAGE",
-            "value": "quay.io/openshifthomeroom/workshop-spawner:6.0.0",
+            "value": "quay.io/openshifthomeroom/workshop-spawner:6.0.1",
             "required": true
         },
         {

diff --git a/templates/terminal-server-production.json b/templates/terminal-server-production.json
@@ -72,7 +72,7 @@
         },
         {
             "name": "SPAWNER_IMAGE",
-            "value": "quay.io/openshifthomeroom/workshop-spawner:6.0.0",
+            "value": "quay.io/openshifthomeroom/workshop-spawner:6.0.1",
             "required": true
         },
         {

diff --git a/templates/user-workspace-production.json b/templates/user-workspace-production.json
@@ -73,12 +73,12 @@
         },
         {
             "name": "SPAWNER_IMAGE",
-            "value": "quay.io/openshifthomeroom/workshop-spawner:6.0.0",
+            "value": "quay.io/openshifthomeroom/workshop-spawner:6.0.1",
             "required": true
         },
         {
             "name": "KEYCLOAK_IMAGE",
-            "value": "quay.io/openshifthomeroom/workshop-keycloak:6.0.0",
+            "value": "quay.io/openshifthomeroom/workshop-keycloak:6.0.1",
             "required": true
         },
         {