Merge branch 'main' of https://github.com/rht-labs/tech-exercise

Author: ckavili

docs/1-the-manual-menace/1-the-basics.md

@@ -46,7 +46,7 @@
 8. Check if you can connect to OpenShift. Run the command below.
 
     <p class="tip">
-    ⛷️ <b>TIP</b> ⛷️ - Before you hit enter, make sure you change the username and password to match your team's login details
+    ⛷️ <b>TIP</b> ⛷️ - Before you hit enter, make sure you change the username and password to match your team's login details. If your password includes special characters, put it in single quotes. ie: 'A8y?Rpm!9+A3B/KG'
     </p>  
 
     ```bash

docs/1-the-manual-menace/2-argocd.md

@@ -29,7 +29,7 @@ When something is seen as not matching the required state in Git, an application
 2. We are using the [Red Hat GitOps Operator](https://github.com/redhat-developer/gitops-operator) which was deployed as part of the cluster setup. Normally this step would be done as part of the Operator Install so its a bit more complicated than we would like. Because _we did not know_ your team names ahead of time 👻 we will need to update an environment variable on the Operator Subscription. This tells the Operator its OK to deploy a cluster scoped ArgoCD instance into your <TEAM_NAME>-ci-cd project. Run this shell script:
 
     <p class="tip">
-    🐌 THIS IS NOT GITOPS - Until we work out a better way to automate this. 🐎
+    🐌 THIS IS NOT GITOPS - Until we work out a better way to automate this. 🐎 If you see "...." in your terminal after you copy this shell script, do not worry. Hit return and it will run as designed.
     </p>
 
     ```bash
@@ -98,15 +98,15 @@ When something is seen as not matching the required state in Git, an application
     ⛷️ <b>NOTE</b> ⛷️ - It's also worth noting we're allowing ArgoCD to run in a fairly permissive mode for these exercise, it can pull charts from anywhere. If you're interested in securing ArgoCD a bit more, checkout the <span style="color:blue;"><a href="/#/1-the-manual-menace/666-here-be-dragons?id=here-be-dragons">here-be-dragons</a></span> exercise at the end of this lab.
     </p>
 
-3. If we check in OpenShift we should see the Operator pod coming to life and (eventually) the argocd-server, dex and other pods spin up.
+3. If we check in OpenShift we should see the Operator pod coming to life and (eventually) the argocd-server, dex and other pods spin up. To do this, we are going to run a command with a 'watch' flag to continuousy monitor pod creation.
 
     ```bash
     oc get pods -w -n ${TEAM_NAME}-ci-cd
     ```
 
     ![argocd-pods](images/argocd-pods.png)
 
-    *You can do Control+C to break the 'watch' mode*
+    *You must do Control+C to break the 'watch' mode to continue to the next step. Once all your pods are running*
 
 4. When all the pods are up and running, we can login to the UI of ArgoCD. Get the route and open it in a new browser tab.
 
@@ -151,4 +151,4 @@ When something is seen as not matching the required state in Git, an application
     echo https://$(oc get route/our-todolist -n ${TEAM_NAME}-ci-cd --template='{{.spec.host}}')
     ```
 
-🪄🪄 Magic! You've now deployed ArgoCD and got it to manually deploy an application for you. Next up, we'll make ArgoCD do some *REAL* GitOps 🪄🪄
+🪄🪄 Magic! You've now deployed ArgoCD and got it to manually deploy an application for you. Next up, we'll make ArgoCD do some *REAL* GitOps 🪄🪄

docs/slides/content/tech-exercise-i.md

@@ -87,17 +87,11 @@ _We will set up Git projects, create dev, test, and stage projects in OpenShift,
 
 
 
-### 💥 Mob to Learn 💥
-* Begin with the [pairing and mobbing](?name=pairing-and-mobbing) exercise (if not already completed).
+### 💥 Let's Begin 💥
 * In your table teams, form a mob to complete the exercise. Work together as a team to deploy your shared tooling and infrastructure!
-* Rotate the `driver` at the end of the section to give everyone a chance to get their hands dirty with code!
-* If you finish early, try your hand at the `Here be dragons` section.
-* Your tutor will share links to the instructions, OpenShift Console, CRW, and GitLab server.
-
-
-
-### 💥 CodeReadyWorkspaces 💥 <!-- .element: class="title-bottom-left" -->
-<!-- .slide: data-background-size="contain" data-background-image="images/tech-exercise-i/crw.png", class="white-style" data-background-opacity="1"	 -->
+* You will want to rotate the `driver` at the end of each exercise section to give everyone a chance to get their hands dirty with code!
+* If you finish the exercise early, try your hand at the `Here be dragons` section.
+* Your facilitator will share links to the instructions, OpenShift Console, CRW, and GitLab server.