Skip to content

Commit 6970c30

Browse files
authored
dont wait on fleet type helm workflows (#479)
1 parent 4231961 commit 6970c30

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

pkg/fixtures/workflows/github/helm/.github/workflows/azure-kubernetes-service-helm.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,5 +147,7 @@ jobs:
147147
148148
- name: Deploy application on public cluster
149149
if: ${{ steps.isPrivate.outputs.PRIVATE_CLUSTER != 'true' }}
150+
env:
151+
WAIT_FLAG: ${{ (env.CLUSTER_RESOURCE_TYPE != 'Microsoft.ContainerService/fleets') && '--wait') || '' }} # don't wait for fleet hubs
150152
run: |
151-
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 }}
153+
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 }}

template/workflows/helm/.github/workflows/azure-kubernetes-service-helm.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ jobs:
147147
148148
- name: Deploy application on public cluster
149149
if: ${{ steps.isPrivate.outputs.PRIVATE_CLUSTER != 'true' }}
150+
env:
151+
WAIT_FLAG: ${{ (env.CLUSTER_RESOURCE_TYPE != 'Microsoft.ContainerService/fleets') && '--wait') || '' }} # don't wait for fleet hubs
150152
run: |
151-
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 }}
153+
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 }}
152154
`}}

0 commit comments

Comments
 (0)