From e8fe3804f856fb5f54084808dcf1fc8e8eeb4223 Mon Sep 17 00:00:00 2001 From: Alex Collins Date: Fri, 3 May 2019 10:37:00 -0700 Subject: [PATCH 1/2] Adds finalizers (#25) --- applications/templates/guestbook.yaml | 2 ++ applications/templates/helm-dependency.yaml | 2 ++ applications/templates/helm-guestbook.yaml | 2 ++ applications/templates/kustomize-guestbook.yaml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/applications/templates/guestbook.yaml b/applications/templates/guestbook.yaml index 1fe376b..3f00024 100644 --- a/applications/templates/guestbook.yaml +++ b/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 diff --git a/applications/templates/helm-dependency.yaml b/applications/templates/helm-dependency.yaml index 9c1e4a8..f4528db 100644 --- a/applications/templates/helm-dependency.yaml +++ b/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 diff --git a/applications/templates/helm-guestbook.yaml b/applications/templates/helm-guestbook.yaml index 58b99f0..1044122 100644 --- a/applications/templates/helm-guestbook.yaml +++ b/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 diff --git a/applications/templates/kustomize-guestbook.yaml b/applications/templates/kustomize-guestbook.yaml index 9c52bc1..f07e883 100644 --- a/applications/templates/kustomize-guestbook.yaml +++ b/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 From 35ca7c333d593a6f56e3c9ec1a6facd19fd9f4a0 Mon Sep 17 00:00:00 2001 From: Alexander Matyushentsev Date: Fri, 3 May 2019 16:05:25 -0700 Subject: [PATCH 2/2] Update README.md (#26) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f4f2474..1be07ab 100644 --- a/README.md +++ b/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) |