From a9403222b23cc5358bfe7f1ebc07c03f08bcf2c4 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Mon, 1 Mar 2021 22:55:41 +0530
Subject: [PATCH 01/78] add ingress

---
 guestbook/ingress.yaml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 guestbook/ingress.yaml

diff --git a/guestbook/ingress.yaml b/guestbook/ingress.yaml
new file mode 100644
index 0000000..e593aab
--- /dev/null
+++ b/guestbook/ingress.yaml
@@ -0,0 +1,20 @@
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: guestbook-ingress
+  namespace: guestbook
+  labels:
+    app.kubernetes.io/component: server
+    app.kubernetes.io/name: guestbook-server
+    app.kubernetes.io/part-of: guestbook 
+  annotations:
+    kubernetes.io/ingress.class: traefik
+spec:
+  rules:
+  - host: guestbook-argocd.natwest-labs.com
+    http:
+      paths:
+      - backend:
+          serviceName: guestbook-ui
+          servicePort: http
+        path: /
\ No newline at end of file

From f282122b911c457609bd7e7da677315cd6e91d04 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Mon, 1 Mar 2021 22:59:48 +0530
Subject: [PATCH 02/78] update port

---
 guestbook/ingress.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guestbook/ingress.yaml b/guestbook/ingress.yaml
index e593aab..fa1a453 100644
--- a/guestbook/ingress.yaml
+++ b/guestbook/ingress.yaml
@@ -16,5 +16,5 @@ spec:
       paths:
       - backend:
           serviceName: guestbook-ui
-          servicePort: http
+          servicePort: 80
         path: /
\ No newline at end of file

From b9d9096dd086d272fb5977e37d8ea90c9f4c75f1 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Mon, 1 Mar 2021 23:06:56 +0530
Subject: [PATCH 03/78] change hostname

---
 guestbook/ingress.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guestbook/ingress.yaml b/guestbook/ingress.yaml
index fa1a453..4eb259d 100644
--- a/guestbook/ingress.yaml
+++ b/guestbook/ingress.yaml
@@ -11,7 +11,7 @@ metadata:
     kubernetes.io/ingress.class: traefik
 spec:
   rules:
-  - host: guestbook-argocd.natwest-labs.com
+  - host: guestbook2-argocd.natwest-labs.com
     http:
       paths:
       - backend:

From a64ff68d40586718d005bbe9ad3ffe63a4c5ba9d Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Mon, 1 Mar 2021 23:12:02 +0530
Subject: [PATCH 04/78] update port

---
 guestbook/ingress.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guestbook/ingress.yaml b/guestbook/ingress.yaml
index 4eb259d..fa1a453 100644
--- a/guestbook/ingress.yaml
+++ b/guestbook/ingress.yaml
@@ -11,7 +11,7 @@ metadata:
     kubernetes.io/ingress.class: traefik
 spec:
   rules:
-  - host: guestbook2-argocd.natwest-labs.com
+  - host: guestbook-argocd.natwest-labs.com
     http:
       paths:
       - backend:

From dc0cc27c371c81d6f28e5b87c2823a505c9e440d Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Tue, 2 Mar 2021 16:00:59 +0530
Subject: [PATCH 05/78] add kustomize

---
 kustomize-guestbook/ingress.yaml              | 20 +++++++++++++++++++
 kustomize-guestbook/kustomization.yaml        |  1 +
 .../overlays/dev/kustomization.yaml           |  3 +++
 .../overlays/prod/kustomization.yaml          |  3 +++
 4 files changed, 27 insertions(+)
 create mode 100644 kustomize-guestbook/ingress.yaml
 create mode 100644 kustomize-guestbook/overlays/dev/kustomization.yaml
 create mode 100644 kustomize-guestbook/overlays/prod/kustomization.yaml

diff --git a/kustomize-guestbook/ingress.yaml b/kustomize-guestbook/ingress.yaml
new file mode 100644
index 0000000..7a96bbf
--- /dev/null
+++ b/kustomize-guestbook/ingress.yaml
@@ -0,0 +1,20 @@
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: kustomize-guestbook-ingress
+  namespace: guestbook
+  labels:
+    app.kubernetes.io/component: server
+    app.kubernetes.io/name: guestbook-server
+    app.kubernetes.io/part-of: guestbook 
+  annotations:
+    kubernetes.io/ingress.class: traefik
+spec:
+  rules:
+  - host: kustomize-guestbook-argocd.natwest-labs.com
+    http:
+      paths:
+      - backend:
+          serviceName: guestbook-ui
+          servicePort: 80
+        path: /
\ No newline at end of file
diff --git a/kustomize-guestbook/kustomization.yaml b/kustomize-guestbook/kustomization.yaml
index cbaba90..d22b5c8 100644
--- a/kustomize-guestbook/kustomization.yaml
+++ b/kustomize-guestbook/kustomization.yaml
@@ -3,5 +3,6 @@ namePrefix: kustomize-
 resources:
 - guestbook-ui-deployment.yaml
 - guestbook-ui-svc.yaml
+- ingress.yaml
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
diff --git a/kustomize-guestbook/overlays/dev/kustomization.yaml b/kustomize-guestbook/overlays/dev/kustomization.yaml
new file mode 100644
index 0000000..6517d4b
--- /dev/null
+++ b/kustomize-guestbook/overlays/dev/kustomization.yaml
@@ -0,0 +1,3 @@
+bases:
+- ../../
+namePrefix: dev-
diff --git a/kustomize-guestbook/overlays/prod/kustomization.yaml b/kustomize-guestbook/overlays/prod/kustomization.yaml
new file mode 100644
index 0000000..2310c0d
--- /dev/null
+++ b/kustomize-guestbook/overlays/prod/kustomization.yaml
@@ -0,0 +1,3 @@
+bases:
+- ../../
+namePrefix: prod-

From 5ed2c61dcc7aa66baaaf352bef6337bb4d0e5b66 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Tue, 2 Mar 2021 16:19:04 +0530
Subject: [PATCH 06/78] test changes for overlay

---
 .../base/guestbook-ui-deployment.yaml         | 20 +++++++++++++++++++
 .../base/guestbook-ui-svc.yaml                | 10 ++++++++++
 kustomize-guestbook/base/ingress.yaml         | 20 +++++++++++++++++++
 kustomize-guestbook/base/kustomization.yaml   |  8 ++++++++
 .../overlays/prod/kustomization.yaml          |  2 +-
 5 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 kustomize-guestbook/base/guestbook-ui-deployment.yaml
 create mode 100644 kustomize-guestbook/base/guestbook-ui-svc.yaml
 create mode 100644 kustomize-guestbook/base/ingress.yaml
 create mode 100644 kustomize-guestbook/base/kustomization.yaml

diff --git a/kustomize-guestbook/base/guestbook-ui-deployment.yaml b/kustomize-guestbook/base/guestbook-ui-deployment.yaml
new file mode 100644
index 0000000..5688dcf
--- /dev/null
+++ b/kustomize-guestbook/base/guestbook-ui-deployment.yaml
@@ -0,0 +1,20 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: guestbook-ui
+spec:
+  replicas: 1
+  revisionHistoryLimit: 3
+  selector:
+    matchLabels:
+      app: guestbook-ui
+  template:
+    metadata:
+      labels:
+        app: guestbook-ui
+    spec:
+      containers:
+      - image: gcr.io/heptio-images/ks-guestbook-demo:0.1
+        name: guestbook-ui
+        ports:
+        - containerPort: 80
diff --git a/kustomize-guestbook/base/guestbook-ui-svc.yaml b/kustomize-guestbook/base/guestbook-ui-svc.yaml
new file mode 100644
index 0000000..e619b5c
--- /dev/null
+++ b/kustomize-guestbook/base/guestbook-ui-svc.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1	
+kind: Service	
+metadata:	
+  name: guestbook-ui	
+spec:	
+  ports:	
+  - port: 80	
+    targetPort: 80	
+  selector:	
+    app: guestbook-ui
diff --git a/kustomize-guestbook/base/ingress.yaml b/kustomize-guestbook/base/ingress.yaml
new file mode 100644
index 0000000..7a96bbf
--- /dev/null
+++ b/kustomize-guestbook/base/ingress.yaml
@@ -0,0 +1,20 @@
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: kustomize-guestbook-ingress
+  namespace: guestbook
+  labels:
+    app.kubernetes.io/component: server
+    app.kubernetes.io/name: guestbook-server
+    app.kubernetes.io/part-of: guestbook 
+  annotations:
+    kubernetes.io/ingress.class: traefik
+spec:
+  rules:
+  - host: kustomize-guestbook-argocd.natwest-labs.com
+    http:
+      paths:
+      - backend:
+          serviceName: guestbook-ui
+          servicePort: 80
+        path: /
\ No newline at end of file
diff --git a/kustomize-guestbook/base/kustomization.yaml b/kustomize-guestbook/base/kustomization.yaml
new file mode 100644
index 0000000..d22b5c8
--- /dev/null
+++ b/kustomize-guestbook/base/kustomization.yaml
@@ -0,0 +1,8 @@
+namePrefix: kustomize-
+
+resources:
+- guestbook-ui-deployment.yaml
+- guestbook-ui-svc.yaml
+- ingress.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
diff --git a/kustomize-guestbook/overlays/prod/kustomization.yaml b/kustomize-guestbook/overlays/prod/kustomization.yaml
index 2310c0d..f511d3f 100644
--- a/kustomize-guestbook/overlays/prod/kustomization.yaml
+++ b/kustomize-guestbook/overlays/prod/kustomization.yaml
@@ -1,3 +1,3 @@
 bases:
-- ../../
+- ../../base
 namePrefix: prod-

From 8acb4d0f32e6258aae5c195006c5ae2503d87d16 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Tue, 2 Mar 2021 16:20:53 +0530
Subject: [PATCH 07/78] add overlay for dev

---
 kustomize-guestbook/overlays/dev/kustomization.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kustomize-guestbook/overlays/dev/kustomization.yaml b/kustomize-guestbook/overlays/dev/kustomization.yaml
index 6517d4b..226e8d6 100644
--- a/kustomize-guestbook/overlays/dev/kustomization.yaml
+++ b/kustomize-guestbook/overlays/dev/kustomization.yaml
@@ -1,3 +1,3 @@
 bases:
-- ../../
+- ../../base
 namePrefix: dev-

From e5eb1359cd8a825e763e6c0decf5ad63de3486a9 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Tue, 2 Mar 2021 16:21:16 +0530
Subject: [PATCH 08/78] delete extra files

---
 .../guestbook-ui-deployment.yaml              | 20 -------------------
 kustomize-guestbook/guestbook-ui-svc.yaml     | 10 ----------
 kustomize-guestbook/ingress.yaml              | 20 -------------------
 kustomize-guestbook/kustomization.yaml        |  8 --------
 4 files changed, 58 deletions(-)
 delete mode 100644 kustomize-guestbook/guestbook-ui-deployment.yaml
 delete mode 100644 kustomize-guestbook/guestbook-ui-svc.yaml
 delete mode 100644 kustomize-guestbook/ingress.yaml
 delete mode 100644 kustomize-guestbook/kustomization.yaml

diff --git a/kustomize-guestbook/guestbook-ui-deployment.yaml b/kustomize-guestbook/guestbook-ui-deployment.yaml
deleted file mode 100644
index 5688dcf..0000000
--- a/kustomize-guestbook/guestbook-ui-deployment.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: guestbook-ui
-spec:
-  replicas: 1
-  revisionHistoryLimit: 3
-  selector:
-    matchLabels:
-      app: guestbook-ui
-  template:
-    metadata:
-      labels:
-        app: guestbook-ui
-    spec:
-      containers:
-      - image: gcr.io/heptio-images/ks-guestbook-demo:0.1
-        name: guestbook-ui
-        ports:
-        - containerPort: 80
diff --git a/kustomize-guestbook/guestbook-ui-svc.yaml b/kustomize-guestbook/guestbook-ui-svc.yaml
deleted file mode 100644
index e619b5c..0000000
--- a/kustomize-guestbook/guestbook-ui-svc.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: v1	
-kind: Service	
-metadata:	
-  name: guestbook-ui	
-spec:	
-  ports:	
-  - port: 80	
-    targetPort: 80	
-  selector:	
-    app: guestbook-ui
diff --git a/kustomize-guestbook/ingress.yaml b/kustomize-guestbook/ingress.yaml
deleted file mode 100644
index 7a96bbf..0000000
--- a/kustomize-guestbook/ingress.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: kustomize-guestbook-ingress
-  namespace: guestbook
-  labels:
-    app.kubernetes.io/component: server
-    app.kubernetes.io/name: guestbook-server
-    app.kubernetes.io/part-of: guestbook 
-  annotations:
-    kubernetes.io/ingress.class: traefik
-spec:
-  rules:
-  - host: kustomize-guestbook-argocd.natwest-labs.com
-    http:
-      paths:
-      - backend:
-          serviceName: guestbook-ui
-          servicePort: 80
-        path: /
\ No newline at end of file
diff --git a/kustomize-guestbook/kustomization.yaml b/kustomize-guestbook/kustomization.yaml
deleted file mode 100644
index d22b5c8..0000000
--- a/kustomize-guestbook/kustomization.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-namePrefix: kustomize-
-
-resources:
-- guestbook-ui-deployment.yaml
-- guestbook-ui-svc.yaml
-- ingress.yaml
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization

From e373efb27f65e93c8e0ff48702850aacb43dc5a6 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Tue, 2 Mar 2021 16:58:53 +0530
Subject: [PATCH 09/78] add overlay patch for ingress

---
 kustomize-guestbook/overlays/dev/ingress.yaml       | 7 +++++++
 kustomize-guestbook/overlays/dev/kustomization.yaml | 2 ++
 2 files changed, 9 insertions(+)
 create mode 100644 kustomize-guestbook/overlays/dev/ingress.yaml

diff --git a/kustomize-guestbook/overlays/dev/ingress.yaml b/kustomize-guestbook/overlays/dev/ingress.yaml
new file mode 100644
index 0000000..589780f
--- /dev/null
+++ b/kustomize-guestbook/overlays/dev/ingress.yaml
@@ -0,0 +1,7 @@
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: kustomize-guestbook-ingress
+spec:
+  rules:
+  - host: dev-kustomize-guestbook-argocd.natwest-labs.com
\ No newline at end of file
diff --git a/kustomize-guestbook/overlays/dev/kustomization.yaml b/kustomize-guestbook/overlays/dev/kustomization.yaml
index 226e8d6..6150327 100644
--- a/kustomize-guestbook/overlays/dev/kustomization.yaml
+++ b/kustomize-guestbook/overlays/dev/kustomization.yaml
@@ -1,3 +1,5 @@
 bases:
 - ../../base
 namePrefix: dev-
+patchesStrategicMerge:
+- ingress.yaml
\ No newline at end of file

From 396b3a5d20fa59c705736f5ea99137fd410e4664 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Tue, 2 Mar 2021 17:09:56 +0530
Subject: [PATCH 10/78] remove ns

---
 kustomize-guestbook/base/ingress.yaml         | 2 +-
 kustomize-guestbook/overlays/dev/ingress.yaml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/kustomize-guestbook/base/ingress.yaml b/kustomize-guestbook/base/ingress.yaml
index 7a96bbf..666c673 100644
--- a/kustomize-guestbook/base/ingress.yaml
+++ b/kustomize-guestbook/base/ingress.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: kustomize-guestbook-ingress
-  namespace: guestbook
+  # namespace: guestbook
   labels:
     app.kubernetes.io/component: server
     app.kubernetes.io/name: guestbook-server
diff --git a/kustomize-guestbook/overlays/dev/ingress.yaml b/kustomize-guestbook/overlays/dev/ingress.yaml
index 589780f..77123f8 100644
--- a/kustomize-guestbook/overlays/dev/ingress.yaml
+++ b/kustomize-guestbook/overlays/dev/ingress.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: kustomize-guestbook-ingress
+  namespace:
 spec:
   rules:
   - host: dev-kustomize-guestbook-argocd.natwest-labs.com
\ No newline at end of file

From db8c81493cbc518681e7e70ec144312fd37863be Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Tue, 2 Mar 2021 17:13:41 +0530
Subject: [PATCH 11/78] add missing parts to ingress

---
 kustomize-guestbook/overlays/dev/ingress.yaml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/kustomize-guestbook/overlays/dev/ingress.yaml b/kustomize-guestbook/overlays/dev/ingress.yaml
index 77123f8..eff4920 100644
--- a/kustomize-guestbook/overlays/dev/ingress.yaml
+++ b/kustomize-guestbook/overlays/dev/ingress.yaml
@@ -5,4 +5,10 @@ metadata:
   namespace:
 spec:
   rules:
-  - host: dev-kustomize-guestbook-argocd.natwest-labs.com
\ No newline at end of file
+  - host: dev-kustomize-guestbook-argocd.natwest-labs.com
+    http:
+      paths:
+      - backend:
+          serviceName: guestbook-ui
+          servicePort: 80
+        path: /
\ No newline at end of file

From bcb02be74d6b0594420a784532cd5ad268ba0424 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Tue, 2 Mar 2021 17:15:58 +0530
Subject: [PATCH 12/78] add patchesstrategicmerge for prod

---
 kustomize-guestbook/overlays/prod/ingress.yaml     | 14 ++++++++++++++
 .../overlays/prod/kustomization.yaml               |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 kustomize-guestbook/overlays/prod/ingress.yaml

diff --git a/kustomize-guestbook/overlays/prod/ingress.yaml b/kustomize-guestbook/overlays/prod/ingress.yaml
new file mode 100644
index 0000000..1acf8a5
--- /dev/null
+++ b/kustomize-guestbook/overlays/prod/ingress.yaml
@@ -0,0 +1,14 @@
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: kustomize-guestbook-ingress
+  namespace:
+spec:
+  rules:
+  - host: kustomize-guestbook-argocd.natwest-labs.com
+    http:
+      paths:
+      - backend:
+          serviceName: guestbook-ui
+          servicePort: 80
+        path: /
\ No newline at end of file
diff --git a/kustomize-guestbook/overlays/prod/kustomization.yaml b/kustomize-guestbook/overlays/prod/kustomization.yaml
index f511d3f..a9f1d8b 100644
--- a/kustomize-guestbook/overlays/prod/kustomization.yaml
+++ b/kustomize-guestbook/overlays/prod/kustomization.yaml
@@ -1,3 +1,5 @@
 bases:
 - ../../base
 namePrefix: prod-
+patchesStrategicMerge:
+- ingress.yaml
\ No newline at end of file

From 317e85da71a55f9e4d18e7e089787d5d454b52d9 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Tue, 2 Mar 2021 18:04:01 +0530
Subject: [PATCH 13/78] commands file

---
 Commands.md | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 Commands.md

diff --git a/Commands.md b/Commands.md
new file mode 100644
index 0000000..b710fb1
--- /dev/null
+++ b/Commands.md
@@ -0,0 +1,34 @@
+kubectl create ns guestbook
+kc create ns helm-guestbook
+kc create ns prod-kustomize-guestbook
+kc create ns dev-kustomize-guestbook
+
+
+argocd app create guestbook \
+--repo https://github.com/radtac-craft/argocd-example-apps.git \
+--path guestbook \
+--dest-server https://kubernetes.default.svc \
+--dest-namespace guestbook
+
+
+argocd app create helm-guestbook \
+--repo https://github.com/radtac-craft/argocd-example-apps.git \
+--path helm-guestbook \
+--dest-server https://kubernetes.default.svc \
+--dest-namespace helm-guestbook
+
+
+PROD:
+argocd app create prod-kustomize-guestbook \
+--repo https://github.com/radtac-craft/argocd-example-apps.git \
+--path kustomize-guestbook/overlays/prod \
+--dest-server https://kubernetes.default.svc \
+--dest-namespace prod-kustomize-guestbook
+
+
+DEV:
+argocd app create dev-kustomize-guestbook \
+--repo https://github.com/radtac-craft/argocd-example-apps.git \
+--path kustomize-guestbook/overlays/dev \
+--dest-server https://kubernetes.default.svc \
+--dest-namespace dev-kustomize-guestbook

From e0bba9a99435db93d73b3dd7d1932a20419850eb Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Tue, 2 Mar 2021 18:13:11 +0530
Subject: [PATCH 14/78] updates in commands

---
 Commands.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Commands.md b/Commands.md
index b710fb1..818b17f 100644
--- a/Commands.md
+++ b/Commands.md
@@ -17,6 +17,7 @@ argocd app create helm-guestbook \
 --dest-server https://kubernetes.default.svc \
 --dest-namespace helm-guestbook
 
+KUSTOMIZE -
 
 PROD:
 argocd app create prod-kustomize-guestbook \

From 3e8ddca0bae8176cd69bc60842fe386fc435588d Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Tue, 2 Mar 2021 18:17:11 +0530
Subject: [PATCH 15/78] update ingress in kustomize dev

---
 kustomize-guestbook/overlays/dev/ingress.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kustomize-guestbook/overlays/dev/ingress.yaml b/kustomize-guestbook/overlays/dev/ingress.yaml
index eff4920..73d9dce 100644
--- a/kustomize-guestbook/overlays/dev/ingress.yaml
+++ b/kustomize-guestbook/overlays/dev/ingress.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace:
 spec:
   rules:
-  - host: dev-kustomize-guestbook-argocd.natwest-labs.com
+  - host: dev-kustomize-guestbook-argocd1.natwest-labs.com
     http:
       paths:
       - backend:

From 0cbeb7a830e20f2249b804fbc8b3bc01100b4bab Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Tue, 2 Mar 2021 18:25:57 +0530
Subject: [PATCH 16/78] add sync wait command

---
 Commands.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Commands.md b/Commands.md
index 818b17f..f0662e2 100644
--- a/Commands.md
+++ b/Commands.md
@@ -33,3 +33,5 @@ argocd app create dev-kustomize-guestbook \
 --path kustomize-guestbook/overlays/dev \
 --dest-server https://kubernetes.default.svc \
 --dest-namespace dev-kustomize-guestbook
+
+argocd app wait dev-kustomize-guestbook --sync
\ No newline at end of file

From 28e1b5b218b9b39d9edf7c9fcce35cff886b8056 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Mon, 8 Mar 2021 17:58:01 +0530
Subject: [PATCH 17/78] change ing

---
 Commands.md            | 9 +++++++++
 guestbook/ingress.yaml | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Commands.md b/Commands.md
index f0662e2..0e0e151 100644
--- a/Commands.md
+++ b/Commands.md
@@ -10,6 +10,9 @@ argocd app create guestbook \
 --dest-server https://kubernetes.default.svc \
 --dest-namespace guestbook
 
+argocd app sync guestbook
+argocd app wait guestbook --sync
+
 
 argocd app create helm-guestbook \
 --repo https://github.com/radtac-craft/argocd-example-apps.git \
@@ -17,6 +20,9 @@ argocd app create helm-guestbook \
 --dest-server https://kubernetes.default.svc \
 --dest-namespace helm-guestbook
 
+argocd app sync helm-guestbook
+argocd app wait helm-guestbook --sync
+
 KUSTOMIZE -
 
 PROD:
@@ -26,6 +32,8 @@ argocd app create prod-kustomize-guestbook \
 --dest-server https://kubernetes.default.svc \
 --dest-namespace prod-kustomize-guestbook
 
+argocd app sync prod-kustomize-guestbook
+argocd app wait prod-kustomize-guestbook --sync
 
 DEV:
 argocd app create dev-kustomize-guestbook \
@@ -34,4 +42,5 @@ argocd app create dev-kustomize-guestbook \
 --dest-server https://kubernetes.default.svc \
 --dest-namespace dev-kustomize-guestbook
 
+argocd app sync dev-kustomize-guestbook
 argocd app wait dev-kustomize-guestbook --sync
\ No newline at end of file
diff --git a/guestbook/ingress.yaml b/guestbook/ingress.yaml
index fa1a453..31b659f 100644
--- a/guestbook/ingress.yaml
+++ b/guestbook/ingress.yaml
@@ -11,7 +11,7 @@ metadata:
     kubernetes.io/ingress.class: traefik
 spec:
   rules:
-  - host: guestbook-argocd.natwest-labs.com
+  - host: guestbook-argocd1.natwest-labs.com
     http:
       paths:
       - backend:

From cdd62311ad839e588bac4c8a1fafc733b4ffa75e Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Mon, 8 Mar 2021 22:26:53 +0530
Subject: [PATCH 18/78] Create Jenkinsfile

---
 Jenkinsfile | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000..ac50e9a
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,35 @@
+node {
+    stage('SCM checkout') {
+        checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/radtac-craft/argocd-example-apps.git']]])
+    }
+
+    stage('Start argocd') {
+        withKubeConfig(credentialsId: 'KUBECONFIG', serverUrl: '') {
+            // sh 'kubectl get all'
+            sh 'kubectl port-forward svc/argocd-server -n argocd 8080:443&'
+            // sh 'argocd login 127.0.0.1:8080'
+            sh 'argocd login 127.0.0.1:8080 --config /Users/mac/.argocd/config --insecure --username admin --password admin'
+            sh 'argocd app list'
+        }       
+    }
+    
+    stage('Create app') {
+        withKubeConfig(credentialsId: 'KUBECONFIG', serverUrl: '') {
+            sh """
+            argocd app create prod-kustomize-guestbook \
+            --repo https://github.com/radtac-craft/argocd-example-apps.git \
+            --path kustomize-guestbook/overlays/prod \
+            --dest-server https://kubernetes.default.svc \
+            --dest-namespace prod-kustomize-guestbook
+            """
+            sh 'argocd app sync prod-kustomize-guestbook'
+            sh 'argocd app wait prod-kustomize-guestbook --sync'
+        }
+    }       
+        
+    stage('Verify app') {
+        withKubeConfig(credentialsId: 'KUBECONFIG', serverUrl: '') {
+            sh 'argocd app list'
+        }               
+    }
+}

From fa8c5cb887c9ad8a2304a41792ae7e19dbf61a28 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Mon, 8 Mar 2021 22:29:25 +0530
Subject: [PATCH 19/78] Update Jenkinsfile

---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ac50e9a..961e45f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,7 +4,7 @@ node {
     }
 
     stage('Start argocd') {
-        withKubeConfig(credentialsId: 'KUBECONFIG', serverUrl: '') {
+        withKubeConfig(credentialsId: 'eksctl-kubeconfig', serverUrl: '') {
             // sh 'kubectl get all'
             sh 'kubectl port-forward svc/argocd-server -n argocd 8080:443&'
             // sh 'argocd login 127.0.0.1:8080'
@@ -14,7 +14,7 @@ node {
     }
     
     stage('Create app') {
-        withKubeConfig(credentialsId: 'KUBECONFIG', serverUrl: '') {
+        withKubeConfig(credentialsId: 'eksctl-kubeconfig', serverUrl: '') {
             sh """
             argocd app create prod-kustomize-guestbook \
             --repo https://github.com/radtac-craft/argocd-example-apps.git \
@@ -28,7 +28,7 @@ node {
     }       
         
     stage('Verify app') {
-        withKubeConfig(credentialsId: 'KUBECONFIG', serverUrl: '') {
+        withKubeConfig(credentialsId: 'eksctl-kubeconfig', serverUrl: '') {
             sh 'argocd app list'
         }               
     }

From fac5d5009638bb5f655548c4319dfbab84028891 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Mon, 8 Mar 2021 22:44:59 +0530
Subject: [PATCH 20/78] update ingress

---
 guestbook/ingress.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guestbook/ingress.yaml b/guestbook/ingress.yaml
index 31b659f..fa1a453 100644
--- a/guestbook/ingress.yaml
+++ b/guestbook/ingress.yaml
@@ -11,7 +11,7 @@ metadata:
     kubernetes.io/ingress.class: traefik
 spec:
   rules:
-  - host: guestbook-argocd1.natwest-labs.com
+  - host: guestbook-argocd.natwest-labs.com
     http:
       paths:
       - backend:

From 233c519e5cffbd09b25da66ff91073af81d85abb Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 00:42:50 +0530
Subject: [PATCH 21/78] update Jenkins creds

---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 961e45f..e896561 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,7 +4,7 @@ node {
     }
 
     stage('Start argocd') {
-        withKubeConfig(credentialsId: 'eksctl-kubeconfig', serverUrl: '') {
+        withKubeConfig(credentialsId: 'aws-eksctl-kubeconfig', serverUrl: '') {
             // sh 'kubectl get all'
             sh 'kubectl port-forward svc/argocd-server -n argocd 8080:443&'
             // sh 'argocd login 127.0.0.1:8080'
@@ -14,7 +14,7 @@ node {
     }
     
     stage('Create app') {
-        withKubeConfig(credentialsId: 'eksctl-kubeconfig', serverUrl: '') {
+        withKubeConfig(credentialsId: 'aws-eksctl-kubeconfig', serverUrl: '') {
             sh """
             argocd app create prod-kustomize-guestbook \
             --repo https://github.com/radtac-craft/argocd-example-apps.git \
@@ -28,7 +28,7 @@ node {
     }       
         
     stage('Verify app') {
-        withKubeConfig(credentialsId: 'eksctl-kubeconfig', serverUrl: '') {
+        withKubeConfig(credentialsId: 'aws-eksctl-kubeconfig', serverUrl: '') {
             sh 'argocd app list'
         }               
     }

From 7d190fdba3cb865073e69bd91b09de02d154f2a5 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 02:03:39 +0530
Subject: [PATCH 22/78] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e896561..868d6a9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,7 +8,7 @@ node {
             // sh 'kubectl get all'
             sh 'kubectl port-forward svc/argocd-server -n argocd 8080:443&'
             // sh 'argocd login 127.0.0.1:8080'
-            sh 'argocd login 127.0.0.1:8080 --config /Users/mac/.argocd/config --insecure --username admin --password admin'
+            sh 'argocd login 127.0.0.1:8080 --insecure --username admin --password admin'
             sh 'argocd app list'
         }       
     }

From 2c2de91254ab0eaab5d755b21377b82b9aef576b Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 02:05:10 +0530
Subject: [PATCH 23/78] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 868d6a9..29cc966 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ node {
             sh 'kubectl port-forward svc/argocd-server -n argocd 8080:443&'
             // sh 'argocd login 127.0.0.1:8080'
             sh 'argocd login 127.0.0.1:8080 --insecure --username admin --password admin'
-            sh 'argocd app list'
+            sh 'sudo argocd app list'
         }       
     }
     

From 0e715b5601b0de58db3357a682ef4f2c2c7187c1 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 02:06:13 +0530
Subject: [PATCH 24/78] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 29cc966..84c724b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,7 +8,7 @@ node {
             // sh 'kubectl get all'
             sh 'kubectl port-forward svc/argocd-server -n argocd 8080:443&'
             // sh 'argocd login 127.0.0.1:8080'
-            sh 'argocd login 127.0.0.1:8080 --insecure --username admin --password admin'
+            sh 'sudo argocd login 127.0.0.1:8080 --insecure --username admin --password admin'
             sh 'sudo argocd app list'
         }       
     }

From a02f16153ec1b49d3e5031e446663e53256a2239 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 02:08:36 +0530
Subject: [PATCH 25/78] Update Jenkinsfile

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 84c724b..868d6a9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,8 +8,8 @@ node {
             // sh 'kubectl get all'
             sh 'kubectl port-forward svc/argocd-server -n argocd 8080:443&'
             // sh 'argocd login 127.0.0.1:8080'
-            sh 'sudo argocd login 127.0.0.1:8080 --insecure --username admin --password admin'
-            sh 'sudo argocd app list'
+            sh 'argocd login 127.0.0.1:8080 --insecure --username admin --password admin'
+            sh 'argocd app list'
         }       
     }
     

From 99f0bf32bdf9973ff5aed243189942d108156bc3 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 02:11:14 +0530
Subject: [PATCH 26/78] Update Jenkinsfile

---
 Jenkinsfile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 868d6a9..615595b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,10 +6,14 @@ node {
     stage('Start argocd') {
         withKubeConfig(credentialsId: 'aws-eksctl-kubeconfig', serverUrl: '') {
             // sh 'kubectl get all'
-            sh 'kubectl port-forward svc/argocd-server -n argocd 8080:443&'
-            // sh 'argocd login 127.0.0.1:8080'
-            sh 'argocd login 127.0.0.1:8080 --insecure --username admin --password admin'
-            sh 'argocd app list'
+            sh"""
+            kubectl port-forward svc/argocd-server -n argocd 8080:443&
+            argocd login 127.0.0.1:8080 --insecure --username admin --password admin
+            argocd app list
+            """
+//            sh 'kubectl port-forward svc/argocd-server -n argocd 8080:443&'
+//           sh 'argocd login 127.0.0.1:8080 --insecure --username admin --password admin'
+//            sh 'argocd app list'
         }       
     }
     

From e333a80f6f033b9887a35d02f86343009bd7c531 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 02:12:41 +0530
Subject: [PATCH 27/78] Update Jenkinsfile

---
 Jenkinsfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 615595b..9711663 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,8 +1,4 @@
 node {
-    stage('SCM checkout') {
-        checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/radtac-craft/argocd-example-apps.git']]])
-    }
-
     stage('Start argocd') {
         withKubeConfig(credentialsId: 'aws-eksctl-kubeconfig', serverUrl: '') {
             // sh 'kubectl get all'

From 3faa5e86b1ebd31392e47c2ac05939956ee0b083 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 15:36:04 +0530
Subject: [PATCH 28/78] Update Jenkinsfile

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9711663..d541d75 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,6 +4,7 @@ node {
             // sh 'kubectl get all'
             sh"""
             kubectl port-forward svc/argocd-server -n argocd 8080:443&
+            kubectl get pods -A
             argocd login 127.0.0.1:8080 --insecure --username admin --password admin
             argocd app list
             """

From f8153da452749eb2aac7c7decf615cd84fad7230 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 15:38:54 +0530
Subject: [PATCH 29/78] remove test command

---
 Jenkinsfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d541d75..9711663 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,7 +4,6 @@ node {
             // sh 'kubectl get all'
             sh"""
             kubectl port-forward svc/argocd-server -n argocd 8080:443&
-            kubectl get pods -A
             argocd login 127.0.0.1:8080 --insecure --username admin --password admin
             argocd app list
             """

From c7c2cb273c132872bb447122fc887606583c7979 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 15:47:03 +0530
Subject: [PATCH 30/78] creds for argocd

---
 Jenkinsfile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9711663..1a87c76 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,12 +4,13 @@ node {
             // sh 'kubectl get all'
             sh"""
             kubectl port-forward svc/argocd-server -n argocd 8080:443&
-            argocd login 127.0.0.1:8080 --insecure --username admin --password admin
+
+            withCredentials([usernamePassword(credentialsId: 'argocd-devops-lab', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
+              sh 'argocd login 127.0.0.1:8080 --insecure --username $USERNAME --password $PASSWORD'
+            }
+            
             argocd app list
             """
-//            sh 'kubectl port-forward svc/argocd-server -n argocd 8080:443&'
-//           sh 'argocd login 127.0.0.1:8080 --insecure --username admin --password admin'
-//            sh 'argocd app list'
         }       
     }
     

From d66b01a134ab76219dd002e64f3e6cc3fea27502 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 15:51:58 +0530
Subject: [PATCH 31/78] add creds

---
 Jenkinsfile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1a87c76..f91016f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,16 +1,14 @@
 node {
     stage('Start argocd') {
         withKubeConfig(credentialsId: 'aws-eksctl-kubeconfig', serverUrl: '') {
-            // sh 'kubectl get all'
+            withCredentials([usernamePassword(credentialsId: 'argocd-devops-lab', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
+
             sh"""
             kubectl port-forward svc/argocd-server -n argocd 8080:443&
-
-            withCredentials([usernamePassword(credentialsId: 'argocd-devops-lab', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
-              sh 'argocd login 127.0.0.1:8080 --insecure --username $USERNAME --password $PASSWORD'
-            }
-            
+            sh 'argocd login 127.0.0.1:8080 --insecure --username $USERNAME --password $PASSWORD'            
             argocd app list
             """
+            }
         }       
     }
     

From 8f318bdf058ea45920b9d4440f454355fcbdd506 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 15:53:31 +0530
Subject: [PATCH 32/78] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f91016f..cdde336 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,7 +5,7 @@ node {
 
             sh"""
             kubectl port-forward svc/argocd-server -n argocd 8080:443&
-            sh 'argocd login 127.0.0.1:8080 --insecure --username $USERNAME --password $PASSWORD'            
+            argocd login 127.0.0.1:8080 --insecure --username ${USERNAME} --password ${PASSWORD}
             argocd app list
             """
             }

From 7cfa944ec72e0ed228cacd05110f0b23fb9b8e3f Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 15:55:16 +0530
Subject: [PATCH 33/78] Update Jenkinsfile

---
 Jenkinsfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index cdde336..cf5dee2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,4 +1,7 @@
 node {
+   timestamps{
+     properties([buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '3', numToKeepStr: '7'))])
+
     stage('Start argocd') {
         withKubeConfig(credentialsId: 'aws-eksctl-kubeconfig', serverUrl: '') {
             withCredentials([usernamePassword(credentialsId: 'argocd-devops-lab', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
@@ -32,3 +35,4 @@ node {
         }               
     }
 }
+}

From f975636378a2323f2cf9605e4568f55cb377c591 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 15:56:58 +0530
Subject: [PATCH 34/78] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index cf5dee2..fa9eed9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,7 +8,7 @@ node {
 
             sh"""
             kubectl port-forward svc/argocd-server -n argocd 8080:443&
-            argocd login 127.0.0.1:8080 --insecure --username ${USERNAME} --password ${PASSWORD}
+            argocd login 127.0.0.1:8080 --insecure --username ${USERNAME} --password \${PASSWORD}
             argocd app list
             """
             }

From 278e029af1d65a466532e092b1ccb38769947442 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 16:07:59 +0530
Subject: [PATCH 35/78] change script

---
 Jenkinsfile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index fa9eed9..2c7d3e3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,12 +5,9 @@ node {
     stage('Start argocd') {
         withKubeConfig(credentialsId: 'aws-eksctl-kubeconfig', serverUrl: '') {
             withCredentials([usernamePassword(credentialsId: 'argocd-devops-lab', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
-
-            sh"""
-            kubectl port-forward svc/argocd-server -n argocd 8080:443&
-            argocd login 127.0.0.1:8080 --insecure --username ${USERNAME} --password \${PASSWORD}
-            argocd app list
-            """
+               sh 'kubectl port-forward svc/argocd-server -n argocd 8080:443&'
+               sh'argocd login 127.0.0.1:8080 --insecure --username ${USERNAME} --password ${PASSWORD}'
+               sh 'argocd app list'
             }
         }       
     }

From 6a6e523a50425ab63cf0cc8098b9b84fc32765ec Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 16:17:24 +0530
Subject: [PATCH 36/78] Update Jenkinsfile

---
 Jenkinsfile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2c7d3e3..1d64fc1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,9 +5,11 @@ node {
     stage('Start argocd') {
         withKubeConfig(credentialsId: 'aws-eksctl-kubeconfig', serverUrl: '') {
             withCredentials([usernamePassword(credentialsId: 'argocd-devops-lab', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
-               sh 'kubectl port-forward svc/argocd-server -n argocd 8080:443&'
-               sh'argocd login 127.0.0.1:8080 --insecure --username ${USERNAME} --password ${PASSWORD}'
-               sh 'argocd app list'
+               sh"""
+               kubectl port-forward svc/argocd-server -n argocd 8080:443&
+               argocd login 127.0.0.1:8080 --insecure --username admin --password admin
+               argocd app list
+               """
             }
         }       
     }

From 5507719264b6640db28d88fbc8159c6383e0d760 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 16:30:30 +0530
Subject: [PATCH 37/78] Update Jenkinsfile

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1d64fc1..7055de2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,7 +3,7 @@ node {
      properties([buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '3', numToKeepStr: '7'))])
 
     stage('Start argocd') {
-        withKubeConfig(credentialsId: 'aws-eksctl-kubeconfig', serverUrl: '') {
+//        withKubeConfig(credentialsId: 'aws-eksctl-kubeconfig', serverUrl: '') {
             withCredentials([usernamePassword(credentialsId: 'argocd-devops-lab', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
                sh"""
                kubectl port-forward svc/argocd-server -n argocd 8080:443&
@@ -11,7 +11,7 @@ node {
                argocd app list
                """
             }
-        }       
+  //      }       
     }
     
     stage('Create app') {

From fc82bfbf9df4b983bc85666c92911605f9daaab6 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 17:01:22 +0530
Subject: [PATCH 38/78] Update Jenkinsfile

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7055de2..0f95bcb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,8 +3,8 @@ node {
      properties([buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '3', numToKeepStr: '7'))])
 
     stage('Start argocd') {
-//        withKubeConfig(credentialsId: 'aws-eksctl-kubeconfig', serverUrl: '') {
-            withCredentials([usernamePassword(credentialsId: 'argocd-devops-lab', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
+        withKubeConfig(credentialsId: 'aws-eksctl-kubeconfig', serverUrl: '') {
+//            withCredentials([usernamePassword(credentialsId: 'argocd-devops-lab', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
                sh"""
                kubectl port-forward svc/argocd-server -n argocd 8080:443&
                argocd login 127.0.0.1:8080 --insecure --username admin --password admin

From 434b7ebc463310c0b1d9ff8a1fb6fac5e3556c1a Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 17:36:18 +0530
Subject: [PATCH 39/78] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0f95bcb..c5e125f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ node {
                argocd app list
                """
             }
-  //      }       
+//      }       
     }
     
     stage('Create app') {

From 6695bbece05a674f6a955f2f57369a04c4438b01 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 17:38:26 +0530
Subject: [PATCH 40/78] Update Jenkinsfile

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index c5e125f..638f144 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,6 +7,7 @@ node {
 //            withCredentials([usernamePassword(credentialsId: 'argocd-devops-lab', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
                sh"""
                kubectl port-forward svc/argocd-server -n argocd 8080:443&
+               kubectl get pods -A
                argocd login 127.0.0.1:8080 --insecure --username admin --password admin
                argocd app list
                """

From 7b989417df529a54b0307d9c35de2db13cfd0850 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 17:43:34 +0530
Subject: [PATCH 41/78] Update Jenkinsfile

---
 Jenkinsfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 638f144..c5e125f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,7 +7,6 @@ node {
 //            withCredentials([usernamePassword(credentialsId: 'argocd-devops-lab', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
                sh"""
                kubectl port-forward svc/argocd-server -n argocd 8080:443&
-               kubectl get pods -A
                argocd login 127.0.0.1:8080 --insecure --username admin --password admin
                argocd app list
                """

From 35953fdd0f31b99b919c841829b598573d96ca8e Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 17:44:26 +0530
Subject: [PATCH 42/78] Update Jenkinsfile

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index c5e125f..638f144 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,6 +7,7 @@ node {
 //            withCredentials([usernamePassword(credentialsId: 'argocd-devops-lab', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
                sh"""
                kubectl port-forward svc/argocd-server -n argocd 8080:443&
+               kubectl get pods -A
                argocd login 127.0.0.1:8080 --insecure --username admin --password admin
                argocd app list
                """

From e17647a1dd32a4f9b28d390df36c961a42e07c37 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 17:45:22 +0530
Subject: [PATCH 43/78] Update Jenkinsfile

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 638f144..77fad57 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,6 +8,7 @@ node {
                sh"""
                kubectl port-forward svc/argocd-server -n argocd 8080:443&
                kubectl get pods -A
+               argocd logout 127.0.0.1:8080 
                argocd login 127.0.0.1:8080 --insecure --username admin --password admin
                argocd app list
                """

From b1b3daaf7f383c628c3eb4b3e809438b1afe51bd Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 17:49:01 +0530
Subject: [PATCH 44/78] Update ingress.yaml

---
 kustomize-guestbook/overlays/prod/ingress.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kustomize-guestbook/overlays/prod/ingress.yaml b/kustomize-guestbook/overlays/prod/ingress.yaml
index 1acf8a5..bb66a74 100644
--- a/kustomize-guestbook/overlays/prod/ingress.yaml
+++ b/kustomize-guestbook/overlays/prod/ingress.yaml
@@ -5,10 +5,10 @@ metadata:
   namespace:
 spec:
   rules:
-  - host: kustomize-guestbook-argocd.natwest-labs.com
+  - host: kustomize-guestbook-argocd1.natwest-labs.com
     http:
       paths:
       - backend:
           serviceName: guestbook-ui
           servicePort: 80
-        path: /
\ No newline at end of file
+        path: /

From 7e059291674c0a653c1437cb26bdd9660273266f Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 17:55:05 +0530
Subject: [PATCH 45/78] Update ingress.yaml

---
 kustomize-guestbook/overlays/prod/ingress.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kustomize-guestbook/overlays/prod/ingress.yaml b/kustomize-guestbook/overlays/prod/ingress.yaml
index bb66a74..8b1c9d7 100644
--- a/kustomize-guestbook/overlays/prod/ingress.yaml
+++ b/kustomize-guestbook/overlays/prod/ingress.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace:
 spec:
   rules:
-  - host: kustomize-guestbook-argocd1.natwest-labs.com
+  - host: kustomize-guestbook-argocd.natwest-labs.com
     http:
       paths:
       - backend:

From 5461d67463b415cdf18dc18bd2fae98e0cd1ebdb Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 17:57:00 +0530
Subject: [PATCH 46/78] Update ingress.yaml

---
 kustomize-guestbook/overlays/prod/ingress.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kustomize-guestbook/overlays/prod/ingress.yaml b/kustomize-guestbook/overlays/prod/ingress.yaml
index 8b1c9d7..bb66a74 100644
--- a/kustomize-guestbook/overlays/prod/ingress.yaml
+++ b/kustomize-guestbook/overlays/prod/ingress.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace:
 spec:
   rules:
-  - host: kustomize-guestbook-argocd.natwest-labs.com
+  - host: kustomize-guestbook-argocd1.natwest-labs.com
     http:
       paths:
       - backend:

From dc7e0f3403f6b99e1475eb1dc0b12f44a57e473e Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 17:57:50 +0530
Subject: [PATCH 47/78] Update ingress.yaml

---
 kustomize-guestbook/overlays/prod/ingress.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kustomize-guestbook/overlays/prod/ingress.yaml b/kustomize-guestbook/overlays/prod/ingress.yaml
index bb66a74..8b1c9d7 100644
--- a/kustomize-guestbook/overlays/prod/ingress.yaml
+++ b/kustomize-guestbook/overlays/prod/ingress.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace:
 spec:
   rules:
-  - host: kustomize-guestbook-argocd1.natwest-labs.com
+  - host: kustomize-guestbook-argocd.natwest-labs.com
     http:
       paths:
       - backend:

From 000fd1237058342f03aee19256a43d4cdf9589a4 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 17:58:45 +0530
Subject: [PATCH 48/78] Update ingress.yaml

---
 kustomize-guestbook/overlays/prod/ingress.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kustomize-guestbook/overlays/prod/ingress.yaml b/kustomize-guestbook/overlays/prod/ingress.yaml
index bb66a74..8b1c9d7 100644
--- a/kustomize-guestbook/overlays/prod/ingress.yaml
+++ b/kustomize-guestbook/overlays/prod/ingress.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace:
 spec:
   rules:
-  - host: kustomize-guestbook-argocd1.natwest-labs.com
+  - host: kustomize-guestbook-argocd.natwest-labs.com
     http:
       paths:
       - backend:

From b584af402f258be88c6f8a1e000b778f23256a73 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 17:59:50 +0530
Subject: [PATCH 49/78] Update Jenkinsfile

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 77fad57..3c15fa9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,6 +15,7 @@ node {
             }
 //      }       
     }
+      
     
     stage('Create app') {
         withKubeConfig(credentialsId: 'aws-eksctl-kubeconfig', serverUrl: '') {

From 81b491b7197236f98ef9dd8f445e1463ec7c738a Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 18:04:09 +0530
Subject: [PATCH 50/78] Update Jenkinsfile

---
 Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 77fad57..b75d5e0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,8 @@ node {
 //      }       
     }
     
-    stage('Create app') {
+
+      stage('Create app') {
         withKubeConfig(credentialsId: 'aws-eksctl-kubeconfig', serverUrl: '') {
             sh """
             argocd app create prod-kustomize-guestbook \

From ba4b309991d4f80ce4c1365e55d59527713f0af5 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 18:05:15 +0530
Subject: [PATCH 51/78] Update Jenkinsfile

---
 Jenkinsfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b75d5e0..000b959 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,8 +14,7 @@ node {
                """
             }
 //      }       
-    }
-    
+    }   
 
       stage('Create app') {
         withKubeConfig(credentialsId: 'aws-eksctl-kubeconfig', serverUrl: '') {

From 3ab3db7e8389262f953a11a6af8f975f212b997d Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Fri, 12 Mar 2021 18:13:01 +0530
Subject: [PATCH 52/78] update ingress in prod

---
 kustomize-guestbook/overlays/prod/ingress.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kustomize-guestbook/overlays/prod/ingress.yaml b/kustomize-guestbook/overlays/prod/ingress.yaml
index 8b1c9d7..bb66a74 100644
--- a/kustomize-guestbook/overlays/prod/ingress.yaml
+++ b/kustomize-guestbook/overlays/prod/ingress.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace:
 spec:
   rules:
-  - host: kustomize-guestbook-argocd.natwest-labs.com
+  - host: kustomize-guestbook-argocd1.natwest-labs.com
     http:
       paths:
       - backend:

From 390cdcb72a65e55719a759330c18d7a0c868015c Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Sat, 13 Mar 2021 01:59:00 +0530
Subject: [PATCH 53/78] Update ingress.yaml

---
 kustomize-guestbook/overlays/prod/ingress.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kustomize-guestbook/overlays/prod/ingress.yaml b/kustomize-guestbook/overlays/prod/ingress.yaml
index bb66a74..8b1c9d7 100644
--- a/kustomize-guestbook/overlays/prod/ingress.yaml
+++ b/kustomize-guestbook/overlays/prod/ingress.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace:
 spec:
   rules:
-  - host: kustomize-guestbook-argocd1.natwest-labs.com
+  - host: kustomize-guestbook-argocd.natwest-labs.com
     http:
       paths:
       - backend:

From 93c8e42a21c68023e5f3fbf192d57abc2fd80b6b Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Sat, 13 Mar 2021 02:09:36 +0530
Subject: [PATCH 54/78] Update Jenkinsfile

---
 Jenkinsfile | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3c15fa9..be46811 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,16 +4,15 @@ node {
 
     stage('Start argocd') {
         withKubeConfig(credentialsId: 'aws-eksctl-kubeconfig', serverUrl: '') {
-//            withCredentials([usernamePassword(credentialsId: 'argocd-devops-lab', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
-               sh"""
-               kubectl port-forward svc/argocd-server -n argocd 8080:443&
-               kubectl get pods -A
-               argocd logout 127.0.0.1:8080 
-               argocd login 127.0.0.1:8080 --insecure --username admin --password admin
-               argocd app list
-               """
+            withCredentials([usernamePassword(credentialsId: 'argocd-devops-lab', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
+//               sh"""
+               sh 'kubectl port-forward svc/argocd-server -n argocd 8080:443&'
+               sh 'argocd logout 127.0.0.1:8080'
+               sh 'argocd login 127.0.0.1:8080 --insecure --username $USERNAME --password $PASSWORD'
+               sh 'argocd app list'
+//               """
             }
-//      }       
+      }       
     }
       
     

From 96ac5748e52992bd8a23dafef932d9ac265763bd Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Sat, 13 Mar 2021 02:11:15 +0530
Subject: [PATCH 55/78] Update Jenkinsfile

---
 Jenkinsfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index be46811..b24e8e3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,6 +8,10 @@ node {
 //               sh"""
                sh 'kubectl port-forward svc/argocd-server -n argocd 8080:443&'
                sh 'argocd logout 127.0.0.1:8080'
+               sh 'echo $PASSWORD'
+               sh"""
+               echo $PASSWORD
+               """
                sh 'argocd login 127.0.0.1:8080 --insecure --username $USERNAME --password $PASSWORD'
                sh 'argocd app list'
 //               """

From 2b1eb413db553d3ef91c68375d141b77b84b2b29 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Sat, 13 Mar 2021 02:12:24 +0530
Subject: [PATCH 56/78] Update Jenkinsfile

---
 Jenkinsfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b24e8e3..ef79683 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,10 +8,10 @@ node {
 //               sh"""
                sh 'kubectl port-forward svc/argocd-server -n argocd 8080:443&'
                sh 'argocd logout 127.0.0.1:8080'
-               sh 'echo $PASSWORD'
-               sh"""
-               echo $PASSWORD
-               """
+//               sh 'echo $PASSWORD'
+//               sh"""
+//               echo $PASSWORD
+//               """
                sh 'argocd login 127.0.0.1:8080 --insecure --username $USERNAME --password $PASSWORD'
                sh 'argocd app list'
 //               """

From ab3e277d3a6534dc8d580c09ea7a19a72077b18e Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Sat, 13 Mar 2021 02:14:56 +0530
Subject: [PATCH 57/78] insert environment name in argocd commands

---
 Jenkinsfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ef79683..40b07ff 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,14 +23,14 @@ node {
     stage('Create app') {
         withKubeConfig(credentialsId: 'aws-eksctl-kubeconfig', serverUrl: '') {
             sh """
-            argocd app create prod-kustomize-guestbook \
+            argocd app create ${env.BRANCHNAME}-kustomize-guestbook \
             --repo https://github.com/radtac-craft/argocd-example-apps.git \
-            --path kustomize-guestbook/overlays/prod \
+            --path kustomize-guestbook/overlays/${env.BRANCHNAME} \
             --dest-server https://kubernetes.default.svc \
-            --dest-namespace prod-kustomize-guestbook
+            --dest-namespace ${env.BRANCHNAME}-kustomize-guestbook
             """
-            sh 'argocd app sync prod-kustomize-guestbook'
-            sh 'argocd app wait prod-kustomize-guestbook --sync'
+            sh 'argocd app sync ${env.BRANCHNAME}-kustomize-guestbook'
+            sh 'argocd app wait ${env.BRANCHNAME}-kustomize-guestbook --sync'
         }
     }       
         

From e4e6ef39f40a1af57fb5e0177c0fb87d931ff425 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Sat, 13 Mar 2021 02:16:22 +0530
Subject: [PATCH 58/78] update BRANCH_NAME

---
 Jenkinsfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 40b07ff..f97d38b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,14 +23,14 @@ node {
     stage('Create app') {
         withKubeConfig(credentialsId: 'aws-eksctl-kubeconfig', serverUrl: '') {
             sh """
-            argocd app create ${env.BRANCHNAME}-kustomize-guestbook \
+            argocd app create ${env.BRANCH_NAME}-kustomize-guestbook \
             --repo https://github.com/radtac-craft/argocd-example-apps.git \
-            --path kustomize-guestbook/overlays/${env.BRANCHNAME} \
+            --path kustomize-guestbook/overlays/${env.BRANCH_NAME} \
             --dest-server https://kubernetes.default.svc \
-            --dest-namespace ${env.BRANCHNAME}-kustomize-guestbook
+            --dest-namespace ${env.BRANCH_NAME}-kustomize-guestbook
             """
-            sh 'argocd app sync ${env.BRANCHNAME}-kustomize-guestbook'
-            sh 'argocd app wait ${env.BRANCHNAME}-kustomize-guestbook --sync'
+            sh 'argocd app sync ${env.BRANCH_NAME}-kustomize-guestbook'
+            sh 'argocd app wait ${env.BRANCH_NAME}-kustomize-guestbook --sync'
         }
     }       
         

From 328dc0aa0bbb831bfc4d0e314a167d48155c95ff Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Sat, 13 Mar 2021 02:24:10 +0530
Subject: [PATCH 59/78] Update Jenkinsfile

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f97d38b..ef975bd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,8 +29,8 @@ node {
             --dest-server https://kubernetes.default.svc \
             --dest-namespace ${env.BRANCH_NAME}-kustomize-guestbook
             """
-            sh 'argocd app sync ${env.BRANCH_NAME}-kustomize-guestbook'
-            sh 'argocd app wait ${env.BRANCH_NAME}-kustomize-guestbook --sync'
+            sh 'argocd app sync $BRANCH_NAME-kustomize-guestbook'
+            sh 'argocd app wait $BRANCH_NAME-kustomize-guestbook --sync'
         }
     }       
         

From c567865c35b1a0675183232f86a6b56dc12ec3b9 Mon Sep 17 00:00:00 2001
From: Megha Mehta <76773785+mm2020-ind@users.noreply.github.com>
Date: Sat, 13 Mar 2021 02:26:13 +0530
Subject: [PATCH 60/78] new ing

---
 kustomize-guestbook/overlays/dev/ingress.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kustomize-guestbook/overlays/dev/ingress.yaml b/kustomize-guestbook/overlays/dev/ingress.yaml
index 73d9dce..f747b41 100644
--- a/kustomize-guestbook/overlays/dev/ingress.yaml
+++ b/kustomize-guestbook/overlays/dev/ingress.yaml
@@ -5,10 +5,10 @@ metadata:
   namespace:
 spec:
   rules:
-  - host: dev-kustomize-guestbook-argocd1.natwest-labs.com
+  - host: dev-kustomize-guestbook-argocd.natwest-labs.com
     http:
       paths:
       - backend:
           serviceName: guestbook-ui
           servicePort: 80
-        path: /
\ No newline at end of file
+        path: /

From 6439b760e8d98c305b075de45c6699036e6c1afa Mon Sep 17 00:00:00 2001
From: Megha Mehta <mmehta.ten@gmail.com>
Date: Sun, 21 Mar 2021 00:41:11 +0530
Subject: [PATCH 61/78] rename files

---
 kustomize-guestbook/base/ingress.yaml       | 2 +-
 kustomize-guestbook/base/kustomization.yaml | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/kustomize-guestbook/base/ingress.yaml b/kustomize-guestbook/base/ingress.yaml
index 666c673..75dd755 100644
--- a/kustomize-guestbook/base/ingress.yaml
+++ b/kustomize-guestbook/base/ingress.yaml
@@ -1,7 +1,7 @@
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: kustomize-guestbook-ingress
+  name: guestbook-ingress
   # namespace: guestbook
   labels:
     app.kubernetes.io/component: server
diff --git a/kustomize-guestbook/base/kustomization.yaml b/kustomize-guestbook/base/kustomization.yaml
index d22b5c8..f4f3de6 100644
--- a/kustomize-guestbook/base/kustomization.yaml
+++ b/kustomize-guestbook/base/kustomization.yaml
@@ -1,8 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 namePrefix: kustomize-
 
 resources:
 - guestbook-ui-deployment.yaml
 - guestbook-ui-svc.yaml
-- ingress.yaml
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
+- ingress.yamls
\ No newline at end of file

From a4240223633a63ab19bad67469055f6113f90c07 Mon Sep 17 00:00:00 2001
From: Megha Mehta <mmehta.ten@gmail.com>
Date: Sun, 21 Mar 2021 00:44:08 +0530
Subject: [PATCH 62/78] fix ingress names in overlays folder

---
 kustomize-guestbook/overlays/dev/ingress.yaml  | 2 +-
 kustomize-guestbook/overlays/prod/ingress.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kustomize-guestbook/overlays/dev/ingress.yaml b/kustomize-guestbook/overlays/dev/ingress.yaml
index 73d9dce..9d48196 100644
--- a/kustomize-guestbook/overlays/dev/ingress.yaml
+++ b/kustomize-guestbook/overlays/dev/ingress.yaml
@@ -1,7 +1,7 @@
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: kustomize-guestbook-ingress
+  name: guestbook-ingress
   namespace:
 spec:
   rules:
diff --git a/kustomize-guestbook/overlays/prod/ingress.yaml b/kustomize-guestbook/overlays/prod/ingress.yaml
index 8b1c9d7..6e2e86b 100644
--- a/kustomize-guestbook/overlays/prod/ingress.yaml
+++ b/kustomize-guestbook/overlays/prod/ingress.yaml
@@ -1,7 +1,7 @@
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: kustomize-guestbook-ingress
+  name: guestbook-ingress
   namespace:
 spec:
   rules:

From 9f7b490be575aca724e611de9eb77f5b7442ffd8 Mon Sep 17 00:00:00 2001
From: Megha Mehta <mmehta.ten@gmail.com>
Date: Sun, 21 Mar 2021 00:49:35 +0530
Subject: [PATCH 63/78] fix

---
 kustomize-guestbook/base/kustomization.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kustomize-guestbook/base/kustomization.yaml b/kustomize-guestbook/base/kustomization.yaml
index f4f3de6..d8d42c7 100644
--- a/kustomize-guestbook/base/kustomization.yaml
+++ b/kustomize-guestbook/base/kustomization.yaml
@@ -6,4 +6,4 @@ namePrefix: kustomize-
 resources:
 - guestbook-ui-deployment.yaml
 - guestbook-ui-svc.yaml
-- ingress.yamls
\ No newline at end of file
+- ingress.yaml
\ No newline at end of file

From 92b550c4615300c94c006eff2bc3ee8c96542bca Mon Sep 17 00:00:00 2001
From: Megha Mehta <mmehta.ten@gmail.com>
Date: Sun, 21 Mar 2021 01:02:25 +0530
Subject: [PATCH 64/78] add argocd

---
 kustomize-guestbook/base/argo-app.yaml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 kustomize-guestbook/base/argo-app.yaml

diff --git a/kustomize-guestbook/base/argo-app.yaml b/kustomize-guestbook/base/argo-app.yaml
new file mode 100644
index 0000000..830276c
--- /dev/null
+++ b/kustomize-guestbook/base/argo-app.yaml
@@ -0,0 +1,16 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: kustomize-guestbook
+  namespace: argocd
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    namespace: kustomize-guestbook
+    server: https://kubernetes.default.svc
+  project: default
+  source:
+    path: kustomize-guestbook
+    repoURL: https://github.com/radtac-craft/argocd-example-apps.git
+    targetRevision: HEAD
\ No newline at end of file

From 21e8198fb2ba3094fe331c721c0d2bdd8b2fc791 Mon Sep 17 00:00:00 2001
From: Megha Mehta <mmehta.ten@gmail.com>
Date: Sun, 21 Mar 2021 01:04:47 +0530
Subject: [PATCH 65/78] add argocd to kustomization

---
 kustomize-guestbook/base/kustomization.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kustomize-guestbook/base/kustomization.yaml b/kustomize-guestbook/base/kustomization.yaml
index d8d42c7..1b53f90 100644
--- a/kustomize-guestbook/base/kustomization.yaml
+++ b/kustomize-guestbook/base/kustomization.yaml
@@ -6,4 +6,5 @@ namePrefix: kustomize-
 resources:
 - guestbook-ui-deployment.yaml
 - guestbook-ui-svc.yaml
-- ingress.yaml
\ No newline at end of file
+- ingress.yaml
+- argo-app.yaml
\ No newline at end of file

From a6c34576161703f66ca45d85f42c0f0592ba552e Mon Sep 17 00:00:00 2001
From: Megha Mehta <mmehta.ten@gmail.com>
Date: Sun, 21 Mar 2021 01:08:29 +0530
Subject: [PATCH 66/78] rename argo app

---
 kustomize-guestbook/base/argo-app.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kustomize-guestbook/base/argo-app.yaml b/kustomize-guestbook/base/argo-app.yaml
index 830276c..91a1c7b 100644
--- a/kustomize-guestbook/base/argo-app.yaml
+++ b/kustomize-guestbook/base/argo-app.yaml
@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: kustomize-guestbook
+  name: guestbook
   namespace: argocd
   finalizers:
   - resources-finalizer.argocd.argoproj.io

From ecf8fef4df03b9768897a46ddaa11f3ab9230f0a Mon Sep 17 00:00:00 2001
From: Megha Mehta <mmehta.ten@gmail.com>
Date: Sun, 21 Mar 2021 01:10:44 +0530
Subject: [PATCH 67/78] add argocd for dev

---
 kustomize-guestbook/overlays/dev/argo-app.yaml   | 16 ++++++++++++++++
 .../overlays/dev/kustomization.yaml              |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 kustomize-guestbook/overlays/dev/argo-app.yaml

diff --git a/kustomize-guestbook/overlays/dev/argo-app.yaml b/kustomize-guestbook/overlays/dev/argo-app.yaml
new file mode 100644
index 0000000..d46c28c
--- /dev/null
+++ b/kustomize-guestbook/overlays/dev/argo-app.yaml
@@ -0,0 +1,16 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: guestbook
+  namespace: argocd
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    namespace: kustomize-guestbook
+    server: https://kubernetes.default.svc
+  project: default
+  source:
+    path: kustomize-guestbook/overlays/dev
+    repoURL: https://github.com/radtac-craft/argocd-example-apps.git
+    targetRevision: HEAD
\ No newline at end of file
diff --git a/kustomize-guestbook/overlays/dev/kustomization.yaml b/kustomize-guestbook/overlays/dev/kustomization.yaml
index 6150327..0fc5da9 100644
--- a/kustomize-guestbook/overlays/dev/kustomization.yaml
+++ b/kustomize-guestbook/overlays/dev/kustomization.yaml
@@ -2,4 +2,5 @@ bases:
 - ../../base
 namePrefix: dev-
 patchesStrategicMerge:
-- ingress.yaml
\ No newline at end of file
+- ingress.yaml
+- argo-app.yaml
\ No newline at end of file

From 6bc111c528e536573c5a2e771625330da5c1fcfb Mon Sep 17 00:00:00 2001
From: Megha Mehta <mmehta.ten@gmail.com>
Date: Sun, 21 Mar 2021 01:13:48 +0530
Subject: [PATCH 68/78] remove finalizer for argocd

---
 kustomize-guestbook/overlays/dev/argo-app.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kustomize-guestbook/overlays/dev/argo-app.yaml b/kustomize-guestbook/overlays/dev/argo-app.yaml
index d46c28c..e1f932f 100644
--- a/kustomize-guestbook/overlays/dev/argo-app.yaml
+++ b/kustomize-guestbook/overlays/dev/argo-app.yaml
@@ -3,8 +3,8 @@ kind: Application
 metadata:
   name: guestbook
   namespace: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
+  # finalizers:
+  # - resources-finalizer.argocd.argoproj.io
 spec:
   destination:
     namespace: kustomize-guestbook

From d8aaea914ec1cc0a3f2d1bd03106fb38954ed231 Mon Sep 17 00:00:00 2001
From: Megha Mehta <mmehta.ten@gmail.com>
Date: Sun, 21 Mar 2021 01:34:27 +0530
Subject: [PATCH 69/78] fix ns in dev argocd

---
 kustomize-guestbook/overlays/dev/argo-app.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kustomize-guestbook/overlays/dev/argo-app.yaml b/kustomize-guestbook/overlays/dev/argo-app.yaml
index e1f932f..ba7de0b 100644
--- a/kustomize-guestbook/overlays/dev/argo-app.yaml
+++ b/kustomize-guestbook/overlays/dev/argo-app.yaml
@@ -7,7 +7,7 @@ metadata:
   # - resources-finalizer.argocd.argoproj.io
 spec:
   destination:
-    namespace: kustomize-guestbook
+    namespace: dev-kustomize-guestbook
     server: https://kubernetes.default.svc
   project: default
   source:

From 6b88e2df4700d7ed06003dd7594bf6561eb70aca Mon Sep 17 00:00:00 2001
From: Megha Mehta <mmehta.ten@gmail.com>
Date: Sun, 21 Mar 2021 01:40:05 +0530
Subject: [PATCH 70/78] add argocd for prod

---
 kustomize-guestbook/overlays/prod/argo-app.yaml  | 16 ++++++++++++++++
 .../overlays/prod/kustomization.yaml             |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 kustomize-guestbook/overlays/prod/argo-app.yaml

diff --git a/kustomize-guestbook/overlays/prod/argo-app.yaml b/kustomize-guestbook/overlays/prod/argo-app.yaml
new file mode 100644
index 0000000..da62615
--- /dev/null
+++ b/kustomize-guestbook/overlays/prod/argo-app.yaml
@@ -0,0 +1,16 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: guestbook
+  namespace: argocd
+  # finalizers:
+  # - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    namespace: prod-kustomize-guestbook
+    server: https://kubernetes.default.svc
+  project: default
+  source:
+    path: kustomize-guestbook/overlays/dev
+    repoURL: https://github.com/radtac-craft/argocd-example-apps.git
+    targetRevision: HEAD
\ No newline at end of file
diff --git a/kustomize-guestbook/overlays/prod/kustomization.yaml b/kustomize-guestbook/overlays/prod/kustomization.yaml
index a9f1d8b..268be52 100644
--- a/kustomize-guestbook/overlays/prod/kustomization.yaml
+++ b/kustomize-guestbook/overlays/prod/kustomization.yaml
@@ -2,4 +2,5 @@ bases:
 - ../../base
 namePrefix: prod-
 patchesStrategicMerge:
-- ingress.yaml
\ No newline at end of file
+- ingress.yaml
+- argo-app.yaml
\ No newline at end of file

From 6371e80b701d3a0e0e018d8700b463d17a97d2fb Mon Sep 17 00:00:00 2001
From: Megha Mehta <mmehta.ten@gmail.com>
Date: Sun, 21 Mar 2021 01:42:57 +0530
Subject: [PATCH 71/78] update argocd for prod

---
 kustomize-guestbook/overlays/prod/argo-app.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kustomize-guestbook/overlays/prod/argo-app.yaml b/kustomize-guestbook/overlays/prod/argo-app.yaml
index da62615..b2e9228 100644
--- a/kustomize-guestbook/overlays/prod/argo-app.yaml
+++ b/kustomize-guestbook/overlays/prod/argo-app.yaml
@@ -11,6 +11,6 @@ spec:
     server: https://kubernetes.default.svc
   project: default
   source:
-    path: kustomize-guestbook/overlays/dev
+    path: kustomize-guestbook/overlays/prod
     repoURL: https://github.com/radtac-craft/argocd-example-apps.git
     targetRevision: HEAD
\ No newline at end of file

From eabd5e9983997a3b88cee83dce646ea0e8c6b8be Mon Sep 17 00:00:00 2001
From: Megha Mehta <mmehta.ten@gmail.com>
Date: Sun, 21 Mar 2021 01:48:56 +0530
Subject: [PATCH 72/78] remove finalizer from base argocd

---
 kustomize-guestbook/base/argo-app.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kustomize-guestbook/base/argo-app.yaml b/kustomize-guestbook/base/argo-app.yaml
index 91a1c7b..03c2886 100644
--- a/kustomize-guestbook/base/argo-app.yaml
+++ b/kustomize-guestbook/base/argo-app.yaml
@@ -3,8 +3,8 @@ kind: Application
 metadata:
   name: guestbook
   namespace: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
+  # finalizers:
+  # - resources-finalizer.argocd.argoproj.io
 spec:
   destination:
     namespace: kustomize-guestbook

From 17768f6a0dc12af2064eb7fad3ef7b1357138723 Mon Sep 17 00:00:00 2001
From: Megha Mehta <mmehta.ten@gmail.com>
Date: Sun, 21 Mar 2021 02:02:49 +0530
Subject: [PATCH 73/78] change targetrevision for dev argocd

---
 kustomize-guestbook/overlays/dev/argo-app.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kustomize-guestbook/overlays/dev/argo-app.yaml b/kustomize-guestbook/overlays/dev/argo-app.yaml
index ba7de0b..b91ef2a 100644
--- a/kustomize-guestbook/overlays/dev/argo-app.yaml
+++ b/kustomize-guestbook/overlays/dev/argo-app.yaml
@@ -13,4 +13,4 @@ spec:
   source:
     path: kustomize-guestbook/overlays/dev
     repoURL: https://github.com/radtac-craft/argocd-example-apps.git
-    targetRevision: HEAD
\ No newline at end of file
+    targetRevision: dev
\ No newline at end of file

From dfec628d11833d8695d1b90d94331039f23dbb63 Mon Sep 17 00:00:00 2001
From: Megha Mehta <mmehta.ten@gmail.com>
Date: Sun, 21 Mar 2021 02:07:39 +0530
Subject: [PATCH 74/78] alter commands

---
 Commands.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Commands.md b/Commands.md
index 0e0e151..ac23ed5 100644
--- a/Commands.md
+++ b/Commands.md
@@ -40,7 +40,8 @@ argocd app create dev-kustomize-guestbook \
 --repo https://github.com/radtac-craft/argocd-example-apps.git \
 --path kustomize-guestbook/overlays/dev \
 --dest-server https://kubernetes.default.svc \
---dest-namespace dev-kustomize-guestbook
+--dest-namespace dev-kustomize-guestbook \
+-- targetRevision dev
 
 argocd app sync dev-kustomize-guestbook
 argocd app wait dev-kustomize-guestbook --sync
\ No newline at end of file

From c52ff5dfdd37f219fdbd7d4d755fa38383a9f4cd Mon Sep 17 00:00:00 2001
From: Megha Mehta <mmehta.ten@gmail.com>
Date: Sun, 21 Mar 2021 02:09:06 +0530
Subject: [PATCH 75/78] command change 1

---
 Commands.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Commands.md b/Commands.md
index ac23ed5..1ae3624 100644
--- a/Commands.md
+++ b/Commands.md
@@ -41,7 +41,7 @@ argocd app create dev-kustomize-guestbook \
 --path kustomize-guestbook/overlays/dev \
 --dest-server https://kubernetes.default.svc \
 --dest-namespace dev-kustomize-guestbook \
--- targetRevision dev
+--revision dev
 
 argocd app sync dev-kustomize-guestbook
 argocd app wait dev-kustomize-guestbook --sync
\ No newline at end of file

From af62414297bbff330edc51ad60c8b3c5c2807c2e Mon Sep 17 00:00:00 2001
From: Megha Mehta <mmehta.ten@gmail.com>
Date: Sun, 21 Mar 2021 02:09:37 +0530
Subject: [PATCH 76/78] command 2

---
 Commands.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Commands.md b/Commands.md
index 1ae3624..083f07d 100644
--- a/Commands.md
+++ b/Commands.md
@@ -30,7 +30,8 @@ argocd app create prod-kustomize-guestbook \
 --repo https://github.com/radtac-craft/argocd-example-apps.git \
 --path kustomize-guestbook/overlays/prod \
 --dest-server https://kubernetes.default.svc \
---dest-namespace prod-kustomize-guestbook
+--dest-namespace prod-kustomize-guestbook \
+--revision HEAD
 
 argocd app sync prod-kustomize-guestbook
 argocd app wait prod-kustomize-guestbook --sync

From 85a7b473c154701f3a5208c6058aef8889086636 Mon Sep 17 00:00:00 2001
From: Megha Mehta <mmehta.ten@gmail.com>
Date: Sun, 21 Mar 2021 02:11:26 +0530
Subject: [PATCH 77/78] update dev ing

---
 kustomize-guestbook/overlays/dev/ingress.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kustomize-guestbook/overlays/dev/ingress.yaml b/kustomize-guestbook/overlays/dev/ingress.yaml
index d2a8233..cf3e0af 100644
--- a/kustomize-guestbook/overlays/dev/ingress.yaml
+++ b/kustomize-guestbook/overlays/dev/ingress.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace:
 spec:
   rules:
-  - host: dev-kustomize-guestbook-argocd.natwest-labs.com
+  - host: dev-kustomize-guestbook-argocd-check-deploy.natwest-labs.com
     http:
       paths:
       - backend:

From 3715bf88aa03a442dc666f040847811db97ec2df Mon Sep 17 00:00:00 2001
From: Megha Mehta <mmehta.ten@gmail.com>
Date: Mon, 26 Apr 2021 17:20:56 +0530
Subject: [PATCH 78/78] fix bracket

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0a61847..3bb2ebf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ node {
                sh 'argocd app list'
 //               """
             }
-//      }       
+     }       
     }   
 
       stage('Create app') {
@@ -39,4 +39,4 @@ node {
         }               
     }
 }
-}
+}
\ No newline at end of file