Skip to content

Commit

Permalink
[DATALAD RUNCMD] Apply autopatch from shellcheck
Browse files Browse the repository at this point in the history
=== Do not change lines below ===
{
 "chain": [],
 "cmd": "shellcheckit autopatch",
 "exit": 0,
 "extra_inputs": [],
 "inputs": [],
 "outputs": [],
 "pwd": "."
}
^^^ Do not change lines above ^^^
  • Loading branch information
yarikoptic committed Mar 3, 2025
1 parent d87dde7 commit 0f41dd3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions cleanup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fi
echo "Initializing ..."
terraform init -backend-config="$BACKEND_FILE" -var-file="$VARFILE" || echo "\"terraform init\" failed"

terraform workspace select $ENV
terraform workspace select "$ENV"

targets=(
"module.eks_data_addons"
Expand All @@ -53,7 +53,7 @@ fi

for ns in $terminating_namespaces; do
echo "Terminating namespace: $ns"
kubectl get namespace $ns -o json | sed 's/"kubernetes"//' | kubectl replace --raw "/api/v1/namespaces/$ns/finalize" -f -
kubectl get namespace "$ns" -o json | sed 's/"kubernetes"//' | kubectl replace --raw "/api/v1/namespaces/$ns/finalize" -f -
done

#-------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ source ./scripts/ensure-vars.sh

ENV=$1

./scripts/account-enforcer.sh $ENV
./scripts/account-enforcer.sh "$ENV"

# TODO preface all env vars
ENV_DIR="envs/$ENV"
Expand All @@ -38,7 +38,7 @@ if [ ! -d "$ENV_DIR" ]; then
exit 1
fi

./scripts/merge_config.py $BASE_CONFIG $ENV_OVERRIDE $OUTPUT
./scripts/merge_config.py $BASE_CONFIG "$ENV_OVERRIDE" "$OUTPUT"

yamllint -d "{extends: default, rules: {line-length: disable, document-start: disable}}" "$OUTPUT"
if [ $? -ne 0 ]; then
Expand All @@ -62,7 +62,7 @@ fi
# Initialize Terraform with environment-provided backend configuration
echo "Initializing $ENV..."
terraform init -reconfigure -backend-config="$ENV_DIR/s3.tfbackend" -var-file="$VARFILE"
terraform workspace select -or-create $ENV
terraform workspace select -or-create "$ENV"

# From here forward, we should continue even if there is a failure
set +e
Expand Down

0 comments on commit 0f41dd3

Please sign in to comment.