diff --git a/charts/argocd-understack/templates/_helpers.tpl b/charts/argocd-understack/templates/_helpers.tpl index c6a6213e8..576bb74b2 100644 --- a/charts/argocd-understack/templates/_helpers.tpl +++ b/charts/argocd-understack/templates/_helpers.tpl @@ -108,10 +108,10 @@ Examples: deploy_path_prefix: "us/east" -> "us/east/uc-iad3-prod" Usage in valueFiles: - - $deploy/{{ include "understack.deploy_path" $ }}/manifests/dex/values.yaml + - $deploy/{{ include "understack.deploy_path" $ }}/dex/values.yaml Usage in source path: - path: {{ include "understack.deploy_path" $ }}/manifests/dex + path: {{ include "understack.deploy_path" $ }}/dex */}} {{- define "understack.deploy_path" -}} {{- if .Values.deploy_path_prefix -}} diff --git a/charts/argocd-understack/templates/application-monitoring.tpl b/charts/argocd-understack/templates/application-monitoring.tpl index 689d1cd14..7ceb445a6 100644 --- a/charts/argocd-understack/templates/application-monitoring.tpl +++ b/charts/argocd-understack/templates/application-monitoring.tpl @@ -23,14 +23,14 @@ spec: releaseName: kube-prometheus-stack valueFiles: - $understack/operators/monitoring/values.yaml - - $deploy/{{ include "understack.deploy_path" $ }}/manifests/monitoring/values.yaml + - $deploy/{{ include "understack.deploy_path" $ }}/monitoring/values.yaml repoURL: https://prometheus-community.github.io/helm-charts targetRevision: 79.5.0 - path: operators/monitoring ref: understack repoURL: {{ include "understack.understack_url" $ }} targetRevision: {{ include "understack.understack_ref" $ }} - - path: {{ include "understack.deploy_path" $ }}/manifests/monitoring + - path: {{ include "understack.deploy_path" $ }}/monitoring ref: deploy repoURL: {{ include "understack.deploy_url" $ }} targetRevision: {{ include "understack.deploy_ref" $ }} diff --git a/charts/argocd-understack/values.yaml b/charts/argocd-understack/values.yaml index 4db99fd19..24e7506fb 100644 --- a/charts/argocd-understack/values.yaml +++ b/charts/argocd-understack/values.yaml @@ -23,7 +23,7 @@ deploy_ref: HEAD # -- Optional prefix for the deployment repository path. When set, the path # becomes "/" instead of just "". -# Example: "sites" would result in "sites/uc-iad3-prod/manifests/..." +# Example: "sites" would result in "sites/uc-iad3-prod/..." # @default -- "" (no prefix, just Release.Name) deploy_path_prefix: