diff --git a/k8s/argoapps/values/dev/ingresses.yaml b/k8s/argoapps/values/dev/apps.yaml similarity index 100% rename from k8s/argoapps/values/dev/ingresses.yaml rename to k8s/argoapps/values/dev/apps.yaml diff --git a/k8s/argoapps/values/prod/ingresses.yaml b/k8s/argoapps/values/prod/apps.yaml similarity index 100% rename from k8s/argoapps/values/prod/ingresses.yaml rename to k8s/argoapps/values/prod/apps.yaml diff --git a/k8s/argoapps/values/shared/ingresses.yaml b/k8s/argoapps/values/shared/apps.yaml similarity index 100% rename from k8s/argoapps/values/shared/ingresses.yaml rename to k8s/argoapps/values/shared/apps.yaml diff --git a/k8s/argocd/templates/app-self.yaml b/k8s/argocd/templates/app-self.yaml index 609214f..66f5fbf 100644 --- a/k8s/argocd/templates/app-self.yaml +++ b/k8s/argocd/templates/app-self.yaml @@ -57,6 +57,14 @@ spec: helm: valueFiles: - values.yaml + {{ range $path, $_ := .Files.Glob "../argoapps/values/shared/**.yaml" }} + - {{ $path }} + {{ end }} + + {{- $deploymentPath := printf "../argoapps/values/%s/**.yaml" .Values.deployment -}} + {{ range $path, $_ := .Files.Glob $deploymentPath }} + - {{ $path }} + {{ end }} parameters: - name: "deployment" value: {{ .Values.selfapp.deployment | quote }}