Tidy up cluster setup instructions.

README.org

@@ -29,7 +29,7 @@ To export the site to static html to serve for example via github pages, run:
 npm install
 
 # Build and export the site
-npm run build && npm export
+npm run build && npm run export
 #+end_src
 
 
@@ -39,7 +39,10 @@ The workshop expects an OpenShift 4.14 cluster with a few pre-requisites.
 
 *** Add redhat-cop helm chart repository
 
-#+begin_src yaml
+Required so the Gitea helm chart will be available for all users.
+
+#+begin_src bash
+cat << EOF | oc apply --filename -
 apiVersion: helm.openshift.io/v1beta1
 kind: HelmChartRepository
 metadata:
@@ -48,12 +51,16 @@ spec:
   connectionConfig:
     url: 'https://redhat-cop.github.io/helm-charts'
   name: Red Hat Community
+EOF
 #+end_src
 
 
 *** Install web terminal operator
 
-#+begin_src yaml
+So our workshop participants don't need to install ~oc~ locally.
+
+#+begin_src bash
+cat << EOF | oc apply --filename -
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
@@ -65,23 +72,30 @@ spec:
   name: web-terminal
   source: redhat-operators
   sourceNamespace: openshift-marketplace
-  #startingCSV: web-terminal.v1.8.0-0.1692219820.p
+EOF
 #+end_src
 
 
 *** Create an operatorgroup for each user
 
+We want each user to be able to install the same operator so we can pre-create namespaces and seed them with OperatorGroups to reduce complexity.
+
 #+begin_src bash
 cat << EOF > operatorgroup.yaml
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
   name: grafana-og
-  namespace: userX
 spec:
   targetNamespaces:
-    - userX
+    - user$user
   upgradeStrategy: Default
 EOF
-for user in $(seq 1 30); do oc apply ...; done
+
+for user in $(seq 1 30); do
+    export user=${user}
+    oc new-project user"${user}"
+    envsubst < operatorgroup.yaml | oc create --filename - --namespace user"${user}"
+    oc adm policy add-role-to-user --namespace user"${user}" admin user"${user}"
+done
 #+end_src

data/workshop/exercise1.mdx

@@ -10,7 +10,7 @@ summary: "In this first exercise we'll get familiar with OpenShift."
 
 Red Hat [OpenShift](https://www.redhat.com/en/technologies/cloud-computing/openshift) is a unified platform to build, modernize, and deploy applications at scale. In this first excercise we'll get logged into our cluster and familarise ourselves with the OpenShift web console and web terminal.
 
-The OpenShift Container Platform web console is a feature-rich web console with both an Administrator perspective and a Developer perspective accessible through any modern web browser. You can use the web console to visualize, browse, and manage your OpenShift cluster and the applications running on it.
+The OpenShift Container Platform web console is a feature-rich user interface with both an **Administrator** perspective and a **Developer** perspective accessible through any modern web browser. You can use the web console to visualize, browse, and manage your OpenShift cluster and the applications running on it.
 
 In addition to the web console, OpenShift includes command line tools to provide users with a nice interface to work with applications deployed to the platform. The `oc` command line tool is available for Linux, macOS or Windows.
 
@@ -18,7 +18,7 @@ In addition to the web console, OpenShift includes command line tools to provide
 
 ## 1.1 - Login to lab environment
 
-An OpenShift `4.14` cluster has already been provisioned for you to complete these excercises. Open your web browser and navigate to the workshop login page https://demo.redhat.com/workshop/vq5abz.
+An OpenShift `4.14` cluster has already been provisioned for you to complete these excercises. Open your web browser and navigate to the workshop login page https://demo.redhat.com/workshop/enwmgc.
 
 Once the page loads you can login with the details provided by your workshop facilitator.
 
@@ -50,7 +50,7 @@ Each project has its own resources, role based access control (who can or cannot
 
 Projects act as a "wrapper" around all the application services you (or your teams) are using for your work.
 
-In this lab environment, you already have access to single project: `userX` (Where X is the number of your user allocted for the workshop.)
+In this lab environment, you already have access to single project: `userX` (Where X is the number of your user allocted for the workshop from the previous step.)
 
 Let's click into our `Project` from the left hand panel of the **Developer** web console perspective. We should be able to see that our project has no `Deployments` and there are no compute cpu or memory resources currently being consumed.
 
@@ -188,3 +188,4 @@ That's a quick introduction to the `oc` command line utility. Let's close our we
 | *Closing your web terminal*                                                   |
 </Zoom>
 
+Well done, you've finished exercise 1! 🎉

data/workshop/exercise2.mdx

@@ -128,3 +128,4 @@ How much cpu and memory is your ParksMap application currently using?
 | *Checking the ParksMap application resource usage*                  |
 </Zoom>
 
+Well done, you've finished exercise 2! 🎉

data/workshop/exercise3.mdx

@@ -113,3 +113,10 @@ pod "parksmap-ff7477dc4-2nxd2" deleted
 If we now run `oc get pods` again we will see a new **Pod** has automatically been created by OpenShift to replace the one we fully deleted. This is because OpenShift is a container orchestration engine that will always try and enforce the desired state that we declare.
 
 In our ParksMap **Deployment** we have declared we always want two replicas of our application running at all times. Even if we (possibly accidentally) delete one, OpenShift will always attempt to self heal to return to our desired state.
+
+## 3.5 - Bonus objective: Autoscaling
+
+If you have time, take a while to explore the concepts of [HorizontalPodAutoscaling](https://docs.openshift.com/container-platform/4.14/nodes/pods/nodes-pods-autoscaling.html), [VerticalPodAutoscaling](https://docs.openshift.com/container-platform/4.14/nodes/pods/nodes-pods-vertical-autoscaler.html) and [Cluster autoscaling](https://docs.openshift.com/container-platform/4.14/machine_management/applying-autoscaling.html).
+
+
+Well done, you've finished exercise 3! 🎉

data/workshop/exercise4.mdx

@@ -2,7 +2,7 @@
 title: Deploying an application via helm chart
 exercise: 4
 date: '2023-12-06'
-tags: ['openshift','containers','kubernetes','deployments','autoscaling']
+tags: ['openshift','containers','kubernetes','deployments','helm']
 draft: false
 authors: ['default']
 summary: "Exploring alternative deployment approaches."
@@ -34,7 +34,7 @@ In the YAML configuration window enter the following, substituting `userX` with
 ```yaml
 db:
   password: userX
-hostname: userX-gitea.apps.<clusterdomain>
+hostname: userX-gitea.apps.cluster-dsmsm.dynamic.opentlc.com
 tlsRoute: true
 ```
 
@@ -131,3 +131,10 @@ Enter the `gitea` confirmation at the prompt and click **Delete**. If you now re
 | *Deleting the gitea application helm release*                       |
 </Zoom>
 
+
+## 4.6 - Bonus objective: Artifact Hub
+
+If you have time, take a while to explore https://artifacthub.io/packages/search to see the kinds of applications available in the most popular publicly available Helm Chart repository Artifact Hub.
+
+
+Well done, you've finished exercise 4! 🎉

data/workshop/exercise5.mdx

@@ -47,7 +47,7 @@ spec:
 
 Click the **+** button in the top right corner menu bar of the OpenShift web console. This is a fast way to quickly import snippets of YAML for testing or exploration purposes.
 
-Paste the above snippet of YAML into the editor and replace the three instances of `userX` with your assigned user.
+Paste the above snippet of YAML into the editor and replace the instance of `userX` with your assigned user.
 
 Click **Create**. In a minute or so you should see the Grafana operator installed and running in your project.
 
@@ -96,7 +96,7 @@ spec:
     spec:
       tls:
         termination: edge
-      host: grafana-userX.apps.cluster-4dq8d.dynamic.opentlc.com
+      host: grafana-userX.apps.cluster-dsmsm.dynamic.opentlc.com
 ```
 
 <Zoom>
@@ -136,4 +136,9 @@ Once the new tab opens we should be able to login to Grafana using the credentia
 </Zoom>
 
 
+## 5.4 - Bonus objective: Grafana dashboards
 
+If you have time, take a while to learn about the https://grafana.com/grafana/dashboards and how Grafana can be used to visualise just about anything.
+
+
+Well done, you've finished exercise 5! 🎉 

data/workshop/exercise6.mdx

@@ -88,3 +88,11 @@ After the build has completed and successfully:
 - The ReplicaSet will detect no Pods are running and will cause one to be deployed, as our default replica count is just 1.
 
 To conclude, when issuing the `oc get pods` command, you will see that the build **Pod** has finished (exited) and that an application **Pod** is in a ready and running state.
+
+
+## 6.3 - Bonus objective: Podman
+
+If you have time, take a while to understand how [Podman](https://developers.redhat.com/articles/2022/05/02/podman-basics-resources-beginners-and-experts) can be used to build container images on your device outside of an OpenShift cluster.
+
+
+Well done, you've finished exercise 6! 🎉

public/feed.xml

@@ -47,7 +47,7 @@
     <description>Exploring alternative deployment approaches.</description>
     <pubDate>Wed, 06 Dec 2023 00:00:00 GMT</pubDate>
     <author>jablair@redhat.com (Red Hat)</author>
-    <category>openshift</category><category>containers</category><category>kubernetes</category><category>deployments</category><category>autoscaling</category>
+    <category>openshift</category><category>containers</category><category>kubernetes</category><category>deployments</category><category>helm</category>
   </item>
 
   <item>

public/tags/autoscaling/feed.xml

@@ -20,15 +20,5 @@
     <category>openshift</category><category>containers</category><category>kubernetes</category><category>deployments</category><category>autoscaling</category>
   </item>
 
-  <item>
-    <guid>https://jmhbnz.github.io/ocp-app-delivery-workshop/workshop/exercise4</guid>
-    <title>Deploying an application via helm chart</title>
-    <link>https://jmhbnz.github.io/ocp-app-delivery-workshop/workshop/exercise4</link>
-    <description>Exploring alternative deployment approaches.</description>
-    <pubDate>Wed, 06 Dec 2023 00:00:00 GMT</pubDate>
-    <author>jablair@redhat.com (Red Hat)</author>
-    <category>openshift</category><category>containers</category><category>kubernetes</category><category>deployments</category><category>autoscaling</category>
-  </item>
-
     </channel>
   </rss>

public/tags/containers/feed.xml

@@ -47,7 +47,7 @@
     <description>Exploring alternative deployment approaches.</description>
     <pubDate>Wed, 06 Dec 2023 00:00:00 GMT</pubDate>
     <author>jablair@redhat.com (Red Hat)</author>
-    <category>openshift</category><category>containers</category><category>kubernetes</category><category>deployments</category><category>autoscaling</category>
+    <category>openshift</category><category>containers</category><category>kubernetes</category><category>deployments</category><category>helm</category>
   </item>
 
   <item>

public/tags/deployments/feed.xml

@@ -37,7 +37,7 @@
     <description>Exploring alternative deployment approaches.</description>
     <pubDate>Wed, 06 Dec 2023 00:00:00 GMT</pubDate>
     <author>jablair@redhat.com (Red Hat)</author>
-    <category>openshift</category><category>containers</category><category>kubernetes</category><category>deployments</category><category>autoscaling</category>
+    <category>openshift</category><category>containers</category><category>kubernetes</category><category>deployments</category><category>helm</category>
   </item>
 
     </channel>

public/tags/helm/feed.xml

@@ -0,0 +1,24 @@
+
+  <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+    <channel>
+      <title>Red Hat OpenShift Application Delivery Workshop</title>
+      <link>https://jmhbnz.github.io/ocp-app-delivery-workshop/workshop</link>
+      <description>Red Hat OpenShift Application Delivery Workshop</description>
+      <language>en-us</language>
+      <managingEditor>jablair@redhat.com (Red Hat)</managingEditor>
+      <webMaster>jablair@redhat.com (Red Hat)</webMaster>
+      <lastBuildDate>Wed, 06 Dec 2023 00:00:00 GMT</lastBuildDate>
+      <atom:link href="https://jmhbnz.github.io/ocp-app-delivery-workshop/tags/helm/feed.xml" rel="self" type="application/rss+xml"/>
+      
+  <item>
+    <guid>https://jmhbnz.github.io/ocp-app-delivery-workshop/workshop/exercise4</guid>
+    <title>Deploying an application via helm chart</title>
+    <link>https://jmhbnz.github.io/ocp-app-delivery-workshop/workshop/exercise4</link>
+    <description>Exploring alternative deployment approaches.</description>
+    <pubDate>Wed, 06 Dec 2023 00:00:00 GMT</pubDate>
+    <author>jablair@redhat.com (Red Hat)</author>
+    <category>openshift</category><category>containers</category><category>kubernetes</category><category>deployments</category><category>helm</category>
+  </item>
+
+    </channel>
+  </rss>

public/tags/kubernetes/feed.xml

@@ -47,7 +47,7 @@
     <description>Exploring alternative deployment approaches.</description>
     <pubDate>Wed, 06 Dec 2023 00:00:00 GMT</pubDate>
     <author>jablair@redhat.com (Red Hat)</author>
-    <category>openshift</category><category>containers</category><category>kubernetes</category><category>deployments</category><category>autoscaling</category>
+    <category>openshift</category><category>containers</category><category>kubernetes</category><category>deployments</category><category>helm</category>
   </item>
 
   <item>

public/tags/openshift/feed.xml

@@ -47,7 +47,7 @@
     <description>Exploring alternative deployment approaches.</description>
     <pubDate>Wed, 06 Dec 2023 00:00:00 GMT</pubDate>
     <author>jablair@redhat.com (Red Hat)</author>
-    <category>openshift</category><category>containers</category><category>kubernetes</category><category>deployments</category><category>autoscaling</category>
+    <category>openshift</category><category>containers</category><category>kubernetes</category><category>deployments</category><category>helm</category>
   </item>
 
   <item>