diff --git a/bootstrap.sh b/bootstrap.sh index 381dfbd..89b3010 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -7,7 +7,7 @@ CLUSTER="${1:?Usage: ./bootstrap.sh (eu|us)}" echo "running $0 for cluster: ${CLUSTER}..." # Source cluster config -eval $(yq e 'to_entries | .[] | "export " + .key + "=\"" + .value + "\""' "clusters/${CLUSTER}.yaml") +eval $(yq -r 'to_entries[] | "export \(.key)=\"\(.value)\""' "clusters/${CLUSTER}.yaml") echo "Bootstrapping cluster: ${clusterName} (${CLUSTER})..." @@ -27,8 +27,8 @@ Bootstrap() Github() { echo "Installing secret..." - kubectl apply -f private/github.yaml - kubectl apply -f private/main.key + kubectl apply -f private/github-${CLUSTER}.yaml + kubectl apply -f private/main-${CLUSTER}.key } ############################################################ @@ -49,4 +49,4 @@ ArgoCd() kubectl apply -f "_app-of-apps-${CLUSTER}.yaml" -n argocd } -Bootstrap +# Bootstrap diff --git a/clusters/eu.yaml b/clusters/eu.yaml index 8c02662..4813591 100644 --- a/clusters/eu.yaml +++ b/clusters/eu.yaml @@ -1,4 +1,4 @@ -clusterName: dev-fd-eu-no-svg1 +clusterName: dev-fd-no-svg1 domain: forteapps.net argocdDomain: argocd.127.0.0.1.nip.io grafanaDomain: grafana.forteapps.net