From 6a3b89770476286a66dbfe9081f71cfa73f9dce0 Mon Sep 17 00:00:00 2001 From: Muhammad Date: Wed, 13 Aug 2025 17:09:34 -0400 Subject: [PATCH 1/6] update chart version before packaging --- .github/workflows/build-publish-mcr.yml | 48 ++++++++++++------------- Makefile | 12 ++++--- charts/member-agent-arc/Chart.yaml | 2 +- 3 files changed, 33 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build-publish-mcr.yml b/.github/workflows/build-publish-mcr.yml index c4ebf9c0e..9680abb55 100644 --- a/.github/workflows/build-publish-mcr.yml +++ b/.github/workflows/build-publish-mcr.yml @@ -64,30 +64,30 @@ jobs: run: | az login --identity az acr login -n ${{ secrets.AZURE_REGISTRY }} - - name: Build and publish hub-agent - run: | - make docker-build-hub-agent - env: - HUB_AGENT_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }} - REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}} - - name: Build and publish member-agent - run: | - make docker-build-member-agent - env: - MEMBER_AGENT_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }} - REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}} - - name: Build and publish refresh-token - run: | - make docker-build-refresh-token - env: - REFRESH_TOKEN_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }} - REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}} - - name: Build and publish crd-installer - run: | - make docker-build-crd-installer - env: - CRD_INSTALLER_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }} - REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}} + # - name: Build and publish hub-agent + # run: | + # make docker-build-hub-agent + # env: + # HUB_AGENT_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }} + # REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}} + # - name: Build and publish member-agent + # run: | + # make docker-build-member-agent + # env: + # MEMBER_AGENT_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }} + # REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}} + # - name: Build and publish refresh-token + # run: | + # make docker-build-refresh-token + # env: + # REFRESH_TOKEN_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }} + # REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}} + # - name: Build and publish crd-installer + # run: | + # make docker-build-crd-installer + # env: + # CRD_INSTALLER_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }} + # REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}} # Build Arc Extension for member clusters # Arc-connected clusters can join fleets as member clusters through an Arc Extension. # An Arc Extension is a packaged Helm chart that gets deployed to Arc clusters. diff --git a/Makefile b/Makefile index ce0320121..3be71cbd8 100644 --- a/Makefile +++ b/Makefile @@ -339,12 +339,16 @@ docker-build-crd-installer: docker-buildx-builder # Fleet Agents and Networking Agents are packaged and pushed to MCR for Arc Extension. .PHONY: helm-package-arc-member-cluster-agents -helm-package-arc-member-cluster-agents: +helm-package-arc-member-agent: + # Update Chart.yaml version + sed -i.bak "s/^version:.*/version: $(ARC_MEMBER_AGENT_IMAGE_VERSION)/" charts/member-agent-arc/Chart.yaml + envsubst < charts/member-agent-arc/values.yaml > charts/member-agent-arc/values.yaml.tmp && \ mv charts/member-agent-arc/values.yaml.tmp charts/member-agent-arc/values.yaml && \ - helm package charts/member-agent-arc/ --version $(ARC_MEMBER_AGENT_HELMCHART_VERSION) - - helm push $(ARC_MEMBER_AGENT_HELMCHART_NAME)-$(ARC_MEMBER_AGENT_HELMCHART_VERSION).tgz oci://$(REGISTRY) + + helm package charts/member-agent-arc/ --version $(ARC_MEMBER_AGENT_IMAGE_VERSION) + + helm push $(ARC_MEMBER_AGENT_IMAGE_NAME)-$(ARC_MEMBER_AGENT_IMAGE_VERSION).tgz oci://$(REGISTRY) ## ----------------------------------- ## Cleanup diff --git a/charts/member-agent-arc/Chart.yaml b/charts/member-agent-arc/Chart.yaml index b79a481c9..7c5e4bdba 100644 --- a/charts/member-agent-arc/Chart.yaml +++ b/charts/member-agent-arc/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: HELM_CHART_VERSION # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to From c2fc71612838cff33d53ab6d32873a09d81d5b33 Mon Sep 17 00:00:00 2001 From: Muhammad Date: Wed, 13 Aug 2025 17:20:14 -0400 Subject: [PATCH 2/6] update name --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3be71cbd8..929efcbd0 100644 --- a/Makefile +++ b/Makefile @@ -339,7 +339,7 @@ docker-build-crd-installer: docker-buildx-builder # Fleet Agents and Networking Agents are packaged and pushed to MCR for Arc Extension. .PHONY: helm-package-arc-member-cluster-agents -helm-package-arc-member-agent: +helm-package-arc-member-cluster-agents: # Update Chart.yaml version sed -i.bak "s/^version:.*/version: $(ARC_MEMBER_AGENT_IMAGE_VERSION)/" charts/member-agent-arc/Chart.yaml From ddefbb77b08b84e7b700187309e72bcf986dd71c Mon Sep 17 00:00:00 2001 From: Muhammad Date: Wed, 13 Aug 2025 17:31:54 -0400 Subject: [PATCH 3/6] test --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 929efcbd0..b762fdbc0 100644 --- a/Makefile +++ b/Makefile @@ -343,6 +343,8 @@ helm-package-arc-member-cluster-agents: # Update Chart.yaml version sed -i.bak "s/^version:.*/version: $(ARC_MEMBER_AGENT_IMAGE_VERSION)/" charts/member-agent-arc/Chart.yaml + cat charts/member-agent-arc/Chart.yaml + envsubst < charts/member-agent-arc/values.yaml > charts/member-agent-arc/values.yaml.tmp && \ mv charts/member-agent-arc/values.yaml.tmp charts/member-agent-arc/values.yaml && \ From 54b5884008dd0e1b6a37899b8f749525409c98c6 Mon Sep 17 00:00:00 2001 From: Muhammad Date: Wed, 13 Aug 2025 17:44:42 -0400 Subject: [PATCH 4/6] test --- Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b762fdbc0..1d7c654a6 100644 --- a/Makefile +++ b/Makefile @@ -340,11 +340,8 @@ docker-build-crd-installer: docker-buildx-builder # Fleet Agents and Networking Agents are packaged and pushed to MCR for Arc Extension. .PHONY: helm-package-arc-member-cluster-agents helm-package-arc-member-cluster-agents: - # Update Chart.yaml version - sed -i.bak "s/^version:.*/version: $(ARC_MEMBER_AGENT_IMAGE_VERSION)/" charts/member-agent-arc/Chart.yaml - - cat charts/member-agent-arc/Chart.yaml - + # Update Chart.yaml version & environment variables in values.yaml + sed -i.bak "s/^version:.*/version: $(ARC_MEMBER_AGENT_IMAGE_VERSION)/" charts/member-agent-arc/Chart.yaml && \ envsubst < charts/member-agent-arc/values.yaml > charts/member-agent-arc/values.yaml.tmp && \ mv charts/member-agent-arc/values.yaml.tmp charts/member-agent-arc/values.yaml && \ From 1de98bf6348bfe321b8f961e97fcecf292fbd818 Mon Sep 17 00:00:00 2001 From: Muhammad Date: Wed, 13 Aug 2025 18:27:39 -0400 Subject: [PATCH 5/6] remove comments --- .github/workflows/build-publish-mcr.yml | 48 ++++++++++++------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build-publish-mcr.yml b/.github/workflows/build-publish-mcr.yml index 9680abb55..c4ebf9c0e 100644 --- a/.github/workflows/build-publish-mcr.yml +++ b/.github/workflows/build-publish-mcr.yml @@ -64,30 +64,30 @@ jobs: run: | az login --identity az acr login -n ${{ secrets.AZURE_REGISTRY }} - # - name: Build and publish hub-agent - # run: | - # make docker-build-hub-agent - # env: - # HUB_AGENT_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }} - # REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}} - # - name: Build and publish member-agent - # run: | - # make docker-build-member-agent - # env: - # MEMBER_AGENT_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }} - # REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}} - # - name: Build and publish refresh-token - # run: | - # make docker-build-refresh-token - # env: - # REFRESH_TOKEN_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }} - # REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}} - # - name: Build and publish crd-installer - # run: | - # make docker-build-crd-installer - # env: - # CRD_INSTALLER_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }} - # REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}} + - name: Build and publish hub-agent + run: | + make docker-build-hub-agent + env: + HUB_AGENT_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }} + REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}} + - name: Build and publish member-agent + run: | + make docker-build-member-agent + env: + MEMBER_AGENT_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }} + REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}} + - name: Build and publish refresh-token + run: | + make docker-build-refresh-token + env: + REFRESH_TOKEN_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }} + REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}} + - name: Build and publish crd-installer + run: | + make docker-build-crd-installer + env: + CRD_INSTALLER_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.release_tag }} + REGISTRY: ${{ secrets.AZURE_REGISTRY }}/${{ env.REGISTRY_REPO}} # Build Arc Extension for member clusters # Arc-connected clusters can join fleets as member clusters through an Arc Extension. # An Arc Extension is a packaged Helm chart that gets deployed to Arc clusters. From ac7b35f8a870aae6a5c9a434de9a9f797dfd691f Mon Sep 17 00:00:00 2001 From: Muhammad Date: Thu, 14 Aug 2025 11:15:20 -0400 Subject: [PATCH 6/6] update --- Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 1d7c654a6..ce0320121 100644 --- a/Makefile +++ b/Makefile @@ -340,14 +340,11 @@ docker-build-crd-installer: docker-buildx-builder # Fleet Agents and Networking Agents are packaged and pushed to MCR for Arc Extension. .PHONY: helm-package-arc-member-cluster-agents helm-package-arc-member-cluster-agents: - # Update Chart.yaml version & environment variables in values.yaml - sed -i.bak "s/^version:.*/version: $(ARC_MEMBER_AGENT_IMAGE_VERSION)/" charts/member-agent-arc/Chart.yaml && \ envsubst < charts/member-agent-arc/values.yaml > charts/member-agent-arc/values.yaml.tmp && \ mv charts/member-agent-arc/values.yaml.tmp charts/member-agent-arc/values.yaml && \ - - helm package charts/member-agent-arc/ --version $(ARC_MEMBER_AGENT_IMAGE_VERSION) - - helm push $(ARC_MEMBER_AGENT_IMAGE_NAME)-$(ARC_MEMBER_AGENT_IMAGE_VERSION).tgz oci://$(REGISTRY) + helm package charts/member-agent-arc/ --version $(ARC_MEMBER_AGENT_HELMCHART_VERSION) + + helm push $(ARC_MEMBER_AGENT_HELMCHART_NAME)-$(ARC_MEMBER_AGENT_HELMCHART_VERSION).tgz oci://$(REGISTRY) ## ----------------------------------- ## Cleanup