Skip to content

Commit

Permalink
More content and typo fix
Browse files Browse the repository at this point in the history
  • Loading branch information
gnunn1 committed Oct 16, 2023
1 parent 777a845 commit 19d4706
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 3 deletions.
6 changes: 3 additions & 3 deletions documentation/modules/ROOT/pages/02-workshop-overview.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Once you have cloned the repo, enter this directory in the terminal:
[.console-input]
[source,bash,subs="attributes+,+macros"]
----
cd argo-rollouts-workshop/documentation/modules/ROOT/examples/
cd ~/argo-rollouts-workshop/documentation/modules/ROOT/examples/
----

[IMPORTANT]
Expand All @@ -109,7 +109,7 @@ DevSpaces] is a better choice.
In the development environment we will be deploying the application as a basic
Kubernetes Deployment so that we can compare and contrast the behavior with Argo Rollouts.

To view the code that we will be using, examine the code in `code/deploy/base`:
To view the code that we will be using, examine the code in `./deploy/base`:

[.console-input]
[source,bash,subs="attributes+,+macros"]
Expand Down Expand Up @@ -163,7 +163,7 @@ oc apply -k ./deploy/base -n user%USERNUM%-dev
----

Once you have run the command we can confirm that the deployment has run successfully. Use the following command to ensure
that the pod is up and running:
that the pods are up and running:

[.console-input]
[source,bash,subs="attributes+,+macros"]
Expand Down
37 changes: 37 additions & 0 deletions documentation/modules/ROOT/pages/03-bluegreen-rollout.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,40 @@ include::ROOT:example$bluegreen/base/routes.yaml[]
----

Finally we have two Route objects for active and preview with each tied to their respective service.

To deploy the blue-green rollout, use the following command to process the kustomization:

[.console-input]
[source,bash,subs="attributes+,+macros"]
----
oc apply -k ./bluegreen/base -n user%USERNUM%-prod
----

Once you have run the command we can confirm that the rollout has deployed successfully. Use the following command to ensure
that the pods are up and running:

[.console-input]
[source,bash,subs="attributes+,+macros"]
----
oc get pods -n user%USERNUM%-prod
----

The console should return something along the lines of

[.console-output]
[source,bash,subs="attributes+,+macros"]
----
NAME READY STATUS RESTARTS AGE
rollouts-demo-785c8b55cb-m5mzg 1/1 Running 0 6m51s
rollouts-demo-785c8b55cb-trvsd 1/1 Running 0 6m51s
----

There are two pods since the Rollout specified two replicas.

Next Open the Route for this application. It's in the `user%USERNUM%-dev1` Project.

[.console-input]
[source,bash,subs="attributes+,+macros"]
----
oc get route -n user%USERNUM%-dev rollouts-demo -o jsonpath='{"http://"}{.spec.host}{"\n"}'
----

0 comments on commit 19d4706

Please sign in to comment.