Skip to content

shellcheck fixes for helmdiff.sh #3551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janisz merged 1 commit into from
Oct 26, 2022
Merged

shellcheck fixes for helmdiff.sh #3551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions dev-tools/helmdiff.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ echo "Generating temporary files in ${TMP_ROOT}"

echo "Rendering from metatemplates to helm charts:"
for CHART in ${CHARTS}; do
$ROXCTL helm output --debug --remove ${CHART} --output-dir="${TMP_ROOT}/${CHART}-new"
$ROXCTL helm output --debug --remove "${CHART}" --output-dir="${TMP_ROOT}/${CHART}-new"
done

REPO_STAT="$(git diff --stat)"
Expand All @@ -24,9 +24,9 @@ if [[ -n $REPO_STAT ]]; then
fi
git switch master
for CHART in ${CHARTS}; do
$ROXCTL helm output --debug --remove ${CHART} --output-dir="${TMP_ROOT}/${CHART}-old"
$ROXCTL helm output --debug --remove "${CHART}" --output-dir="${TMP_ROOT}/${CHART}-old"
done
git switch ${WORKING_BRANCH}
git switch "${WORKING_BRANCH}"
if [[ -n $REPO_STAT ]]; then
echo "Restoring uncommitted changes with 'git stash pop'."
git stash pop
Expand All @@ -38,8 +38,8 @@ for VERSION in "old" "new"; do
-n stackrox \
--disable-openapi-validation \
stackrox-central-services \
${TMP_ROOT}/central-services-${VERSION} \
> ${TMP_ROOT}/central-services-${VERSION}-installation.yaml
"${TMP_ROOT}"/central-services-${VERSION} \
> "${TMP_ROOT}"/central-services-${VERSION}-installation.yaml
done

echo "Rendering a dry run installation of the stackrox-secured-cluster-services helm charts as Kubernetes manifests:"
Expand All @@ -53,8 +53,8 @@ for VERSION in "old" "new"; do
--set serviceTLS.key=c3 \
--set createSecrets=false \
stackrox-secured-cluster-services \
${TMP_ROOT}/secured-cluster-services-${VERSION} \
> ${TMP_ROOT}/secured-cluster-services-${VERSION}-installation.yaml
"${TMP_ROOT}"/secured-cluster-services-${VERSION} \
> "${TMP_ROOT}"/secured-cluster-services-${VERSION}-installation.yaml
done

cat <<EOF
Expand Down
1 change: 0 additions & 1 deletion scripts/style/shellcheck_skip.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ deploy/openshift/deploy.sh
deploy/openshift/sensor.sh
dev-tools/add-host-alias.sh
dev-tools/enable-hotreload.sh
dev-tools/helmdiff.sh
dev-tools/roxctl.sh
image/assets/docker-auth.sh
image/central-entrypoint.sh
Expand Down