Skip to content

Add bump_major support for chart version bumps when webhook minor version increases #1193

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

Draft
Copilot wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Add bump_major support for chart version bumps when webhook minor version increases #1193

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc84cf4
Initial plan
Copilot Nov 28, 2025
2dbfa6b
Add bump_major support for chart major version bumps when webhook min…
Copilot Nov 28, 2025
8e8b91a
Address PR review feedback: make bump_major required and simplify min…
Copilot Nov 28, 2025
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
10 changes: 9 additions & 1 deletion .github/workflows/release-charts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ on:
description: "New Webhook version (eg: v0.10.0-rc.14)"
required: true
default: ""
bump_major:
description: "Set 'true' to bump chart major version when the Webhook minor version increases (e.g., v0.5.0 → v0.6.0-rc.0). Default: false"
required: false
default: "false"
type: choice
options:
- "true"
- "false"

env:
CHARTS_REF: ${{ github.event.inputs.charts_ref }}
Expand Down Expand Up @@ -78,7 +86,7 @@ jobs:
BRANCH="bump-webhook-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
echo "BRANCH=${BRANCH}" >> $GITHUB_ENV
git checkout -b "$BRANCH" "$CHARTS_REF"
../webhook/.github/workflows/scripts/release-against-charts.sh . "$PREV_WEBHOOK" "$NEW_WEBHOOK"
../webhook/.github/workflows/scripts/release-against-charts.sh . "$PREV_WEBHOOK" "$NEW_WEBHOOK" ${{ github.event.inputs.bump_major }}

- name: Push and create pull request
env:
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/release-rancher.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ on:
description: "New Webhook version (eg: v0.5.0-rc.14)"
required: true
default: ""
bump_major:
description: "Set 'true' to bump chart major version when the Webhook minor version increases (e.g., v0.5.0 → v0.6.0-rc.0). Default: false"
required: false
default: "false"
type: choice
options:
- "true"
- "false"

env:
RANCHER_REF: ${{ github.event.inputs.rancher_ref }}
Expand Down Expand Up @@ -108,7 +116,7 @@ jobs:
BRANCH="bump-webhook-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
echo "BRANCH=${BRANCH}" >> $GITHUB_ENV
git checkout -b "$BRANCH" "$RANCHER_REF"
../webhook/.github/workflows/scripts/release-against-rancher.sh . "$NEW_WEBHOOK"
../webhook/.github/workflows/scripts/release-against-rancher.sh . "$NEW_WEBHOOK" ${{ github.event.inputs.bump_major }}

- name: Push and create pull request
env:
Expand Down
67 changes: 60 additions & 7 deletions .github/workflows/scripts/release-against-charts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,39 @@
# Bumps Webhook version in a locally checked out rancher/charts repository
#
# Usage:
# ./release-against-charts.sh <path to charts repo> <prev webhook release> <new webhook release>
# ./release-against-charts.sh <path to charts repo> <prev webhook release> <new webhook release> [bump major]
#
# Example:
# ./release-against-charts.sh "${GITHUB_WORKSPACE}" "v0.5.0-rc.13" "v0.5.0-rc.14"
# ./release-against-charts.sh "${GITHUB_WORKSPACE}" "v0.5.0-rc.13" "v0.5.0-rc.14" false

CHARTS_DIR=$1
PREV_WEBHOOK_VERSION=$2 # e.g. v0.5.2-rc.3
NEW_WEBHOOK_VERSION=$3 # e.g. v0.5.2-rc.4
PREV_WEBHOOK_VERSION="$2" # e.g. 0.5.0-rc.13
NEW_WEBHOOK_VERSION="$3" # e.g. 0.5.0-rc.14
BUMP_MAJOR="${4:-false}" # default false if not given

usage() {
cat <<EOF
Usage:
$0 <path to charts repo> <prev webhook release> <new webhook release>
$0 <path to charts repo> <prev webhook release> <new webhook release> [bump_major]

Arguments:
<path to charts repo> Path to locally checked out charts repo
<prev webhook release> Previous rancher-webhook version (e.g. v0.5.0-rc.13)
<new webhook release> New rancher-webhook version (e.g. v0.5.0-rc.14, v0.5.0, v0.6.0-rc.0)
<bump_major> Optional. Must be "true" if introducing a new webhook minor version.
Example: v0.5.0 → v0.6.0-rc.0 requires bump_major=true.

Examples:
RC to RC: $0 ./charts v0.5.0-rc.0 v0.5.0-rc.1
RC to stable: $0 ./charts v0.5.0-rc.0 v0.5.0
stable to RC: $0 ./charts v0.5.0 v0.5.1-rc.1
new minor RC: $0 ./charts v0.5.0 v0.6.0-rc.0 true # bump chart major
EOF
}

# Bumps the patch version of a semver version string
# e.g. 1.2.3 -> 1.2.4
# e.g. 1.2.3-rc.4 -> 1.2.4
bump_patch() {
version=$1
major=$(echo "$version" | cut -d. -f1)
Expand All @@ -28,6 +45,17 @@ bump_patch() {
echo "${major}.${minor}.${new_patch}"
}

# Bumps the major version of a semver version string and resets minor and patch to 0
# e.g. 1.2.3 -> 2.0.0
# e.g. 1.2.3-rc.4 -> 2.0.0
bump_major() {
version=$1
major=$(echo "$version" | cut -d. -f1)
new_major=$((major + 1))
echo "${new_major}.0.0"
}

# Validates that the version is in the format v<major>.<minor>.<patch> or v<major>.<minor>.<patch>-rc.<number>
validate_version_format() {
version=$1
if ! echo "$version" | grep -qE '^v[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$'; then
Expand Down Expand Up @@ -59,6 +87,18 @@ fi
PREV_WEBHOOK_VERSION_SHORT=$(echo "$PREV_WEBHOOK_VERSION" | sed 's|^v||') # e.g. 0.5.2-rc.3
NEW_WEBHOOK_VERSION_SHORT=$(echo "$NEW_WEBHOOK_VERSION" | sed 's|^v||') # e.g. 0.5.2-rc.4

# Extract base versions without -rc suffix
prev_base=$(echo "$PREV_WEBHOOK_VERSION_SHORT" | sed 's/-rc.*//')
new_base=$(echo "$NEW_WEBHOOK_VERSION_SHORT" | sed 's/-rc.*//')

prev_minor=$(echo "$prev_base" | cut -d. -f2)
new_minor=$(echo "$new_base" | cut -d. -f2)

is_new_minor=false
if [ "$new_minor" -gt "$prev_minor" ]; then
is_new_minor=true
fi

set -ue

cd "${CHARTS_DIR}"
Expand All @@ -77,17 +117,30 @@ if ! PREV_CHART_VERSION=$(yq '.version' ./packages/rancher-webhook/package.yaml)
exit 1
fi

if [ "$is_prev_rc" = "false" ]; then
# Determine new chart version
if [ "$is_new_minor" = "true" ]; then
if [ "$BUMP_MAJOR" != "true" ]; then
echo "Error: Detected new minor bump ($PREV_WEBHOOK_VERSION to $NEW_WEBHOOK_VERSION), but bump_major flag was not set."
exit 1
fi
echo "Bumping chart major: $PREV_CHART_VERSION to $(bump_major "$PREV_CHART_VERSION")"
NEW_CHART_VERSION=$(bump_major "$PREV_CHART_VERSION")
COMMIT_MSG="Bump rancher-webhook to $NEW_WEBHOOK_VERSION (chart version major bump)"
elif [ "$is_prev_rc" = "false" ]; then
echo "Bumping chart patch: $PREV_CHART_VERSION to $(bump_patch "$PREV_CHART_VERSION")"
NEW_CHART_VERSION=$(bump_patch "$PREV_CHART_VERSION")
COMMIT_MSG="Bump rancher-webhook to $NEW_WEBHOOK_VERSION (chart version patch bump)"
else
echo "Keeping chart version unchanged: $PREV_CHART_VERSION"
NEW_CHART_VERSION=$PREV_CHART_VERSION
COMMIT_MSG="Bump rancher-webhook to $NEW_WEBHOOK_VERSION (no chart version bump)"
fi

sed -i "s/${PREV_WEBHOOK_VERSION_SHORT}/${NEW_WEBHOOK_VERSION_SHORT}/g" ./packages/rancher-webhook/package.yaml
sed -i "s/${PREV_CHART_VERSION}/${NEW_CHART_VERSION}/g" ./packages/rancher-webhook/package.yaml

git add packages/rancher-webhook
git commit -m "Bump rancher-webhook to $NEW_WEBHOOK_VERSION"
git commit -m "$COMMIT_MSG"

PACKAGE=rancher-webhook make charts
git add ./assets/rancher-webhook ./charts/rancher-webhook index.yaml
Expand Down
60 changes: 55 additions & 5 deletions .github/workflows/scripts/release-against-rancher.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,37 @@
# Bumps Webhook version in a locally checked out rancher/rancher repository
#
# Usage:
# ./release-against-rancher.sh <path to rancher repo> <new webhook release>
# ./release-against-rancher.sh <path to rancher repo> <new webhook release> [bump_major]
#
# Example:
# ./release-against-charts.sh "${GITHUB_WORKSPACE}" "v0.5.0-rc.14"
# ./release-against-rancher.sh "${GITHUB_WORKSPACE}" "v0.5.0-rc.14" false

RANCHER_DIR=$1
NEW_WEBHOOK_VERSION=$2 # e.g. v0.5.2-rc.3
BUMP_MAJOR=${3:-false} # default false if not given

usage() {
cat <<EOF
Usage:
$0 <path to rancher repo> <new webhook release>
$0 <path to rancher repo> <new webhook release> [bump_major]

Arguments:
<path to rancher repo> Path to locally checked out rancher repo
<new webhook release> New Webhook version (e.g. v0.5.0-rc.14, v0.5.0, v0.6.0-rc.0)
<bump_major> Optional. Set 'true' if introducing a new Webhook minor version.
Example: v0.5.0 → v0.6.0-rc.0 requires bump_major=true.

Examples:
RC to RC: $0 ./rancher v0.5.0-rc.1
RC to stable: $0 ./rancher v0.5.0
stable → RC: $0 ./rancher v0.5.1-rc.0
new minor RC: $0 ./rancher v0.6.0-rc.0 true
EOF
}

# Bumps the patch version of a semver version string
# e.g. 1.2.3 -> 1.2.4
# e.g. 1.2.3-rc.4 -> 1.2.4
bump_patch() {
version=$1
major=$(echo "$version" | cut -d. -f1)
Expand All @@ -27,6 +43,18 @@ bump_patch() {
echo "${major}.${minor}.${new_patch}"
}

# Bumps the major version of a semver version string and resets minor and patch to 0
# e.g. 1.2.3 -> 2.0.0
# e.g. 1.2.3-rc.4 -> 2.0.0
bump_major() {
version=$1
major=$(echo "$version" | cut -d. -f1)
# Increment major, reset minor/patch to 0
new_major=$((major + 1))
echo "${new_major}.0.0"
}

# Validates that the version is in the format v<major>.<minor>.<patch> or v<major>.<minor>.<patch>-rc.<number>
validate_version_format() {
version=$1
if ! echo "$version" | grep -qE '^v[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$'; then
Expand Down Expand Up @@ -56,6 +84,17 @@ if ! PREV_WEBHOOK_VERSION_SHORT=$(yq -r '.webhookVersion' ./build.yaml | sed 's|
exit 1
fi

prev_base=$(echo "$PREV_WEBHOOK_VERSION_SHORT" | sed 's/-rc.*//')
new_base=$(echo "$NEW_WEBHOOK_VERSION_SHORT" | sed 's/-rc.*//')

prev_minor=$(echo "$prev_base" | cut -d. -f2)
new_minor=$(echo "$new_base" | cut -d. -f2)

is_new_minor=false
if [ "$new_minor" -gt "$prev_minor" ]; then
is_new_minor=true
fi

if [ "$PREV_WEBHOOK_VERSION_SHORT" = "$NEW_WEBHOOK_VERSION_SHORT" ]; then
echo "Previous and new webhook version are the same: $NEW_WEBHOOK_VERSION, but must be different"
exit 1
Expand All @@ -74,10 +113,21 @@ if ! PREV_CHART_VERSION=$(yq -r '.webhookVersion' ./build.yaml | cut -d+ -f1); t
exit 1
fi

if [ "$is_prev_rc" = "false" ]; then
# Determine new chart version
if [ "$is_new_minor" = "true" ]; then
if [ "$BUMP_MAJOR" != "true" ]; then
echo "Error: Detected new minor bump ($PREV_WEBHOOK_VERSION_SHORT → $NEW_WEBHOOK_VERSION_SHORT), but bump_major flag was not set."
exit 1
fi
echo "Bumping chart major: $PREV_CHART_VERSION → $(bump_major "$PREV_CHART_VERSION")"
NEW_CHART_VERSION=$(bump_major "$PREV_CHART_VERSION")
COMMIT_MSG="Bump webhook to ${NEW_CHART_VERSION}+up${NEW_WEBHOOK_VERSION_SHORT} (chart version major bump)"
elif [ "$is_prev_rc" = "false" ]; then
NEW_CHART_VERSION=$(bump_patch "$PREV_CHART_VERSION")
COMMIT_MSG="Bump webhook to ${NEW_CHART_VERSION}+up${NEW_WEBHOOK_VERSION_SHORT} (chart version patch bump)"
else
NEW_CHART_VERSION=$PREV_CHART_VERSION
COMMIT_MSG="Bump webhook to ${NEW_CHART_VERSION}+up${NEW_WEBHOOK_VERSION_SHORT} (no chart version bump)"
fi

yq --inplace ".webhookVersion = \"${NEW_CHART_VERSION}+up${NEW_WEBHOOK_VERSION_SHORT}\"" ./build.yaml
Expand All @@ -90,6 +140,6 @@ DAPPER_MODE=bind ./.dapper go generate ./... || true
DAPPER_MODE=bind ./.dapper rm -rf go .config

git add .
git commit -m "Bump webhook to ${NEW_CHART_VERSION}+up${NEW_WEBHOOK_VERSION_SHORT}"
git commit -m "$COMMIT_MSG"

popd > /dev/null