Skip to content

Commit 5db60de

Browse files
fix: Use fleet agent version as arc version (#1177)
2 parents 5fba0da + 16d88a0 commit 5db60de

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

.github/workflows/build-publish-mcr.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ on:
88
releaseTag:
99
description: 'Release tag to publish images, defaults to the latest one'
1010
type: string
11-
arcExtensionVersion:
12-
description: 'Release version of the Arc extension.'
13-
type: string
14-
required: true
1511

1612
permissions:
1713
id-token: write
@@ -28,6 +24,7 @@ jobs:
2824
outputs:
2925
release_tag: ${{ steps.vars.outputs.release_tag }}
3026
fleet_networking_version: ${{ steps.vars.outputs.fleet_networking_version }}
27+
arc_helmchart_version: ${{ steps.vars.outputs.arc_helmchart_version }}
3128
steps:
3229
- uses: actions/checkout@v4
3330
with:
@@ -43,6 +40,11 @@ jobs:
4340
fi
4441
echo "release_tag=$RELEASE_TAG" >> $GITHUB_OUTPUT
4542
43+
# Strip 'v' prefix from RELEASE_TAG for helm chart version
44+
ARC_HELMCHART_VERSION="${RELEASE_TAG#v}"
45+
echo "arc_helmchart_version=$ARC_HELMCHART_VERSION" >> $GITHUB_OUTPUT
46+
echo "Using Arc Helm Chart version: $ARC_HELMCHART_VERSION"
47+
4648
# Fetch the latest fleet-networking version
4749
# NOTE: The fleet-networking image must be cut and pushed to MCR first before retrieving this version
4850
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:
9799
run: |
98100
make helm-package-arc-member-cluster-agents
99101
env:
100-
ARC_MEMBER_AGENT_HELMCHART_VERSION: ${{ inputs.arcExtensionVersion }}
102+
ARC_MEMBER_AGENT_HELMCHART_VERSION: ${{ needs.prepare-variables.outputs.arc_helmchart_version }}
101103
MEMBER_AGENT_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }}
102104
REFRESH_TOKEN_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }}
103105
CRD_INSTALLER_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }}

0 commit comments

Comments
 (0)