From 2115030a9060ed946e520e785ef1e2d78f23d511 Mon Sep 17 00:00:00 2001 From: Khue Doan Date: Thu, 21 Jul 2022 01:58:00 +0700 Subject: [PATCH] style: fix shellcheck --- bootstrap/root/apply.sh | 6 ++++-- scripts/pxe-logs | 2 +- scripts/vault-root-token | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bootstrap/root/apply.sh b/bootstrap/root/apply.sh index 0994b775..98c15819 100755 --- a/bootstrap/root/apply.sh +++ b/bootstrap/root/apply.sh @@ -1,11 +1,13 @@ #!/bin/sh +VALUES="values.yaml" + curl -fks --connect-timeout 5 https://git.khuedoan.com \ - || extra_args="--values values-seed.yaml" + || VALUES="values-seed.yaml" helm template \ --include-crds \ --namespace argocd \ - ${extra_args} \ + --values "${VALUES}" \ argocd . \ | kubectl apply -n argocd -f - diff --git a/scripts/pxe-logs b/scripts/pxe-logs index 14c0eda8..836517b7 100755 --- a/scripts/pxe-logs +++ b/scripts/pxe-logs @@ -4,4 +4,4 @@ docker compose \ --project-directory ./metal/roles/pxe_server/files/ \ logs \ --follow \ - ${@} + "${@}" diff --git a/scripts/vault-root-token b/scripts/vault-root-token index 9a6924be..72730acf 100755 --- a/scripts/vault-root-token +++ b/scripts/vault-root-token @@ -2,4 +2,4 @@ # Get Vault root token export KUBECONFIG=./metal/kubeconfig.yaml -kubectl get secrets vault-unseal-keys -n vault -o jsonpath={.data.vault-root} | base64 --decode +kubectl get secrets vault-unseal-keys -n vault -o jsonpath='{.data.vault-root}' | base64 --decode