Merge branch 'master' into sync-wave

README.md

@@ -10,7 +10,7 @@ to explore ArgoCD and GitOps!
 | [ksonnet-guestbook](ksonnet-guestbook/) | The guestbook application as a ksonnet app |
 | [helm-guestbook](helm-guestbook/) | The guestbook application as a Helm chart |
 | [jsonnet-guestbook](jsonnet-guestbook/) | The guestbook application as a raw jsonnet |
-| [kustomize2-guestbook](kustomize-guestbook/) | The guestbook application as a Kustomize 2 app |
+| [kustomize-guestbook](kustomize-guestbook/) | The guestbook application as a Kustomize 2 app |
 | [pre-post-sync](pre-post-sync/) | Demonstrates Argo CD PreSync and PostSync hooks |
 | [helm-dependency](helm-dependency/) | Demonstrates how to customize an OTS (off-the-shelf) helm chart from an upstream repo |
 | [sock-shop](sock-shop/) | A microservices demo application (https://microservices-demo.github.io) |

applications/templates/guestbook.yaml

@@ -3,6 +3,8 @@ kind: Application
 metadata:
   name: guestbook
   namespace: argocd
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
 spec:
   destination:
     namespace: argocd

applications/templates/helm-dependency.yaml

@@ -3,6 +3,8 @@ kind: Application
 metadata:
   name: helm-dependency
   namespace: argocd
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
 spec:
   destination:
     namespace: argocd

applications/templates/helm-guestbook.yaml

@@ -3,6 +3,8 @@ kind: Application
 metadata:
   name: helm-guestbook
   namespace: argocd
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
 spec:
   destination:
     namespace: argocd

applications/templates/kustomize-guestbook.yaml

@@ -3,6 +3,8 @@ kind: Application
 metadata:
   name: kustomize-guestbook
   namespace: argocd
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
 spec:
   destination:
     namespace: argocd