Antora requires in the examples directory

OpenShiftDemos · Oct 16, 2023 · 812bdc9 · 812bdc9
1 parent 5b631c6
commit 812bdc9
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 7 deletions.
diff --git a/code/bluegreen/base/kustomization.yaml → ...xamples/bluegreen/base/kustomization.yaml b/code/bluegreen/base/kustomization.yaml → ...xamples/bluegreen/base/kustomization.yaml
diff --git a/code/bluegreen/base/rollout.yaml → ...ROOT/examples/bluegreen/base/rollout.yaml b/code/bluegreen/base/rollout.yaml → ...ROOT/examples/bluegreen/base/rollout.yaml
diff --git a/code/bluegreen/base/route-active.yaml → ...examples/bluegreen/base/route-active.yaml b/code/bluegreen/base/route-active.yaml → ...examples/bluegreen/base/route-active.yaml
diff --git a/code/bluegreen/base/route-preview.yaml → ...xamples/bluegreen/base/route-preview.yaml b/code/bluegreen/base/route-preview.yaml → ...xamples/bluegreen/base/route-preview.yaml
diff --git a/code/bluegreen/base/services.yaml → ...OOT/examples/bluegreen/base/services.yaml b/code/bluegreen/base/services.yaml → ...OOT/examples/bluegreen/base/services.yaml
diff --git a/...ys/analysistemplate/analysistemplate.yaml → ...ys/analysistemplate/analysistemplate.yaml b/...ys/analysistemplate/analysistemplate.yaml → ...ys/analysistemplate/analysistemplate.yaml
diff --git a/...rlays/analysistemplate/kustomization.yaml → ...rlays/analysistemplate/kustomization.yaml b/...rlays/analysistemplate/kustomization.yaml → ...rlays/analysistemplate/kustomization.yaml
diff --git a/code/deploy/base/deploy.yaml → ...les/ROOT/examples/deploy/base/deploy.yaml b/code/deploy/base/deploy.yaml → ...les/ROOT/examples/deploy/base/deploy.yaml
diff --git a/code/deploy/base/kustomization.yaml → ...T/examples/deploy/base/kustomization.yaml b/code/deploy/base/kustomization.yaml → ...T/examples/deploy/base/kustomization.yaml
diff --git a/code/deploy/base/route.yaml → ...ules/ROOT/examples/deploy/base/route.yaml b/code/deploy/base/route.yaml → ...ules/ROOT/examples/deploy/base/route.yaml
diff --git a/code/deploy/base/service.yaml → ...es/ROOT/examples/deploy/base/service.yaml b/code/deploy/base/service.yaml → ...es/ROOT/examples/deploy/base/service.yaml
diff --git a/documentation/modules/ROOT/pages/02-workshop-overview.adoc b/documentation/modules/ROOT/pages/02-workshop-overview.adoc
@@ -84,14 +84,14 @@ git clone https://github.com/OpenShiftDemos/argo-rollouts-workshop ~/argo-rollou
 
 All of the code used in this workshop will be located in:
 
-`~/argo-rollouts-workshop/code`
+`~/argo-rollouts-workshop/docmentation/modules/ROOT/examples`
 
-Once you have cloned the repo, enter the `argo-rollouts-workshop` directory:
+Once you have cloned the repo, enter this directory in the terminal:
 
 [.console-input]
 [source,bash,subs="attributes+,+macros"]
 ----
-cd argo-rollouts-workshop
+cd argo-rollouts-workshop/docmentation/modules/ROOT/examples
 ----
 
 [IMPORTANT]
@@ -115,7 +115,7 @@ To view the code that we will be using, examine the code in `code/deploy/base`:
 [.console-input]
 [source,bash,subs="attributes+,+macros"]
 ----
-ls code/deploy/base
+ls ./deploy/base
 ----
 
 You should see that there are four files in this directory. The `deploy.yaml`, `service.yaml`
@@ -124,19 +124,19 @@ and `route.yaml` represent the Deployment, Service and OpenShift route for the a
 .link:https://github.com/OpenShiftDemos/argo-rollouts-workshop/blob/main/code/deploy/base/deploy.yaml,window='_blank']
 [source,yaml,subs="+macros,attributes+"]
 ----
-include::ROOT/../../code/deploy/base/deploy.yaml[]
+include::ROOT:example$deploy/base/deploy.yaml[]
 ----
 
 .link:https://github.com/OpenShiftDemos/argo-rollouts-workshop/blob/main/code/deploy/base/service.yaml,window='_blank']
 [source,yaml,subs="+macros,attributes+"]
 ----
-include::ROOT/../../code/deploy/base/service.yaml[]
+include::ROOT:example$deploy/base/service.yaml[]
 ----
 
 .link:https://github.com/OpenShiftDemos/argo-rollouts-workshop/blob/main/code/deploy/base/route.yaml,window='_blank']
 [source,yaml,subs="+macros,attributes+"]
 ----
-include::ROOT/../../code/deploy/base/route.yaml[]
+include::ROOT:example$deploy/base/route.yaml[]
 ----
 
 [NOTE]
@@ -148,6 +148,12 @@ There is a fourth file called `kustomization.yaml`, this file is used by the htt
 the management of Kubernetes manifests. Kustomize and Helm are the two most popular yaml management tools
 in GitOps and we use kustomize here to simplify our deployments.
 
+.link:https://github.com/OpenShiftDemos/argo-rollouts-workshop/blob/main/code/deploy/base/kustomization.yaml,window='_blank']
+[source,yaml,subs="+macros,attributes+"]
+----
+include::ROOT:example$deploy/base/kustomization.yaml[]
+----
+
 To deploy the application in Development, run the following command in the terminal:
 
 [.console-input]