Update to latest workshop scripts and base images.

.gitmodules

@@ -1,4 +1,4 @@
 [submodule ".workshop/scripts"]
 	path = .workshop/scripts
 	url = https://github.com/openshift-homeroom/spawner-scripts.git
-	branch = stable/1.x
+	branch = stable/2.x

.workshop/settings.sh

@@ -1,3 +1,6 @@
-WORKSHOP_NAME=mysql-lab
+WORKSHOP_NAME=lab-mysql-operator
 WORKSHOP_IMAGE=quay.io/openshiftlabs/lab-mysql-operator:1.7
+WORKSHOP_TITLE="Using the MySQL Operator"
+WORKSHOP_DESCRIPTION="A workshop on using the MySQL operator"
+CONSOLE_IMAGE=quay.io/openshift/origin-console:4.1
 RESOURCE_BUDGET=unlimited

.workshop/templates/clusterroles-session-rules.yaml

@@ -3,20 +3,27 @@ kind: Template
 metadata:
   name: clusterroles-session-rules
 parameters:
-- name: SPAWNER_NAMESPACE
+- name: NAME_PREFIX
+  value: ""
+  required: false
+- name: WORKSHOP_NAME
   value: ""
   required: true
-- name: SPAWNER_APPLICATION
+- name: SPAWNER_NAMESPACE
   value: ""
   required: true
+- name: SPAWNER_MODE
+  value: "learning-portal"
+  required: true
 objects:
 - apiVersion: authorization.openshift.io/v1
   kind: ClusterRole
   metadata:
+    name: ${NAME_PREFIX}${WORKSHOP_NAME}-session-rules
     labels:
-      app: ${SPAWNER_APPLICATION}-${SPAWNER_NAMESPACE}
-      spawner: learning-portal
-    name: ${SPAWNER_APPLICATION}-${SPAWNER_NAMESPACE}-session-rules
+      app: ${NAME_PREFIX}${WORKSHOP_NAME}
+      spawner: ${SPAWNER_MODE}
+      class: spawner
   rules:
   - apiGroups:
     - pxc.percona.com

.workshop/templates/clusterroles-spawner-rules.yaml

@@ -3,20 +3,27 @@ kind: Template
 metadata:
   name: clusterroles-spawner-rules
 parameters:
-- name: SPAWNER_NAMESPACE
+- name: NAME_PREFIX
+  value: ""
+  required: false
+- name: WORKSHOP_NAME
   value: ""
   required: true
-- name: SPAWNER_APPLICATION
+- name: SPAWNER_NAMESPACE
   value: ""
   required: true
+- name: SPAWNER_MODE
+  value: "learning-portal"
+  required: true
 objects:
 - apiVersion: authorization.openshift.io/v1
   kind: ClusterRole
   metadata:
+    name: ${NAME_PREFIX}${WORKSHOP_NAME}-spawner-rules
     labels:
-      app: ${SPAWNER_APPLICATION}-${SPAWNER_NAMESPACE}
-      spawner: learning-portal
-    name: ${SPAWNER_APPLICATION}-${SPAWNER_NAMESPACE}-spawner-rules
+      app: ${NAME_PREFIX}${WORKSHOP_NAME}
+      spawner: ${SPAWNER_MODE}
+      class: spawner
   rules:
   - apiGroups:
     - ""