Add git generation

Author: gnunn1

content/modules/ROOT/examples/applicationsets/coolstore-git-appset.yaml

@@ -1,10 +1,8 @@
 apiVersion: argoproj.io/v1alpha1
 kind: ApplicationSet
 metadata:
-  name: web-nodejs
+  name: web
   namespace: $USER-argocd
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io/background
 spec:
   goTemplate: true
   goTemplateOptions: ["missingkey=error"]
@@ -13,12 +11,12 @@ spec:
       repoURL: https://github.com/OpenShiftDemos/advanced-gitops-workshop
       revision: HEAD
       directories:
-      - path: content/modules/ROOT/examples/coolstore/overlays/*
+      - path: content/modules/ROOT/examples/coolstore-web/overlays/*
       values:
         user: $USER
   template:
     metadata:
-      name: coolstore-{{.path.basename}}
+      name: app-{{.path.basename}}
       namespace: '{{ .values.user }}-argocd'
     spec:
       destination:
@@ -29,5 +27,15 @@ spec:
         path: '{{.path.path}}'
         repoURL: https://github.com/OpenShiftDemos/advanced-gitops-workshop
         targetRevision: main
+        kustomize:
+          patches:
+            - target:
+                kind: Deployment
+                name: web
+              patch: |-
+                - op: replace
+                  path: /spec/template/spec/containers/0/env/0/value
+                  value: 'gateway-vertx-{{ .values.user }}-{{.path.basename}}'
       syncPolicy:
-        automated:
+        automated:
+          prune: true

content/modules/ROOT/examples/coolstore-web/base/kustomization.yaml

@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- dep-coolstore.yaml
+- web-nodejs-route.yaml
+- web-nodejs-svc.yaml

content/modules/ROOT/examples/coolstore-web/base/web-deploy.yaml

@@ -0,0 +1,46 @@
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  name: web
+  labels:
+    app: web
+    app.kubernetes.io/component: web
+    app.kubernetes.io/instance: web
+    app.kubernetes.io/name: web
+    app.kubernetes.io/part-of: coolstore
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: web
+  template:
+    metadata:
+      labels:
+        app: web
+        deployment: web
+    spec:
+      containers:
+        - name: web
+          image: quay.io/coolstore-demo/web-nodejs:latest
+          ports:
+            - containerPort: 8080
+              protocol: TCP
+          env:
+            - name: SECURE_COOLSTORE_GW_ENDPOINT
+              value: 'https://gateway-vertx-coolstore-dev-user1.apps.cluster-424xp.424xp.sandbox1774.opentlc.com'
+          resources: {}
+          terminationMessagePath: /dev/termination-log
+          terminationMessagePolicy: File
+          imagePullPolicy: Always
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 30
+      dnsPolicy: ClusterFirst
+      securityContext: {}
+      schedulerName: default-scheduler
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 25%
+      maxSurge: 25%
+  revisionHistoryLimit: 10
+  progressDeadlineSeconds: 600

content/modules/ROOT/examples/coolstore-web/base/web-route.yaml

@@ -0,0 +1,23 @@
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  annotations:
+    openshift.io/host.generated: "true"
+  labels:
+    app: web
+    app.kubernetes.io/component: web
+    app.kubernetes.io/instance: web
+    app.kubernetes.io/name: web
+    app.kubernetes.io/part-of: coolstore
+  name: web
+spec:
+  port:
+    targetPort: 8080
+  to:
+    kind: Service
+    name: web
+    weight: 100
+  tls:
+    termination: edge
+    insecureEdgeTerminationPolicy: Redirect
+  wildcardPolicy: None

content/modules/ROOT/examples/coolstore-web/base/web-svc.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: web
+    app.kubernetes.io/component: web
+    app.kubernetes.io/instance: web
+    app.kubernetes.io/name: web
+    app.kubernetes.io/part-of: coolstore
+  name: web
+spec:
+  ports:
+  - port: 8080
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    app: web
+  sessionAffinity: None
+  type: ClusterIP

content/modules/ROOT/examples/coolstore-web/overlays/dev/kustomization.yaml

@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../base

content/modules/ROOT/examples/coolstore-web/overlays/prod/kustomization.yaml

@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../base

content/modules/ROOT/examples/coolstore-web/overlays/stage/kustomization.yaml

@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../base

content/modules/ROOT/pages/04-applicationsets.adoc

@@ -226,17 +226,6 @@ 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.
 
-Delete the ApplicationSet before continuting to the next section:
-
-[.console-input]
-[source,sh,subs="attributes",role=execute]
-----
-oc delete appset coolstore -n {user}-argocd
-----
-
-[NOTE]
-It may take a minute or two for it to delete as it deletes the entire chain of applications and resources, be patient.
-
 == 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:
@@ -252,7 +241,7 @@ You can view this structure in your cloned repository:
 [.console-input]
 [source,sh,subs="attributes",role=execute]
 ----
-find ~/workshop/content/modules/ROOT/examples/coolstore -print | sort|sed -e 's;[^/]*/;|--;g;s;--|; |;g'
+find ~/workshop/content/modules/ROOT/examples/coolstore-web -print | sort|sed -e 's;[^/]*/;|--;g;s;--|; |;g'
 ----
 
 [.console-output]
@@ -293,34 +282,41 @@ oc get appset web-nodejs -o yaml -n {user}-argocd | oc neat
 apiVersion: argoproj.io/v1alpha1
 kind: ApplicationSet
 metadata:
-  name: coolstore
-  namespace: {user}-argocd
+  name: coolstore-web
+  namespace: $USER-argocd
 spec:
+  goTemplate: true
+  goTemplateOptions: ["missingkey=error"]
   generators:
   - git: <1>
       directories:
       - path: content/modules/ROOT/examples/coolstore/overlays/* <2>
       repoURL: https://github.com/OpenShiftDemos/advanced-gitops-workshop <3>
       revision: HEAD
       values:
-        user: {user} <4>
-  goTemplate: true
-  goTemplateOptions:
-  - missingkey=error
+        user: $USER <4>
   template:
     metadata:
-      name: app-{{.path.basename}} <5>
+      name: coolstore-web-{{.path.basename}} <5>
       namespace: '{{ .values.user }}-argocd'
     spec:
       destination:
         name: in-cluster
         namespace: '{{ .values.user }}-{{.path.basename}}'
       project: '{{ .values.user }}'
       source:
-        kustomize:
         path: '{{.path.path}}' <6>
-        repoURL: https://gitea-gitea.{subdomain}/{user}/gitops.git
+        repoURL: https://github.com/OpenShiftDemos/advanced-gitops-workshop
         targetRevision: main
+        kustomize:
+          patches:
+            - target:
+                kind: Deployment
+                name: web
+              patch: |-
+                - op: replace
+                  path: /spec/template/spec/containers/0/env/0/value
+                  value: 'gateway-vertx-{{ .values.user }}-{{.path.basename}}' <7>
       syncPolicy:
         automated:
           prune: true
@@ -330,7 +326,8 @@ spec:
 <3> The target repository
 <4> Additional values to pass to the template
 <5> The basename of the path for which the Application is being generated, either `dev` or `prod` in this case
-<6> the full path in the repo for the current directory
+<6> The full path in the repo for the current directory
+<7> Example of using the passed in value for `{user}`
 
 Check that the Applications have been created: