From 16d88a0a3ee1fa2bc619f738e84ad973459f8cc6 Mon Sep 17 00:00:00 2001 From: Muhammad Date: Tue, 19 Aug 2025 18:03:00 -0400 Subject: [PATCH] use fleet agent version as arc version --- .github/workflows/build-publish-mcr.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-publish-mcr.yml b/.github/workflows/build-publish-mcr.yml index c4ebf9c0e..746037208 100644 --- a/.github/workflows/build-publish-mcr.yml +++ b/.github/workflows/build-publish-mcr.yml @@ -8,10 +8,6 @@ on: releaseTag: description: 'Release tag to publish images, defaults to the latest one' type: string - arcExtensionVersion: - description: 'Release version of the Arc extension.' - type: string - required: true permissions: id-token: write @@ -28,6 +24,7 @@ jobs: outputs: release_tag: ${{ steps.vars.outputs.release_tag }} fleet_networking_version: ${{ steps.vars.outputs.fleet_networking_version }} + arc_helmchart_version: ${{ steps.vars.outputs.arc_helmchart_version }} steps: - uses: actions/checkout@v4 with: @@ -43,6 +40,11 @@ jobs: fi echo "release_tag=$RELEASE_TAG" >> $GITHUB_OUTPUT + # Strip 'v' prefix from RELEASE_TAG for helm chart version + ARC_HELMCHART_VERSION="${RELEASE_TAG#v}" + echo "arc_helmchart_version=$ARC_HELMCHART_VERSION" >> $GITHUB_OUTPUT + echo "Using Arc Helm Chart version: $ARC_HELMCHART_VERSION" + # Fetch the latest fleet-networking version # NOTE: The fleet-networking image must be cut and pushed to MCR first before retrieving this version FLEET_NETWORKING_VERSION="${FLEET_NETWORKING_VERSION:-$(curl "https://api.github.com/repos/Azure/fleet-networking/tags" | jq -r '.[0].name')}" @@ -97,7 +99,7 @@ jobs: run: | make helm-package-arc-member-cluster-agents env: - ARC_MEMBER_AGENT_HELMCHART_VERSION: ${{ inputs.arcExtensionVersion }} + ARC_MEMBER_AGENT_HELMCHART_VERSION: ${{ needs.prepare-variables.outputs.arc_helmchart_version }} MEMBER_AGENT_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }} REFRESH_TOKEN_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }} MCS_CONTROLLER_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.fleet_networking_version }}