Finish initial cut of appsets module

Author: gnunn1

content/modules/ROOT/assets/images/coolstore-tiles.png

@@ -20,6 +20,11 @@
 ** xref:03-configuration.adoc#config-conclusion[Conclusion]
 
 * xref:04-applicationsets.adoc[4. ApplicatonSets]
+** xref:04-applicationsets.adoc#app-of-apps[App-of-Apps]
+** xref:04-applicationsets.adoc#appsets[ApplicationSets]
+*** xref:04-applicationsets.adoc#appsets-static[Static Generation]
+*** xref:04-applicationsets.adoc#appsets-dynamic[Dynamic Generation]
+** xref:04-applicationsets.adoc#appsets-conclusion[Conclusion]
 
 * xref:05-conclusion.adoc[5. Conclusion]
 ** xref:05-conclusion.adoc#Resources[Resources]

content/modules/ROOT/assets/images/coolstore-topology.png

@@ -4,7 +4,7 @@ include::_attributes.adoc[]
 In this module you will learn how to deploy multiple applications from a single Application using the App-of-Apps pattern
 and the newer ApplicationSets in Argo CD.
 
-[#apps-of-apps]
+[#app-of-apps]
 == App-of-Apps
 
 Before we delve into ApplicatioSets, let's dive into the useful link:https://argo-cd.readthedocs.io/en/latest/operator-manual/cluster-bootstrapping/#app-of-apps-pattern[App-of-Apps, window="_blank"] 
@@ -112,6 +112,7 @@ oc delete app coolstore -n {user}-argocd
 
 Wait for all of the Applications to be removed from the Argo CD UI.
 
+[#appsets]
 == ApplicationSets
 
 As we saw previously, there are often situations where you want to deploy or generate multiple versions of the same Application with variations. These variations can be static,
@@ -130,7 +131,8 @@ Some common examples of these link:https://argo-cd.readthedocs.io/en/stable/oper
 * Using the link:https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Generators-Matrix[Matrix,window="_blank"]
 and link:https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Generators-Merge[Merge,window="_blank"] to combine the results from multiple generators.
 
-== Static Generation with List Generator
+[#appsets-static]
+=== Static Generation with List Generator
 
 Let's look at a simple example of an Application that uses a List generator to create Applications for different environments
 for the `coolstore` Application. This will be a similar use case to what we saw with App-of-Apps but done
@@ -226,7 +228,8 @@ oc get app coolstore-dev -o=jsonpath='{.metadata.ownerReferences}' -n {user}-arg
 As we can see ApplicationSets provide an easy way to generate Application objects statically but now let's have a look
 where they really shine, dynamic generation based on external sources.
 
-== Dynamic Generation with git Generator
+[#appsets-dynamic]
+=== Dynamic Generation with git Generator
 
 A common pattern when deploying an application with kustomize with multiple environments is to have a repository that contains the following structure:
 
@@ -386,32 +389,30 @@ oc get apps -n {user}-argocd
 [.console-output]
 [source,yaml,subs="attributes+,+macros"]
 ----
-app-dev              Synced        Healthy
-app-prod             Synced        Progressing
-coolstore-app-dev    Synced        Healthy
-coolstore-app-prod   Synced        Healthy
-dev-tools            Synced        Healthy
-pipeline-helm        Synced        Healthy
+NAME              SYNC STATUS   HEALTH STATUS
+coolstore-dev     Synced        Healthy
+coolstore-prod    Synced        Healthy
+coolstore-stage   Synced        Healthy
+web-dev           Synced        Healthy
+web-prod          Synced        Healthy
+web-stage         Synced        Healthy
 ----
 
-[NOTE]
-The `app-prod` application may be `Progressing` for awhile or show as `Degraded`, this is because we have not yet deployed the updated
-image generated by the Pipeline in production. We will perform this step in the next section.
-
-We can verify that the applications have been created in the Shared OpenShift GitOps by checking the Application tiles.
-
-* Go to OpenShift GitOps and select the "app-dev" application in the main page to access the details.
+We can also verify that the applications have been created and are healthy in Argo CD by checking the Application tiles.
 
-* On the top-left side, click on *"App details"* to access the information about the application, such as the git repository, the branch where the files are located, the target cluster and namespace where the application is deployed, etc.
+image::coolstore-tiles.png[]
 
-If we pay closer attention, there are 3 items worth mentioning to understand the multi-environment management:
+Also in OpenShift check the Topology for `{user}-dev` and click on the Route to view the running Application:
 
-* *REPO_URL:* the git repository where our the resources we want to deploy are defined
+image::coolstore-topology.png[]
 
-* *TARGET REVISION:* the branch to use
+The application should appear as follows:
 
-* *PATH:* the folder that contains the specific values for that environment. Here for example, for the "DEV" environment, we use the file located in "globex/overlays/dev".
+image::coolstore-web.png[]
 
-You can see more details by opening the "gitops" repository in gitea, and navigating to "globex" folder.
+[#appsets-conclusion]
+== Conclusion
 
-== Combining Generators
+In this module we learned how to deploy multiple Applications quickly and easily using the App-of-Apps pattern
+and ApplicationSets. We saw how ApplicationSets can be used to generate Applications dynamically based
+on external input.