Update some language and do some minor corrections

OpenShiftDemos · Nov 3, 2023 · e0088ad · e0088ad
1 parent b82b186
commit e0088ad
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/documentation/modules/ROOT/pages/04-analysis.adoc b/documentation/modules/ROOT/pages/04-analysis.adoc
@@ -262,7 +262,7 @@ oc get route -n user%USERNUM%-prod preview -o jsonpath='{"https://"}{.spec.host}
 ----
 
 Slide the error bar as shown below all the way to the right. Notice how all of the flashing
-squares have red boxes around them indicating they are returning error messages.
+squares have red outlines around them indicating they are returning error messages.
 
 image::rollouts-demo-errors.png[]
 

diff --git a/documentation/modules/ROOT/pages/05-canary-rollout.adoc b/documentation/modules/ROOT/pages/05-canary-rollout.adoc
@@ -203,7 +203,7 @@ Go ahead and start the pipeline selecting the green image and wait for the pipel
 
 image::console-promote-params.png[]
 
-Once the promotion is complete, run this command to see state of the rollout:
+Once the pipeline is complete, run this command to see state of the rollout:
 
 [.console-input]
 [source,bash,subs="attributes+,+macros"]
@@ -304,7 +304,8 @@ oc argo rollouts promote rollouts-demo -n user%USERNUM%-prod
 ----
 
 Observe the dashboard once it has been promoted, the dashboard will show the progression
-of the steps by highlighting each step as it is being executed.
+of the steps by highlighting each step as it is being executed. Also note how pods are
+being drained from one service to the other as traffic weighting changes.
 
 Prior to moving on to the next section, perform a cleanup to remove the current rollout
 and reset the Deployment in the dev environment back to blue.
@@ -329,8 +330,8 @@ oc delete -k ./canary/base -n user%USERNUM%-prod
 == Inline Analysis
 
 In the last section there was a pause step that provided an opportunity to manually test the canary
-before progressing further. However we can accomplish the same goal my using an analysis. With
-respect the canary strategy, an analysis can be performed in the link:https://argo-rollouts.readthedocs.io/en/stable/features/analysis/#background-analysis[background,window='_blank']
+before progressing further. However we can accomplish the same goal by using an analysis. With
+respect to the canary strategy, an analysis can be performed in the link:https://argo-rollouts.readthedocs.io/en/stable/features/analysis/#background-analysis[background,window='_blank']
 or as an link:https://argo-rollouts.readthedocs.io/en/stable/features/analysis/#inline-analysis[inline] analysis.
 
 A background analysis happens asynchronously and does not block the progression of steps, however
@@ -458,26 +459,30 @@ Strategy:        Canary
   Step:          7/7
   SetWeight:     100
   ActualWeight:  100
-Images:          quay.io/openshiftdemos/rollouts-demo:blue (stable)
+Images:          quay.io/openshiftdemos/rollouts-demo:green (stable)
 Replicas:
   Desired:       8
   Current:       8
   Updated:       8
   Ready:         8
   Available:     8
 
-NAME                                       KIND        STATUS     AGE    INFO
-⟳ rollouts-demo                            Rollout     ✔ Healthy  4m56s
+NAME                                                        KIND         STATUS        AGE    INFO
+⟳ rollouts-demo                                             Rollout      ✔ Healthy     4m19s
+├──# revision:2
+│  ├──⧉ rollouts-demo-5999df6cf9                            ReplicaSet   ✔ Healthy     3m13s  stable
+│  │  ├──□ rollouts-demo-5999df6cf9-g7l75                   Pod          ✔ Running     3m13s  ready:1/1
+│  │  ├──□ rollouts-demo-5999df6cf9-zxkss                   Pod          ✔ Running     3m13s  ready:1/1
+│  │  ├──□ rollouts-demo-5999df6cf9-mj9m8                   Pod          ✔ Running     80s    ready:1/1
+│  │  ├──□ rollouts-demo-5999df6cf9-ph9jk                   Pod          ✔ Running     80s    ready:1/1
+│  │  ├──□ rollouts-demo-5999df6cf9-rnvgm                   Pod          ✔ Running     80s    ready:1/1
+│  │  ├──□ rollouts-demo-5999df6cf9-btzlf                   Pod          ✔ Running     67s    ready:1/1
+│  │  ├──□ rollouts-demo-5999df6cf9-gl8k4                   Pod          ✔ Running     67s    ready:1/1
+│  │  └──□ rollouts-demo-5999df6cf9-dlchv                   Pod          ✔ Running     54s    ready:1/1
+│  └──α rollouts-demo-5999df6cf9-2-1                        AnalysisRun  ✔ Successful  3m10s  ✔ 5
+│     └──⊞ fd0f7c64-c6e4-4447-bbef-5d2f4f62563b.run-load.1  Job          ✔ Successful  3m10s
 └──# revision:1
-   └──⧉ rollouts-demo-66d84bcd76           ReplicaSet  ✔ Healthy  5s     stable
-      ├──□ rollouts-demo-66d84bcd76-c4d6j  Pod         ✔ Running  5s     ready:1/1
-      ├──□ rollouts-demo-66d84bcd76-f9qvw  Pod         ✔ Running  5s     ready:1/1
-      ├──□ rollouts-demo-66d84bcd76-gp9xp  Pod         ✔ Running  5s     ready:1/1
-      ├──□ rollouts-demo-66d84bcd76-gpqwj  Pod         ✔ Running  5s     ready:1/1
-      ├──□ rollouts-demo-66d84bcd76-k6dwl  Pod         ✔ Running  5s     ready:1/1
-      ├──□ rollouts-demo-66d84bcd76-mlj5q  Pod         ✔ Running  5s     ready:1/1
-      ├──□ rollouts-demo-66d84bcd76-wp4tj  Pod         ✔ Running  5s     ready:1/1
-      └──□ rollouts-demo-66d84bcd76-z8kr2  Pod         ✔ Running  5s     ready:1/1
+   └──⧉ rollouts-demo-66d84bcd76                            ReplicaSet   • ScaledDown  4m19s
 ----
 
 In this module the canary strategy for Argo Rollouts has been reviewed along