feat: add release.sh to bump capmox version references

release.sh always updates clusterctl-settings.json (nextVersion) and
sonar-project.properties (sonar.projectVersion); on a new major.minor it
also appends a releaseSeries entry to metadata.yaml and bumps the capmox
sentinel in test/e2e/config/proxmox-*.yaml. Pre-release suffixes are
preserved in the clusterctl/sonar files and stripped for the metadata
entry and the e2e sentinel (both track major.minor only). The CAPI
contract for a new entry defaults to the contract of the latest existing
entry and can be overridden via an optional second argument.

While here, clean up metadata helper naming per the METADATA_FILE /
E2E_METADATA_FILE convention: metadata_has_release and metadata_add_release
now operate on the top-level metadata.yaml (the capmox release catalog).
The previous e2e-facing variants are renamed to e2emetadata_*. Callers in
bump-capi.sh and verify-versions.sh are updated.

New helpers: clusterctl_get/set_version (JSON via yq), sonar_get/set_version
(line-based), e2econfig_get/set_capmox (yq selects on
InfrastructureProvider).

Fixtures: add clusterctl-settings.json + sonar-project.properties, reorder
metadata.yaml to chronological (newest last) to match the real file, and
add an InfrastructureProvider section to the e2e config fixtures so the
sentinel helpers and release.sh are testable.

Co-authored-by: Claude <noreply@anthropic.com>

Author: wikkyk

hack/bump-capi.sh

@@ -35,8 +35,8 @@ gomod_add_replace "${NEW}" 'sigs.k8s.io/cluster-api'
 
 # ---- test/e2e/data/shared/v1beta1/metadata.yaml ----
 # Add new releaseSeries entry as the first element if not already present.
-if ! metadata_has_release "${CAPI_MAJOR}" "${CAPI_MINOR}"; then
-    metadata_add_release "${CAPI_MAJOR}" "${CAPI_MINOR}" "${CONTRACT}"
+if ! e2emetadata_has_release "${CAPI_MAJOR}" "${CAPI_MINOR}"; then
+    e2emetadata_add_release "${CAPI_MAJOR}" "${CAPI_MINOR}" "${CONTRACT}"
 fi
 
 # ---- test/e2e/config ----

hack/helpers.sh

@@ -272,6 +272,50 @@ customgcl_set_version() {
     fi
 }
 
+# ---- version extraction: release files ----
+
+# clusterctl_get_version returns the capmox nextVersion from
+# clusterctl-settings.json (e.g. "v0.8.1"). Returns empty string if the
+# file does not exist.
+clusterctl_get_version() {
+    local f="${REPO_ROOT}/clusterctl-settings.json"
+    if [[ -f "${f}" ]]; then
+        yq -oy '.config.nextVersion' "${f}"
+    fi
+}
+
+# clusterctl_set_version updates nextVersion in clusterctl-settings.json.
+# The input is the full v-prefixed version (e.g. "v0.8.2" or "v0.9.0-rc.0").
+clusterctl_set_version() {
+    local new="$1" f="${REPO_ROOT}/clusterctl-settings.json" old
+    if [[ -f "${f}" ]]; then
+        old=$(clusterctl_get_version)
+        CLUSTERCTL_NEXT="${new}" yq -i '.config.nextVersion = strenv(CLUSTERCTL_NEXT)' "${f}"
+        if [[ -n "${old}" && "${old}" != "${new}" ]]; then echo "clusterctl-settings.json: Updated nextVersion ${old} to ${new}"; fi
+    fi
+}
+
+# sonar_get_version returns the sonar.projectVersion value from
+# sonar-project.properties (e.g. "0.8.1"). Returns empty string if the file
+# does not exist.
+sonar_get_version() {
+    local f="${REPO_ROOT}/sonar-project.properties"
+    if [[ -f "${f}" ]]; then
+        awk -F= '/^sonar\.projectVersion=/{print $2; exit}' "${f}"
+    fi
+}
+
+# sonar_set_version updates sonar.projectVersion in sonar-project.properties.
+# The input is the bare version string without a v-prefix (e.g. "0.8.2").
+sonar_set_version() {
+    local new="$1" f="${REPO_ROOT}/sonar-project.properties" old
+    if [[ -f "${f}" ]]; then
+        old=$(sonar_get_version)
+        sedi "s/^(sonar\.projectVersion=).+/\1${new}/" "${f}"
+        if [[ -n "${old}" && "${old}" != "${new}" ]]; then echo "sonar-project.properties: Updated sonar.projectVersion ${old} to ${new}"; fi
+    fi
+}
+
 # ---- version extraction: e2e config ----
 
 # E2E config files contain KUBERNETES_VERSION defaults and CAPI provider
@@ -304,6 +348,28 @@ e2econfig_get_capi() {
     yq '.providers[] | select(.type == "CoreProvider") | .versions[0].name' "${E2E_CONFIG_DIR}/proxmox-ci.yaml"
 }
 
+# e2econfig_get_capmox returns the capmox provider sentinel from the first
+# e2e config file (e.g. "v0.8.99"). This sentinel uses the current release
+# major.minor with a fixed .99 patch component to denote "the development
+# version of this series".
+e2econfig_get_capmox() {
+    yq '.providers[] | select(.type == "InfrastructureProvider") | .versions[0].name' "${E2E_CONFIG_DIR}/proxmox-ci.yaml"
+}
+
+# e2econfig_set_capmox updates the capmox provider sentinel in all e2e
+# config files. The input is the target sentinel string (e.g. "v0.9.99").
+e2econfig_set_capmox() {
+    local new="$1" old
+    old=$(e2econfig_get_capmox)
+    if [[ -z "${old}" ]]; then return; fi
+    for f in "${E2E_CONFIG_DIR}/proxmox-ci.yaml" "${E2E_CONFIG_DIR}/proxmox-dev.yaml"; do
+        if [[ -f "${f}" ]]; then
+            E2E_CAPMOX="${new}" yq -i '(.providers[] | select(.type == "InfrastructureProvider") | .versions[0].name) = strenv(E2E_CAPMOX)' "${f}"
+        fi
+    done
+    if [[ "${old}" != "${new}" ]]; then echo "test/e2e/config: Updated capmox ${old} to ${new}"; fi
+}
+
 # e2econfig_set_capi updates the cluster-api provider version in all e2e
 # config files, including both the provider name and download URL.
 e2econfig_set_capi() {
@@ -361,15 +427,34 @@ metadata_latest_contract() {
 }
 
 # metadata_has_release returns 0 (true) when a releaseSeries entry with the
-# given major and minor version already exists in the e2e metadata file.
+# given major and minor version already exists in the top-level metadata.yaml
+# (the capmox release catalog).
 metadata_has_release() {
     local major="$1" minor="$2"
-    yq -e '.releaseSeries[] | select(.major == '"${major}"' and .minor == '"${minor}"')' "${E2E_METADATA_FILE}" > /dev/null 2>&1
+    yq -e '.releaseSeries[] | select(.major == '"${major}"' and .minor == '"${minor}"')' "${METADATA_FILE}" > /dev/null 2>&1
 }
 
-# metadata_add_release prepends a new releaseSeries entry to the e2e metadata
-# file and prints a confirmation message.
+# metadata_add_release appends a new releaseSeries entry to the top-level
+# metadata.yaml (chronological order, newest last) and prints a confirmation
+# message.
 metadata_add_release() {
+    local major="$1" minor="$2" contract="$3"
+    yq -i '.releaseSeries += [{"major": '"${major}"', "minor": '"${minor}"', "contract": "'"${contract}"'"}]' "${METADATA_FILE}"
+    echo "metadata.yaml: Added releaseSeries entry for v${major}.${minor} (${contract})"
+}
+
+# e2emetadata_has_release returns 0 (true) when a releaseSeries entry with
+# the given major and minor version already exists in the e2e metadata file
+# (the CAPI release catalog consumed by e2e tests).
+e2emetadata_has_release() {
+    local major="$1" minor="$2"
+    yq -e '.releaseSeries[] | select(.major == '"${major}"' and .minor == '"${minor}"')' "${E2E_METADATA_FILE}" > /dev/null 2>&1
+}
+
+# e2emetadata_add_release prepends a new releaseSeries entry to the e2e
+# metadata file (reverse-chronological order, newest first) and prints a
+# confirmation message.
+e2emetadata_add_release() {
     local major="$1" minor="$2" contract="$3"
     yq -i '.releaseSeries = [{"major": '"${major}"', "minor": '"${minor}"', "contract": "'"${contract}"'"}] + .releaseSeries' "${E2E_METADATA_FILE}"
     echo "test/e2e/data/shared/v1beta1/metadata.yaml: Added releaseSeries entry for v${major}.${minor} (${contract})"

hack/release.sh

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+# release.sh bumps capmox version references in preparation for a release.
+#
+# Updates:
+#   - clusterctl-settings.json: .config.nextVersion (v-prefixed)
+#   - sonar-project.properties: sonar.projectVersion (no v-prefix)
+#
+# For new major.minor versions (not yet listed in metadata.yaml) it also:
+#   - appends a releaseSeries entry to metadata.yaml (CAPI contract defaults
+#     to the contract of the most recent existing entry when not supplied)
+#   - updates the capmox sentinel (name: vX.Y.99) in test/e2e/config/proxmox-*.yaml
+#
+# Pre-release suffixes (-rc.0, -beta.1, ...) are preserved in
+# clusterctl-settings.json and sonar-project.properties but stripped when
+# checking/adding the releaseSeries entry and updating the e2e sentinel
+# (both track major.minor only).
+#
+# Usage:   ./hack/release.sh <version> [<capi-contract>]
+# Example: ./hack/release.sh 0.8.2
+#          ./hack/release.sh 0.9.0 v1beta2
+#          ./hack/release.sh 0.9.0-rc.0
+
+set -euo pipefail
+
+# shellcheck source=hack/helpers.sh
+source "$(dirname "$0")/helpers.sh"
+
+if [[ $# -lt 1 || $# -gt 2 ]]; then
+    echo "Usage: $0 <version> [<capi-contract>]"
+    echo "Example: $0 0.8.2"
+    echo "Example: $0 0.9.0 v1beta2"
+    exit 1
+fi
+
+NEW_FULL=$(ensure_v_prefix "$1")
+CONTRACT="${2:-}"
+
+# Strip any pre-release suffix (-rc.0, -beta.1, ...) for major.minor lookups.
+NEW_CORE="${NEW_FULL%%-*}"
+validate_semver "${NEW_CORE}"
+
+split_version "${NEW_CORE}"
+CORE_MAJOR="${MAJOR}"
+CORE_MINOR="${MINOR}"
+
+# Always: clusterctl-settings.json (with v-prefix, suffix preserved).
+clusterctl_set_version "${NEW_FULL}"
+
+# Always: sonar-project.properties (no v-prefix, suffix preserved).
+sonar_set_version "$(strip_v_prefix "${NEW_FULL}")"
+
+# New major.minor: append to metadata.yaml + bump the e2e sentinel.
+if ! metadata_has_release "${CORE_MAJOR}" "${CORE_MINOR}"; then
+    if [[ -z "${CONTRACT}" ]]; then
+        CONTRACT=$(metadata_latest_contract)
+    fi
+    metadata_add_release "${CORE_MAJOR}" "${CORE_MINOR}" "${CONTRACT}"
+    e2econfig_set_capmox "v${CORE_MAJOR}.${CORE_MINOR}.99"
+fi

hack/spec/fixtures/clusterctl-settings.json

@@ -0,0 +1,7 @@
+{
+  "name": "infrastructure-proxmox",
+  "config": {
+    "componentsFile": "infrastructure-components.yaml",
+    "nextVersion": "v0.8.1"
+  }
+}

hack/spec/fixtures/metadata.yaml

@@ -1,9 +1,9 @@
 apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
 kind: Metadata
 releaseSeries:
-  - major: 0
-    minor: 8
-    contract: v1beta2
   - major: 0
     minor: 7
     contract: v1beta1
+  - major: 0
+    minor: 8
+    contract: v1beta2

hack/spec/fixtures/sonar-project.properties

@@ -0,0 +1,3 @@
+sonar.projectVersion=0.8.1
+sonar.projectKey=ionos-cloud_cluster-api-provider-proxmox
+sonar.organization=ionos-cloud

hack/spec/fixtures/test/e2e/config/proxmox-ci.yaml

@@ -12,6 +12,11 @@ providers:
       - name: v1.10.4
         value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.4/bootstrap-components.yaml
         type: url
+  - name: proxmox
+    type: InfrastructureProvider
+    versions:
+      - name: v0.8.99
+        value: "${PWD}/config/default"
 
 variables:
   KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.32.3}"

hack/spec/fixtures/test/e2e/config/proxmox-dev.yaml

@@ -12,6 +12,11 @@ providers:
       - name: v1.10.4
         value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.4/bootstrap-components.yaml
         type: url
+  - name: proxmox
+    type: InfrastructureProvider
+    versions:
+      - name: v0.8.99
+        value: "${PWD}/config/default"
 
 variables:
   KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.32.3}"

hack/spec/helpers_file_versions_spec.sh

@@ -126,6 +126,73 @@ Describe 'helpers.sh — file version functions'
     End
   End
 
+  Describe 'e2econfig_get_capmox'
+    It 'returns the capmox sentinel from e2e config'
+      When call e2econfig_get_capmox
+      The output should equal 'v0.8.99'
+    End
+  End
+
+  Describe 'e2econfig_set_capmox'
+    It 'updates the capmox sentinel in e2e config files'
+      When call e2econfig_set_capmox 'v0.9.99'
+      The output should include 'Updated capmox v0.8.99 to v0.9.99'
+    End
+
+    It 'writes the new sentinel to both files'
+      e2econfig_set_capmox 'v0.9.99' >/dev/null
+      When call e2econfig_get_capmox
+      The output should equal 'v0.9.99'
+    End
+
+    It 'updates both ci and dev files'
+      e2econfig_set_capmox 'v0.9.99' >/dev/null
+      _dev_sentinel() { yq '.providers[] | select(.type == "InfrastructureProvider") | .versions[0].name' "${E2E_CONFIG_DIR}/proxmox-dev.yaml"; }
+      When call _dev_sentinel
+      The output should equal 'v0.9.99'
+    End
+  End
+
+  Describe 'clusterctl_get_version'
+    It 'returns the capmox nextVersion'
+      When call clusterctl_get_version
+      The output should equal 'v0.8.1'
+    End
+  End
+
+  Describe 'clusterctl_set_version'
+    It 'updates nextVersion'
+      When call clusterctl_set_version 'v0.8.2'
+      The output should include 'Updated nextVersion v0.8.1 to v0.8.2'
+    End
+
+    It 'writes the new value'
+      clusterctl_set_version 'v0.8.2' >/dev/null
+      When call clusterctl_get_version
+      The output should equal 'v0.8.2'
+    End
+  End
+
+  Describe 'sonar_get_version'
+    It 'returns the sonar.projectVersion'
+      When call sonar_get_version
+      The output should equal '0.8.1'
+    End
+  End
+
+  Describe 'sonar_set_version'
+    It 'updates sonar.projectVersion'
+      When call sonar_set_version '0.8.2'
+      The output should include 'Updated sonar.projectVersion 0.8.1 to 0.8.2'
+    End
+
+    It 'writes the new value'
+      sonar_set_version '0.8.2' >/dev/null
+      When call sonar_get_version
+      The output should equal '0.8.2'
+    End
+  End
+
   Describe 'e2econfig_set_capi'
     It 'updates the cluster-api version in e2e config files'
       When call e2econfig_set_capi 'v1.11.0'

hack/spec/helpers_metadata_spec.sh

@@ -73,27 +73,66 @@ YAML
   End
 
   Describe 'metadata_has_release'
-    It 'returns success for an existing entry'
-      When call metadata_has_release 1 10
+    It 'returns success for an existing capmox entry'
+      When call metadata_has_release 0 8
       The status should be success
     End
 
-    It 'returns failure for a missing entry'
-      When call metadata_has_release 1 99
+    It 'returns failure for a missing capmox entry'
+      When call metadata_has_release 0 99
       The status should be failure
     End
   End
 
   Describe 'metadata_add_release'
-    It 'adds a new releaseSeries entry'
-      When call metadata_add_release 1 11 'v1beta2'
+    It 'adds a new capmox releaseSeries entry'
+      When call metadata_add_release 0 9 'v1beta2'
+      The output should include 'metadata.yaml: Added releaseSeries entry for v0.9'
+    End
+
+    It 'makes the new entry discoverable'
+      metadata_add_release 0 9 'v1beta2' >/dev/null
+      When call metadata_has_release 0 9
+      The status should be success
+    End
+
+    It 'appends (chronological order, newest last)'
+      metadata_add_release 0 9 'v1beta2' >/dev/null
+      _last_minor() { yq '.releaseSeries[-1].minor' "${METADATA_FILE}"; }
+      When call _last_minor
+      The output should equal '9'
+    End
+  End
+
+  Describe 'e2emetadata_has_release'
+    It 'returns success for an existing CAPI entry'
+      When call e2emetadata_has_release 1 10
+      The status should be success
+    End
+
+    It 'returns failure for a missing CAPI entry'
+      When call e2emetadata_has_release 1 99
+      The status should be failure
+    End
+  End
+
+  Describe 'e2emetadata_add_release'
+    It 'adds a new CAPI releaseSeries entry'
+      When call e2emetadata_add_release 1 11 'v1beta2'
       The output should include 'Added releaseSeries entry for v1.11'
     End
 
     It 'makes the new entry discoverable'
-      metadata_add_release 1 11 'v1beta2' >/dev/null
-      When call metadata_has_release 1 11
+      e2emetadata_add_release 1 11 'v1beta2' >/dev/null
+      When call e2emetadata_has_release 1 11
       The status should be success
     End
+
+    It 'prepends (reverse-chronological order, newest first)'
+      e2emetadata_add_release 1 11 'v1beta2' >/dev/null
+      _first_minor() { yq '.releaseSeries[0].minor' "${E2E_METADATA_FILE}"; }
+      When call _first_minor
+      The output should equal '11'
+    End
   End
 End