diff --git a/app-of-apps/app-of-apps.yaml b/app-of-apps/app-of-apps.yaml index e3fbf2e..ef6a618 100644 --- a/app-of-apps/app-of-apps.yaml +++ b/app-of-apps/app-of-apps.yaml @@ -2,17 +2,15 @@ kind: Application metadata: name: simstrup-app-of-apps - namespace: argocd + namespace: simstrup finalizers: - - resources-finalizer.argocd.argoproj.io + - resources-finalizer.argocd.argoproj.io spec: destination: - namespace: argocd - server: https://kubernetes.default.svc + namespace: simstrup + name: in-cluster project: default source: path: apps repoURL: https://gitbucket.simstrup.dk/git/rolf/simstrup-app.git - targetRevision: HEAD - syncPolicy: - automated: {} \ No newline at end of file + targetRevision: HEAD \ No newline at end of file diff --git a/apps/templates/argocd.yaml b/apps/templates/argocd.yaml index c32d80b..0d427e9 100644 --- a/apps/templates/argocd.yaml +++ b/apps/templates/argocd.yaml @@ -3,17 +3,15 @@ kind: Application metadata: name: argocd - namespace: argocd + namespace: default finalizers: - resources-finalizer.argocd.argoproj.io spec: destination: - namespace: {{ .Values.spec.namespace }} + namespace: default server: {{ .Values.spec.destination.server }} project: {{ .Values.spec.project }} source: - path: charts/argocd + chart: charts/argocd repoURL: {{.Values.spec.source.repoURL }} - targetRevision: {{.Values.spec.source.targetRevision }} - syncPolicy: - automated: {} \ No newline at end of file + targetRevision: {{.Values.spec.source.targetRevision }} \ No newline at end of file diff --git a/apps/values.yaml b/apps/values.yaml index c48a3e1..ec05d44 100644 --- a/apps/values.yaml +++ b/apps/values.yaml @@ -5,4 +5,4 @@ repoURL: https://gitbucket.simstrup.dk/git/rolf/simstrup-app.git targetRevision: HEAD project: default - namespace: argocd \ No newline at end of file + namespace: simstrup \ No newline at end of file diff --git a/charts/argocd/values.yaml b/charts/argocd/values.yaml index e17cf11..b2cd21b 100644 --- a/charts/argocd/values.yaml +++ b/charts/argocd/values.yaml @@ -266,7 +266,7 @@ ## List of additional namespaces where applications may be created in and reconciled from. ## The namespace where Argo CD is installed to will always be allowed. ## Set comma-separated list. (e.g. app-team-one, app-team-two) - application.namespaces: "" + application.namespaces: "simstrup, argocd" # Argo CD RBAC policy configuration ## Ref: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/rbac.md diff --git a/template.yaml b/template.yaml new file mode 100644 index 0000000..9f6a5ed --- /dev/null +++ b/template.yaml @@ -0,0 +1,17 @@ +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: appname + namespace: {{ .Values.spec.namespace }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: {{ .Values.spec.namespace }} + server: {{ .Values.spec.destination.server }} + project: {{ .Values.spec.project }} + source: + chart: charts/chartdir + repoURL: {{.Values.spec.source.repoURL }} + targetRevision: {{.Values.spec.source.targetRevision }}