Skip to content

🌱 remove 'function' from function defs in bash scripts #1559

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
merged 1 commit into from
Jan 9, 2025
Merged

🌱 remove 'function' from function defs in bash scripts #1559

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
2 changes: 1 addition & 1 deletion hack/tools/catalogs/generate-manifests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ assert-container-runtime
# Check required tools are installed
assert-commands jq

function usage() {
usage() {
print-banner
echo ""
echo "Usage:"
Expand Down
12 changes: 6 additions & 6 deletions hack/tools/catalogs/list-compatible-bundles
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ done
shift $((OPTIND -1))

# Select bundle documents
function select-bundle-documents() {
select-bundle-documents() {
jq 'select(.schema == "olm.bundle")'
}

# Select bundles that declare AllNamespace install mode
# or declare nothing at all (older released bundles sans "olm.csv.metadata" property)
function that-support-allnamespace-install-mode() {
that-support-allnamespace-install-mode() {
jq 'select(
all(.properties[].type; . != "olm.csv.metadata") or
(.properties[]? |
Expand All @@ -65,23 +65,23 @@ function that-support-allnamespace-install-mode() {
}

# Select bundles without dependencies
function that-dont-have-dependencies() {
that-dont-have-dependencies() {
jq 'select(all(.properties[].type; . != "olm.package.required" and . != "olm.gvk.required"))'
}

# Select the "olm.package" property from the bundles
# This contains the packageName and version information
function extract-olm-package-property() {
extract-olm-package-property() {
jq '.properties[] | select(.type == "olm.package") |.value'
}

# Group packages by name and collect versions into an array
function group-versions-by-package-name() {
group-versions-by-package-name() {
jq -s 'group_by(.packageName) | map({packageName: .[0].packageName, versions: map(.version)})'
}

# Apply regex on name
function filter-by-regex-if-necessary() {
filter-by-regex-if-necessary() {
jq --arg regex "$REGEX" '
if $regex != "" then
map(select(.packageName | test($regex)))
Expand Down
6 changes: 3 additions & 3 deletions scripts/install.tpl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,23 @@ if [[ -z "$catalogd_version" || -z "$cert_mgr_version" ]]; then
exit 1
fi

function kubectl_wait() {
kubectl_wait() {
namespace=$1
runtime=$2
timeout=$3

kubectl wait --for=condition=Available --namespace="${namespace}" "${runtime}" --timeout="${timeout}"
}

function kubectl_wait_rollout() {
kubectl_wait_rollout() {
namespace=$1
runtime=$2
timeout=$3

kubectl rollout status --namespace="${namespace}" "${runtime}" --timeout="${timeout}"
}

function kubectl_wait_for_query() {
kubectl_wait_for_query() {
manifest=$1
query=$2
timeout=$3
Expand Down
Loading