Skip to content

shell: Apply common linter fixes #259

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
aanm merged 1 commit into from
Jul 22, 2026
Merged

shell: Apply common linter fixes #259

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
6 changes: 3 additions & 3 deletions generate_helm_release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ symbolic_ref() {
main() {
PROJECT="$1"
version="$2"
ersion="$(echo $version | sed -e 's/^v//')"
ersion="${version/v/}"

if [ "$PROJECT" != cilium ] && [ "$PROJECT" != "tetragon" ] ; then
echo "bad project $PROJECT"
Expand All @@ -57,7 +57,7 @@ main() {
default_branch=$(symbolic_ref "refs/remotes/${remote}/HEAD" "${remote}")
if [ "$(symbolic_ref HEAD "${remote}")" != "${default_branch}" ]; then
git stash
git checkout $default_branch
git checkout "$default_branch"
git fetch "${remote}"
git merge --ff-only "${remote}/${default_branch}"
fi
Expand Down Expand Up @@ -108,7 +108,7 @@ main() {
mv "${chart_dir}/${PROJECT}-${ersion}".tgz "${chart_dir}/index.yaml" "${CWD}"
./generate_readme.sh > README.md
git add README.md index.yaml "${PROJECT}-${ersion}".tgz
git commit -s -m "Add ${PROJECT} $version@$(cd ${PROJECT}; git rev-parse HEAD) ⎈"
git commit -s -m "Add ${PROJECT} $version@$(cd "${PROJECT}"; git rev-parse HEAD) ⎈"
}

main "$@"
4 changes: 1 addition & 3 deletions generate_readme.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,8 @@ for version in \
TETRAGON_CHART_DIR="install/kubernetes/tetragon"
MAJOR=$(echo "$version" | cut -d. -f1)
MINOR=$(echo "$version" | cut -d. -f2)
if [ "$MAJOR" -lt 1 ] || ([ "$MAJOR" -eq 1 ] && [ "$MINOR" -lt 1 ]); then
if [ "$MAJOR" -lt 1 ] || { [ "$MAJOR" -eq 1 ] && [ "$MINOR" -lt 1 ]; }; then
TETRAGON_CHART_DIR="install/kubernetes"
fi
echo "* [v$version](https://github.com/cilium/tetragon/releases/tag/v$version) (_[source](https://github.com/cilium/tetragon/tree/v$version/$TETRAGON_CHART_DIR)_)"
done

cat << EOF
14 changes: 7 additions & 7 deletions validate_helm_chart.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ TETRAGON_IMAGE_PATHS=(
# $1 - Helm chart tgz file or OCI chart reference
main() {
CHART="$1"
declare -a HELM_ARGS

if [ -z "$CHART" ]; then
echo "ERROR: Chart argument is required"
Expand All @@ -74,15 +75,14 @@ main() {
exit 1
fi

CHART_REF="$OCI_BASE"
VERSION_FLAG="--version $OCI_VERSION"
HELM_ARGS+=("$OCI_BASE")
HELM_ARGS+=("--version" "$OCI_VERSION")
else
CHART_REF="$CHART"
VERSION_FLAG=""
HELM_ARGS+=("$CHART")
fi

APP=$(helm show chart $VERSION_FLAG "$CHART_REF" | yq e '.name' -)
CHART_VERSION=$(helm show chart $VERSION_FLAG "$CHART_REF" | yq e '.version' -)
APP=$(helm show chart "${HELM_ARGS[@]}" | yq e '.name' -)
CHART_VERSION=$(helm show chart "${HELM_ARGS[@]}" | yq e '.version' -)
if [ "$APP" == "cilium" ]; then
IMAGE_PATHS=("${CILIUM_IMAGE_PATHS[@]}")
elif [ "$APP" == "tetragon" ]; then
Expand All @@ -93,7 +93,7 @@ main() {
fi

for path in "${IMAGE_PATHS[@]}"; do
tag=$(helm show values $VERSION_FLAG --jsonpath "$path" "$CHART_REF")
tag=$(helm show values "${HELM_ARGS[@]}" --jsonpath "$path")
if [ "$tag" == "v$CHART_VERSION" ]; then
echo "SUCCESS: $APP $path=$tag matches chart version $CHART_VERSION"
else
Expand Down
Loading