Update to 4.8

dev-site.yml

@@ -22,10 +22,10 @@ asciidoc:
     experimental: true
     parksmap-version: latest
     parksmap-image: quay.io/openshiftroadshow/parksmap
-    openshift-docs-url: https://docs.openshift.com/container-platform/4.7
-    openshift-version: 4.7
+    openshift-docs-url: https://docs.openshift.com/container-platform/4.8
+    openshift-version: 4.8
     project-namespace: workshop
-    kubernetes-version: v1.20.0
+    kubernetes-version: v1.21.0
     release-version: ocp
     roks-login-url: https://cloud.ibm.com/authorize/devcluster
     page-pagination: true

documentation/antora.yml

@@ -1,6 +1,6 @@
 name: rhs-openshift-starter-guides
 title: OpenShift Starter Guides
-version: 4.7
+version: 4.8
 nav:
   - modules/ROOT/nav.adoc
 

documentation/modules/ROOT/pages/common-explore.adoc

@@ -61,7 +61,7 @@ ARO::
 --
 Access your cluster from https://console-openshift-console.%CLUSTER_SUBDOMAIN%[OpenShift Web Console,role='params-link',window='_blank'].
 
-Login to your ARO cluster using one of the available https://docs.openshift.com/container-platform/4.7/authentication/understanding-identity-provider.html[Identity Provider,window='_blank'].
+Login to your ARO cluster using one of the available {openshift-docs-url}/authentication/understanding-identity-provider.html[Identity Provider,window='_blank'].
 
 .Azure Active Directory
 ****
@@ -193,9 +193,9 @@ You should see the following (or something similar):
 [.console-output]
 [source,bash]
 ----
-Client Version: 4.7.13
-Server Version: 4.7.0 <.>
-Kubernetes Version: v1.20.0+bd9e442
+Client Version: 4.8.2
+Server Version: 4.8.0 <.>
+Kubernetes Version: v1.21.0+bd9e442
 ----
 <.> NOTE: you will only see the `Server Version` and `Kubernetes Version` if you are currently connected to a Kubenetes or OpenShift cluster
 

documentation/modules/ROOT/pages/nationalparks-java-pipeline.adoc

@@ -77,7 +77,7 @@ Let's create now a Tekton pipeline for Nationalparks backend, select your OpenSh
 [.console-input]
 [source,bash,subs="+attributes"]
 ----
-oc create -f https://raw.githubusercontent.com/openshift-roadshow/nationalparks/master/pipeline/nationalparks-pipeline.yaml -n %PROJECT%
+oc create -f https://raw.githubusercontent.com/openshift-roadshow/nationalparks/master/pipeline/nationalparks-pipeline-new.yaml -n %PROJECT%
 ----
 
 Verify the Pipeline you created:
@@ -194,12 +194,7 @@ spec:
     - name: redeploy
       params:
         - name: SCRIPT
-          value: oc $@
-        - name: ARGS
-          value:
-            - rollout
-            - restart
-            - deployment/$(params.APP_NAME)
+          value: oc rollout restart deployment/$(params.APP_NAME)
       runAfter:
         - build-image
       taskRef:

documentation/modules/ROOT/pages/nationalparks-java.adoc

@@ -80,7 +80,7 @@ Similar to how we used *+Add* before with an existing image, we
 can do the same for specifying a source code repository. Since for this lab you
 have your own git repository, let's use it with a simple Java S2I image.
 
-In the *Developer Perspective*, click *+Add* in the left navigation and then choose "*From Git*.
+In the Developer Perspective, click *+Add* in the left navigation, go to the *Git Repository* section and then choose *From Git* option.
 
 image::nationalparks-show-add-options.png[Add to Project]
 
@@ -93,15 +93,24 @@ Enter the following for Git Repo URL:
 https://github.com/openshift-roadshow/nationalparks.git
 ----
 
-OpenShift will automatically guess the Git server type and the programming language used by the source code. Verify that *Java* has been selected as your Builder Image, and be sure to select version `openjdk-11-ubi8` to have OpenJDK 11.
+OpenShift will automatically guess the Git server type and the programming language used by the source code. Verify that *Java* has been selected as your Builder Image, and be sure to select version *openjdk-11-ubi8* to have OpenJDK 11.
 
 image::nationalparks-import-from-git-url-builder.png[Import from Git]
 
 
 Scroll down to the *General* section. Select:
 
-* *Application Name* : workshop
-* *Name* : nationalparks
+*Application Name* :
+[source,role=copypaste]
+----
+workshop
+----
+
+*Name* :
+[source,role=copypaste]
+----
+nationalparks
+----
 
 In *Resources* section, select *Deployment*.
 

documentation/modules/ROOT/pages/parksmap-container-image.adoc

@@ -14,7 +14,9 @@ With OpenShift it can be done directly from the web console.
 
 Return to the https://console-openshift-console.%CLUSTER_SUBDOMAIN%/k8s/cluster/projects[Web Console, role='params-link', window='_blank'].
 
-If you're no longer on the *Topology* view in the Developer perspective, return there now. Click *Container Image* to open a dialog that will allow you to specify the information for the image you want to deploy.
+If you're no longer on the Developer perspective, return there now. 
+
+From the left menu, click *+Add*. You will see a screen where you have multiple options to deploy application to OpenShift. Click *Container Image* to open a dialog that will allow you to specify the information for the image you want to deploy.
 
 image::parksmap-devconsole-container-image.png[Add from Container Image]
 
@@ -32,12 +34,21 @@ Your screen will end up looking something like this:
 
 image::parksmap-image.png[Explore Project]
 
-In *Runtime Icon* you can select the icon to use in OpenShift Topology View for the app. You can leave the default OpenShift icon, or since this Frontend is made with Spring boot, you can pick Spring boot icon if you want.
+In *Runtime Icon* you can select the icon to use in OpenShift Topology View for the app. You can leave the default OpenShift icon, or since this Frontend is made with Spring Boot, you can pick *spring-boot*.
 
 Make sure to have the correct values in:
 
-* *Application Name* : workshop
-* *Name* : parksmap
+*Application Name* :
+[source,role=copypaste]
+----
+workshop
+----
+
+*Name* :
+[source,role=copypaste]
+----
+parksmap
+----
 
 Ensure *Deployment* is selected from *Resource* section.
 

documentation/modules/ROOT/pages/prerequisites.adoc

@@ -8,7 +8,7 @@ In order to run the lab in your cluster, you need to meet the requirements discu
 |**Component**|**Version**
 
 | https://www.openshift.com/try[OpenShift]
-| `4.7`
+| `4.8`
 |===
 
 In the following modules you will find out other prerequisites when needed.

documentation/modules/ROOT/pages/projects.adoc

@@ -31,11 +31,11 @@ At the top of the left navigation menu, you can toggle between the *Administrato
 
 image::explore-perspective-toggle.png[Toggle Between Perspectives]
 
-Select *Developer* to switch to the Developer perspective. Once the Developer perspective loads, you should be in the *Topology* view.
+Select *Developer* to switch to the Developer perspective. Once the Developer perspective loads, you should be in the *+Add* view.
 
-Right now, there are no applications or components to view, but once you begin working on the lab, you'll be able to visualize and interact with the components in your application here.
+image::explore-add-application.png[Add New Applications]
 
-image::explore-topology-view.png[Topology View]
+Right now, there are no applications or components to view, but once you begin working on the lab, you'll be able to visualize and interact with the components in your application in the *Topology* view.
 
 You can also create and manage project from the CLI as well. Let's use our newly created project %PROJECT% as our default one:
 

site.yml

@@ -10,7 +10,7 @@ content:
   sources:
     - url: [email protected]:redhat-scholars/openshift-starter-guides.git
       tags: []
-      branches: [ocp-4.6, ocp-4.7]
+      branches: [ocp-4.6, ocp-4.7, ocp-4.8]
       start_path: documentation
 
 asciidoc:
@@ -19,8 +19,8 @@ asciidoc:
     experimental: true
     parksmap-version: latest
     parksmap-image: quay.io/openshiftroadshow/parksmap
-    openshift-docs-url: https://docs.openshift.com/container-platform/4.7
-    openshift-version: 4.7
+    openshift-docs-url: https://docs.openshift.com/container-platform/4.8
+    openshift-version: 4.8
     project-namespace: workshop
     release-version: roks
     roks-login-url: https://cloud.ibm.com/authorize/devcluster