Skip to content

Commit

Permalink
Merge branch 'release/6.2.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@GrahamDumpleton
GrahamDumpleton committed Oct 14, 2019
2 parents 3b49f54 + 2f34223 commit f410fc2
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion jupyterhub/src/requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ jupyterhub==1.0.0
jupyterhub-kubespawner==0.10.1
jupyterhub-tmpauthenticator==0.6
oauthenticator==0.9.0
openshift==0.9.1
openshift==0.9.2
wrapt==1.11.2
14 changes: 7 additions & 7 deletions jupyterhub/src/scripts/delete-projects.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,15 +152,15 @@ def purge_project(name):

print('WARNING: deleting finalizers on resource: %s' % body)

try:
resource_type.patch(namespace=name, body=body,
content_type='application/merge-patch+json')
try:
resource_type.patch(namespace=name, body=body,
content_type='application/merge-patch+json')

except ApiException as e:
print('ERROR: failed to delete finalizers: %s' % body, e)
except ApiException as e:
print('ERROR: failed to delete finalizers: %s' % body, e)

except Exception as e:
print('ERROR: failed to delete finalizers: %s' % body, e)
except Exception as e:
print('ERROR: failed to delete finalizers: %s' % body, e)

except ApiException as e:
if e.status not in (403, 404, 405):
Expand Down
2 changes: 1 addition & 1 deletion templates/hosted-workshop-development.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@
"name": "latest",
"from": {
"kind": "DockerImage",
"name": "quay.io/openshifthomeroom/workshop-dashboard:4.1.0"
"name": "quay.io/openshifthomeroom/workshop-dashboard:4.2.0"
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions templates/hosted-workshop-production.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
},
{
"name": "SPAWNER_IMAGE",
"value": "quay.io/openshifthomeroom/workshop-spawner:6.2.1",
"value": "quay.io/openshifthomeroom/workshop-spawner:6.2.2",
"required": true
},
{
Expand Down Expand Up @@ -570,7 +570,7 @@
"name": "latest",
"from": {
"kind": "DockerImage",
"name": "quay.io/openshifthomeroom/workshop-dashboard:4.1.0"
"name": "quay.io/openshifthomeroom/workshop-dashboard:4.2.0"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion templates/jumpbox-server-development.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@
"name": "latest",
"from": {
"kind": "DockerImage",
"name": "quay.io/openshifthomeroom/workshop-terminal:3.0.1"
"name": "quay.io/openshifthomeroom/workshop-terminal:3.1.0"
}
}
]
Expand Down
6 changes: 3 additions & 3 deletions templates/jumpbox-server-production.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
},
{
"name": "SPAWNER_IMAGE",
"value": "quay.io/openshifthomeroom/workshop-spawner:6.2.1",
"value": "quay.io/openshifthomeroom/workshop-spawner:6.2.2",
"required": true
},
{
"name": "KEYCLOAK_IMAGE",
"value": "quay.io/openshifthomeroom/workshop-keycloak:6.2.1",
"value": "quay.io/openshifthomeroom/workshop-keycloak:6.2.2",
"required": true
},
{
Expand Down Expand Up @@ -526,7 +526,7 @@
"name": "latest",
"from": {
"kind": "DockerImage",
"name": "quay.io/openshifthomeroom/workshop-terminal:3.0.1"
"name": "quay.io/openshifthomeroom/workshop-terminal:3.1.0"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion templates/learning-portal-development.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -843,7 +843,7 @@
"name": "latest",
"from": {
"kind": "DockerImage",
"name": "quay.io/openshifthomeroom/workshop-dashboard:4.1.0"
"name": "quay.io/openshifthomeroom/workshop-dashboard:4.2.0"
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions templates/learning-portal-production.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
},
{
"name": "SPAWNER_IMAGE",
"value": "quay.io/openshifthomeroom/workshop-spawner:6.2.1",
"value": "quay.io/openshifthomeroom/workshop-spawner:6.2.2",
"required": true
},
{
Expand Down Expand Up @@ -803,7 +803,7 @@
"name": "latest",
"from": {
"kind": "DockerImage",
"name": "quay.io/openshifthomeroom/workshop-dashboard:4.1.0"
"name": "quay.io/openshifthomeroom/workshop-dashboard:4.2.0"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion templates/terminal-server-development.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@
"name": "latest",
"from": {
"kind": "DockerImage",
"name": "quay.io/openshifthomeroom/workshop-terminal:3.0.1"
"name": "quay.io/openshifthomeroom/workshop-terminal:3.1.0"
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions templates/terminal-server-production.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
},
{
"name": "SPAWNER_IMAGE",
"value": "quay.io/openshifthomeroom/workshop-spawner:6.2.1",
"value": "quay.io/openshifthomeroom/workshop-spawner:6.2.2",
"required": true
},
{
Expand Down Expand Up @@ -570,7 +570,7 @@
"name": "latest",
"from": {
"kind": "DockerImage",
"name": "quay.io/openshifthomeroom/workshop-terminal:3.0.1"
"name": "quay.io/openshifthomeroom/workshop-terminal:3.1.0"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion templates/user-workspace-development.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,7 @@
"name": "latest",
"from": {
"kind": "DockerImage",
"name": "quay.io/openshifthomeroom/workshop-dashboard:4.1.0"
"name": "quay.io/openshifthomeroom/workshop-dashboard:4.2.0"
}
}
]
Expand Down
6 changes: 3 additions & 3 deletions templates/user-workspace-production.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@
},
{
"name": "SPAWNER_IMAGE",
"value": "quay.io/openshifthomeroom/workshop-spawner:6.2.1",
"value": "quay.io/openshifthomeroom/workshop-spawner:6.2.2",
"required": true
},
{
"name": "KEYCLOAK_IMAGE",
"value": "quay.io/openshifthomeroom/workshop-keycloak:6.2.1",
"value": "quay.io/openshifthomeroom/workshop-keycloak:6.2.2",
"required": true
},
{
Expand Down Expand Up @@ -874,7 +874,7 @@
"name": "latest",
"from": {
"kind": "DockerImage",
"name": "quay.io/openshifthomeroom/workshop-dashboard:4.1.0"
"name": "quay.io/openshifthomeroom/workshop-dashboard:4.2.0"
}
}
]
Expand Down

0 comments on commit f410fc2

Please sign in to comment.