From 20d15c6e3e7b9b631eab6ee87119d653b58deece Mon Sep 17 00:00:00 2001 From: Kumar Pratyush Date: Mon, 15 Jun 2026 20:15:30 +0530 Subject: [PATCH 1/3] ci: fix image tag to use version input when triggered via workflow_dispatch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When triggered by workflow_dispatch, GITHUB_REF_NAME is the branch name (main), not the tag — causing docker/metadata-action to produce 'latest' instead of the release version. Now prefers inputs.new_operator_version when set, falling back to GITHUB_REF_NAME for tag-triggered runs. Also passes the resolved version explicitly to metadata-action semver tags so they work for both trigger types. Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/release-package-helm.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-package-helm.yml b/.github/workflows/release-package-helm.yml index 3900e8b6..7a3943b2 100644 --- a/.github/workflows/release-package-helm.yml +++ b/.github/workflows/release-package-helm.yml @@ -80,8 +80,13 @@ jobs: - name: Extract version from tag id: version run: | - # Extract version from tag (remove 'v' prefix) - VERSION=${GITHUB_REF_NAME#v} + # Prefer explicit input (workflow_dispatch / workflow_call), fall back to tag ref + INPUT_VERSION="${{ inputs.new_operator_version }}" + if [[ -n "${INPUT_VERSION}" ]]; then + VERSION="${INPUT_VERSION#v}" + else + VERSION="${GITHUB_REF_NAME#v}" + fi echo "version=$VERSION" >> $GITHUB_OUTPUT echo "Building version: $VERSION" @@ -93,9 +98,9 @@ jobs: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} splunk/splunk-ai-operator tags: | - type=semver,pattern=v{{version}} - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} + type=semver,pattern=v{{version}},value=v${{ steps.version.outputs.version }} + type=semver,pattern={{version}},value=v${{ steps.version.outputs.version }} + type=semver,pattern={{major}}.{{minor}},value=v${{ steps.version.outputs.version }} type=raw,value=latest,enable={{is_default_branch}} - name: Build and push Docker images From 546ef692c3a611f1229662aa6c8416dd2641013b Mon Sep 17 00:00:00 2001 From: Kumar Pratyush Date: Mon, 15 Jun 2026 20:22:51 +0530 Subject: [PATCH 2/3] ci: normalize v-prefix in package job's version extraction build-and-push-images stripped the leading 'v' but the package job used inputs.new_operator_version verbatim, so a v-prefixed input would produce divergent versions between image tags and Helm chart versions, potentially failing SemVer validation. Apply the same #v strip in the package job. Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/release-package-helm.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-package-helm.yml b/.github/workflows/release-package-helm.yml index 7a3943b2..edd8f7ed 100644 --- a/.github/workflows/release-package-helm.yml +++ b/.github/workflows/release-package-helm.yml @@ -166,8 +166,9 @@ jobs: # Extract from git tag (remove 'v' prefix) VERSION=${GITHUB_REF_NAME#v} elif [ -n "${{ inputs.new_operator_version }}" ]; then - # Use input version (for workflow_call) + # Use input version (for workflow_call / workflow_dispatch), strip leading v VERSION="${{ inputs.new_operator_version }}" + VERSION="${VERSION#v}" else # Fallback to Chart.yaml version VERSION=$(grep '^version:' helm-chart/splunk-ai-operator/Chart.yaml | awk '{print $2}' | tr -d '"') From 7c2536de5ebb6ca3d39231d8684e2d193fb6f2e9 Mon Sep 17 00:00:00 2001 From: Kumar Pratyush Date: Mon, 15 Jun 2026 20:23:29 +0530 Subject: [PATCH 3/3] ci: pass resolved version directly to metadata-action without hardcoded v prefix Hardcoding v in value=v\${{...}} risked producing vv1.2.3 if the version step ever changed. docker/metadata-action handles leading-v normalization itself, so pass the bare version output directly. Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/release-package-helm.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-package-helm.yml b/.github/workflows/release-package-helm.yml index edd8f7ed..3ab6bd80 100644 --- a/.github/workflows/release-package-helm.yml +++ b/.github/workflows/release-package-helm.yml @@ -98,9 +98,9 @@ jobs: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} splunk/splunk-ai-operator tags: | - type=semver,pattern=v{{version}},value=v${{ steps.version.outputs.version }} - type=semver,pattern={{version}},value=v${{ steps.version.outputs.version }} - type=semver,pattern={{major}}.{{minor}},value=v${{ steps.version.outputs.version }} + type=semver,pattern=v{{version}},value=${{ steps.version.outputs.version }} + type=semver,pattern={{version}},value=${{ steps.version.outputs.version }} + type=semver,pattern={{major}}.{{minor}},value=${{ steps.version.outputs.version }} type=raw,value=latest,enable={{is_default_branch}} - name: Build and push Docker images