From 4d8d8726f08a7df8c9fbcf225e29f47e7de9dd9a Mon Sep 17 00:00:00 2001 From: Alex Collins Date: Thu, 25 Apr 2019 13:46:24 -0700 Subject: [PATCH] fix --- applications/Chart.yaml | 5 +++++ applications/kustomization.yaml | 4 ---- .../guestbook/app-argocd.yaml => templates/guestbook.yaml} | 6 +++--- applications/values.yaml | 5 +++++ 4 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 applications/Chart.yaml delete mode 100644 applications/kustomization.yaml rename applications/{base/guestbook/app-argocd.yaml => templates/guestbook.yaml} (68%) create mode 100644 applications/values.yaml diff --git a/applications/Chart.yaml b/applications/Chart.yaml new file mode 100644 index 0000000..3510e2a --- /dev/null +++ b/applications/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +appVersion: "1.0" +description: Applications +name: applications +version: 0.1.0 diff --git a/applications/kustomization.yaml b/applications/kustomization.yaml deleted file mode 100644 index 8820cc8..0000000 --- a/applications/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- base/guestbook/app-argocd.yaml diff --git a/applications/base/guestbook/app-argocd.yaml b/applications/templates/guestbook.yaml similarity index 68% rename from applications/base/guestbook/app-argocd.yaml rename to applications/templates/guestbook.yaml index 2832f0b..1fe376b 100644 --- a/applications/base/guestbook/app-argocd.yaml +++ b/applications/templates/guestbook.yaml @@ -6,12 +6,12 @@ metadata: spec: destination: namespace: argocd - server: https://kubernetes.default.svc + server: {{ .Values.spec.destination.server }} project: default source: path: guestbook repoURL: https://github.com/argoproj/argocd-example-apps - targetRevision: HEAD + targetRevision: {{ .Values.spec.source.targetRevision }} syncPolicy: automated: - prune: true \ No newline at end of file + prune: true diff --git a/applications/values.yaml b/applications/values.yaml new file mode 100644 index 0000000..9ad29b7 --- /dev/null +++ b/applications/values.yaml @@ -0,0 +1,5 @@ +spec: + destination: + server: https://kubernetes.default.svc + source: + targretRevision: HEAD \ No newline at end of file