diff --git a/k8s/argoapps/templates/_helpers/application.yaml b/k8s/argoapps/templates/_helpers/application.yaml index 5f7f688..d206d6c 100644 --- a/k8s/argoapps/templates/_helpers/application.yaml +++ b/k8s/argoapps/templates/_helpers/application.yaml @@ -9,7 +9,7 @@ spec: source: repoURL: "git@github.com:{{ .Values.gitops.repo }}.git" targetRevision: "{{ .Values.gitops.commit }}" - path: 'k8s/apps/{{ .name }}' + path: '{{ .rootFolder }}/{{ .name }}' helm: valueFiles: - values.yaml diff --git a/k8s/argoapps/templates/argoappset-infrastructure.yaml b/k8s/argoapps/templates/argoappset-infrastructure.yaml index 6e5ff1f..ec6dce4 100644 --- a/k8s/argoapps/templates/argoappset-infrastructure.yaml +++ b/k8s/argoapps/templates/argoappset-infrastructure.yaml @@ -8,6 +8,7 @@ {{- $_ := set $appProps "name" (default $appProps.name (printf "infra-%s" $appName)) -}} {{- $_ := set $appProps "project" (default $appProps.project $argoappsetInfra) -}} {{- $_ := set $appProps "namespace" (default $appProps.namespace $appName) -}} + {{- $_ := set $appProps "rootFolder" "k8s/infrastructure" -}} {{- if (not $appProps.disabled) -}} {{- if $appProps.createNamespace -}}