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 01/19] 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 02/19] 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 03/19] 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 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 04/19] 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 05/19] 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 06/19] 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 07/19] 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 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 08/19] 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 09/19] 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 10/19] 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 11/19] 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 12/19] 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 13/19] 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 14/19] 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 15/19] 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 16/19] 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 17/19] 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 18/19] 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 19/19] 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