Update to latest workshop scripts and base image.

Author: GrahamDumpleton

.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/scripts

@@ -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:
     - "tekton.dev"

.workshop/templates/clusterroles-session-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:
     - ""

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

@@ -1,23 +1,29 @@
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
-  name: configmap-extra-resources
+  name: configmap-session-resources
 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: v1
   kind: ConfigMap
   metadata:
-    name: ${SPAWNER_APPLICATION}-res
-    namespace: ${SPAWNER_NAMESPACE}
+    name: ${NAME_PREFIX}${WORKSHOP_NAME}-session-resources
     labels:
-      app: ${SPAWNER_APPLICATION}-${SPAWNER_NAMESPACE}
-      spawner: learning-portal
+      app: ${NAME_PREFIX}${WORKSHOP_NAME}
+      spawner: ${SPAWNER_MODE}
+      class: spawner
   data:
     extra_resources.yaml: |-
         kind: List

…templates/configmap-extra-resources.yaml …mplates/configmap-session-resources.yaml.workshop/templates/configmap-extra-resources.yaml renamed to .workshop/templates/configmap-session-resources.yaml .workshop/templates/configmap-extra-resources.yaml renamed to .workshop/templates/configmap-session-resources.yaml

@@ -1,4 +1,4 @@
-FROM quay.io/openshifthomeroom/workshop-dashboard:4.2.0
+FROM quay.io/openshifthomeroom/workshop-dashboard:5.0.0
 
 USER root