cleanup start/stop clusters

equinor · Dec 19, 2024 · 3d0f7a2 · 3d0f7a2
1 parent 1e48b81
commit 3d0f7a2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/startclusters.yml b/.github/workflows/startclusters.yml
@@ -16,6 +16,7 @@ jobs:
       ENVIROMENT: dev
     steps:
       - uses: actions/checkout@v4 #Clone Repo
+
       - name: 'Az CLI login'
         uses: azure/login@v2
         with:
@@ -26,8 +27,9 @@ jobs:
       - name: Get GitHub Public IP
         id: github_public_ip
         run: echo "ipv4=$(curl 'https://ifconfig.me/ip')" >> $GITHUB_OUTPUT
-      
+
       - name: Add GitHub IP to KeyVault
+        id: update_firewall
         run: |
           az keyvault network-rule add --name "radix-keyv-${{ env.ENVIROMENT}}" \
             --resource-group "${{ env.KV_GROUP}}" \
@@ -38,8 +40,9 @@ jobs:
 
       - name: Start clusters
         run: RADIX_ZONE_ENV=./scripts/radix-zone/radix_zone_dev.env TASK=start .github/workflows/scripts/dailytasks.sh
-      
+
       - name: Revoke GitHub IP on KeyVault
+        if: ${{ steps.update_firewall.outcome == 'success' && !cancelled()}} # Always run this step even if previous step failed
         run: |
           az keyvault network-rule remove --name "radix-keyv-${{ env.ENVIROMENT}}" \
             --resource-group "${{ env.KV_GROUP}}" \

diff --git a/.github/workflows/stopclusters.yml b/.github/workflows/stopclusters.yml
@@ -18,6 +18,7 @@ jobs:
       ENVIROMENT: dev
     steps:
       - uses: actions/checkout@v4 #Clone Repo
+
       - name: 'Az CLI login'
         uses: azure/login@v2
         with:
@@ -28,8 +29,9 @@ jobs:
       - name: Get GitHub Public IP
         id: github_public_ip
         run: echo "ipv4=$(curl 'https://ifconfig.me/ip')" >> $GITHUB_OUTPUT
-      
+
       - name: Add GitHub IP to KeyVault
+        id: update_firewall
         run: |
           az keyvault network-rule add --name "radix-keyv-${{ env.ENVIROMENT}}" \
             --resource-group "${{ env.KV_GROUP}}" \
@@ -42,6 +44,7 @@ jobs:
         run: RADIX_ZONE_ENV=./scripts/radix-zone/radix_zone_dev.env TASK=stop .github/workflows/scripts/dailytasks.sh
 
       - name: Revoke GitHub IP on KeyVault
+        if: ${{ steps.update_firewall.outcome == 'success' && !cancelled()}} # Always run this step even if previous step failed
         run: |
           az keyvault network-rule remove --name "radix-keyv-${{ env.ENVIROMENT}}" \
             --resource-group "${{ env.KV_GROUP}}" \