Merge pull request #360 from claudiol/common-automatic-update

Automatic common/ update
validatedpatterns · Apr 17, 2024 · ffe8f3d · ffe8f3d
2 parents a419ec4 + b9009e3
commit ffe8f3d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/common/clustergroup/Chart.yaml b/common/clustergroup/Chart.yaml
@@ -3,4 +3,4 @@ description: A Helm chart to create per-clustergroup ArgoCD applications and any
 keywords:
 - pattern
 name: clustergroup
-version: 0.8.2
+version: 0.8.3
diff --git a/common/clustergroup/templates/_helpers.tpl b/common/clustergroup/templates/_helpers.tpl
@@ -164,7 +164,7 @@ metadata:
   name: {{ $k }}
   {{- if ne $v nil }}
   labels:
-    argocd.argoproj.io/managed-by: {{ $patternName }}-{{ .clusterGroupName }}
+    argocd.argoproj.io/managed-by: {{ $patternName }}-{{ $clusterGroupName }}
     {{- if $v.labels }}
     {{- range $key, $value := $v.labels }} {{- /* We loop here even though the map has always just one key */}}
     {{ $key }}: {{ $value | default "" | quote }}

diff --git a/common/scripts/preview.sh b/common/scripts/preview.sh
@@ -96,6 +96,10 @@ done
 
 if [ $isKustomize == "true" ]; then
     kustomizePath=$(yq ".clusterGroup.applications.$APP.path" values-$SITE.yaml)
+    repoURL=$(yq ".clusterGroup.applications.$APP.repoURL" values-$SITE.yaml)
+    if [[ $repoURL == http* ]] || [[ $repoURL == git@ ]]; then
+         kustomizePath="${repoURL}/${kustomizePath}"
+    fi
     cmd="oc kustomize ${kustomizePath}"
     eval "$cmd"
 else