From 0fd1839ca5150a836df61723646867d31f396534 Mon Sep 17 00:00:00 2001
From: ties <ties@noreply.git.ties.one>
Date: Fri, 6 Sep 2024 10:40:38 +0000
Subject: [PATCH] Update createServiceAccount.sh

---
 createServiceAccount.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/createServiceAccount.sh b/createServiceAccount.sh
index 2741f32..bcac653 100644
--- a/createServiceAccount.sh
+++ b/createServiceAccount.sh
@@ -1,16 +1,17 @@
 #!/bin/bash
 
-NAMESPACE=$(yq e '.chart_template.namespace' values.yaml)
-SA_NAME="${NAMESPACE}-cicd"
-
+NAMESPACE="default"
 HELM_OUTPUT=""
 if [ -e "Chart.yaml" ]; then
+  NAMESPACE=$(yq e '.chart_template.namespace' values.yaml)
   helm dependency build .
   HELM_OUTPUT=$(helm template -g --set-json="chart_template.subchartData=$(yq '.dependencies[] | select(.condition == "subchart")' Chart.yaml -ojson | jq -rc)" .)
 else
   HELM_OUTPUT=$(cat ./*.yaml)
+  NAMESPACE=$(cat ./*.yaml | yq -ojson | jq -r 'select(.metadata.namespace) | .metadata.namespace' | head -n1)
 fi
 
+SA_NAME="${NAMESPACE}-cicd"
 resources=$(echo "$HELM_OUTPUT" | yq -o=json | jq -rc '{apiVersion, kind}' | sort | uniq)
 
 cat <<EOFFF