From 0f75409b8f30251679cd6a8bf81ba5c9d0077775 Mon Sep 17 00:00:00 2001 From: David Gamero Date: Mon, 27 Jan 2025 17:14:30 -0500 Subject: [PATCH] dont wait on fleet --- .../helm/.github/workflows/azure-kubernetes-service-helm.yml | 4 +++- .../helm/.github/workflows/azure-kubernetes-service-helm.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/fixtures/workflows/github/helm/.github/workflows/azure-kubernetes-service-helm.yml b/pkg/fixtures/workflows/github/helm/.github/workflows/azure-kubernetes-service-helm.yml index 3b3f14a20..243b013a8 100644 --- a/pkg/fixtures/workflows/github/helm/.github/workflows/azure-kubernetes-service-helm.yml +++ b/pkg/fixtures/workflows/github/helm/.github/workflows/azure-kubernetes-service-helm.yml @@ -147,5 +147,7 @@ jobs: - name: Deploy application on public cluster if: ${{ steps.isPrivate.outputs.PRIVATE_CLUSTER != 'true' }} + env: + WAIT_FLAG: ${{ (env.CLUSTER_RESOURCE_TYPE != 'Microsoft.ContainerService/fleets') && '--wait') || '' }} # don't wait for fleet hubs run: | - helm upgrade --wait -i -f ${{ env.CHART_OVERRIDE_PATH }} --set ${{ env.CHART_OVERRIDES }} --set image.tag=${{ github.sha }} automated-deployment ${{ env.CHART_PATH }} --namespace ${{ env.NAMESPACE }} + helm upgrade ${{ env.WAIT_FLAG }} -i -f ${{ env.CHART_OVERRIDE_PATH }} --set ${{ env.CHART_OVERRIDES }} --set image.tag=${{ github.sha }} automated-deployment ${{ env.CHART_PATH }} --namespace ${{ env.NAMESPACE }} diff --git a/template/workflows/helm/.github/workflows/azure-kubernetes-service-helm.yml b/template/workflows/helm/.github/workflows/azure-kubernetes-service-helm.yml index ba72ebefb..8979b70df 100644 --- a/template/workflows/helm/.github/workflows/azure-kubernetes-service-helm.yml +++ b/template/workflows/helm/.github/workflows/azure-kubernetes-service-helm.yml @@ -147,6 +147,8 @@ jobs: - name: Deploy application on public cluster if: ${{ steps.isPrivate.outputs.PRIVATE_CLUSTER != 'true' }} + env: + WAIT_FLAG: ${{ (env.CLUSTER_RESOURCE_TYPE != 'Microsoft.ContainerService/fleets') && '--wait') || '' }} # don't wait for fleet hubs run: | - helm upgrade --wait -i -f ${{ env.CHART_OVERRIDE_PATH }} --set ${{ env.CHART_OVERRIDES }} --set image.tag=${{ github.sha }} automated-deployment ${{ env.CHART_PATH }} --namespace ${{ env.NAMESPACE }} + helm upgrade ${{ env.WAIT_FLAG }} -i -f ${{ env.CHART_OVERRIDE_PATH }} --set ${{ env.CHART_OVERRIDES }} --set image.tag=${{ github.sha }} automated-deployment ${{ env.CHART_PATH }} --namespace ${{ env.NAMESPACE }} `}}