Clean-up (argoproj#35)

agaudreault · Aug 14, 2019 · 6150e82 · 6150e82
1 parent 08836bd
commit 6150e82
Show file tree

Hide file tree

Showing 16 changed files with 9 additions and 255 deletions.
diff --git a/README.md b/README.md
@@ -6,17 +6,16 @@ to explore ArgoCD and GitOps!
 
 | Application | Description |
 |-------------|-------------|
-| [guestbook](guestbook/) | A hello word guestbook application as plain YAML |
-| [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 |
-| [jsonnet-guestbook-tla](jsonnet-guestbook-tla/) | The guestbook application as a raw jsonnet with support for top level arguments |
-| [kustomize-guestbook](kustomize-guestbook/) | The guestbook application as a Kustomize 2 app |
+| [guestbook](guestbook/) | A hello word guestbook app as plain YAML |
+| [ksonnet-guestbook](ksonnet-guestbook/) | The guestbook app as a ksonnet app |
+| [helm-guestbook](helm-guestbook/) | The guestbook app as a Helm chart |
+| [jsonnet-guestbook](jsonnet-guestbook/) | The guestbook app as a raw jsonnet |
+| [jsonnet-guestbook-tla](jsonnet-guestbook-tla/) | The guestbook app as a raw jsonnet with support for top level arguments |
+| [kustomize-guestbook](kustomize-guestbook/) | The guestbook app as a Kustomize 2 app |
 | [pre-post-sync](pre-post-sync/) | Demonstrates Argo CD PreSync and PostSync hooks |
 | [sync-waves](sync-waves/) | Demonstrates Argo CD sync waves with 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) |
-| [plugins](plugins/) | Applications which demonstrate config management plugins usage |
+| [sock-shop](sock-shop/) | A microservices demo app (https://microservices-demo.github.io) |
+| [plugins](plugins/) | Apps which demonstrate config management plugins usage |
 | [blue-green](blue-green/) | Demonstrates how to implement blue-green deployment using [Argo Rollouts](https://github.com/argoproj/argo-rollouts)
-| [applications](applications/) | An application composed of other applications |
-| [applications-helm](applications-helm/) | Demonstrates application composed of other applications using Helm chart and value files |
+| [apps](apps/) | An app composed of other apps |
diff --git a/applications-helm/Chart.yaml b/applications-helm/Chart.yaml
diff --git a/applications-helm/templates/_helpers.tpl b/applications-helm/templates/_helpers.tpl
diff --git a/applications-helm/templates/applications.yaml b/applications-helm/templates/applications.yaml
diff --git a/applications-helm/templates/argocd-cm.yaml b/applications-helm/templates/argocd-cm.yaml
diff --git a/applications-helm/templates/argocd-rbac-cm.yaml b/applications-helm/templates/argocd-rbac-cm.yaml
diff --git a/applications-helm/templates/project.yaml b/applications-helm/templates/project.yaml
diff --git a/applications-helm/values-global.yaml b/applications-helm/values-global.yaml
diff --git a/applications-helm/values-production.yaml b/applications-helm/values-production.yaml
diff --git a/applications-helm/values-staging.yaml b/applications-helm/values-staging.yaml
diff --git a/applications/Chart.yaml → apps/Chart.yaml b/applications/Chart.yaml → apps/Chart.yaml
diff --git a/applications/templates/guestbook.yaml → apps/templates/guestbook.yaml b/applications/templates/guestbook.yaml → apps/templates/guestbook.yaml
diff --git a/applications/templates/helm-dependency.yaml → apps/templates/helm-dependency.yaml b/applications/templates/helm-dependency.yaml → apps/templates/helm-dependency.yaml
diff --git a/applications/templates/helm-guestbook.yaml → apps/templates/helm-guestbook.yaml b/applications/templates/helm-guestbook.yaml → apps/templates/helm-guestbook.yaml
diff --git a/...ations/templates/kustomize-guestbook.yaml → apps/templates/kustomize-guestbook.yaml b/...ations/templates/kustomize-guestbook.yaml → apps/templates/kustomize-guestbook.yaml
diff --git a/applications/values.yaml → apps/values.yaml b/applications/values.yaml → apps/values.yaml