From 856da97671c737a79f2e2b4ae4c8295d082aa2e2 Mon Sep 17 00:00:00 2001 From: Victoria Litvinova Date: Fri, 12 Jul 2024 11:29:19 -0700 Subject: [PATCH 1/6] purgearoo --- .github/workflows/cluster_cleanup.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cluster_cleanup.yml b/.github/workflows/cluster_cleanup.yml index abbba1ea1..aff261a1d 100644 --- a/.github/workflows/cluster_cleanup.yml +++ b/.github/workflows/cluster_cleanup.yml @@ -31,8 +31,8 @@ on: required: true default: ops-cli-int-test-rg # Run every night at midnight (Pacific) to cleanup resources - schedule: - - cron: '0 8 * * *' + # schedule: + # - cron: '0 8 * * *' env: RESOURCE_GROUP: ${{ inputs.resource_group || 'ops-cli-int-test-rg' }} @@ -72,8 +72,14 @@ jobs: - name: Delete keyvaults run: | for vault in $(az keyvault list --query "[?starts_with(name, '${{ env.KEYVAULT_PREFIX }}')].name" -o tsv); do + # we can get the recently deleted ones next run az keyvault delete -n $vault -g ${{ env.RESOURCE_GROUP }} --no-wait done + - name: Purge keyvaults + run: | + for vault in $(az keyvault list-deleted --query "[?starts_with(name, '${{ env.KEYVAULT_PREFIX }}')].name" -o tsv); do + az keyvault purge -n $vault --no-wait + done resource-cleanup: needs: [arc-cleanup] runs-on: ubuntu-latest @@ -110,7 +116,7 @@ jobs: run: | mq_type="Microsoft.IoTOperationsMQ/mq" in_cluster_ext_loc="contains(to_string(extendedLocation.name), '${{ env.CLUSTER_PREFIX }}')" - + # MQ instance cannot be deleted until all child resources have successfully deleted sleep 15s From fafe9503637b2c276987a945dcb373ee31fd0123 Mon Sep 17 00:00:00 2001 From: Victoria Litvinova Date: Fri, 12 Jul 2024 11:31:44 -0700 Subject: [PATCH 2/6] inputaroo --- .github/workflows/cluster_cleanup.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/cluster_cleanup.yml b/.github/workflows/cluster_cleanup.yml index aff261a1d..cee0b4856 100644 --- a/.github/workflows/cluster_cleanup.yml +++ b/.github/workflows/cluster_cleanup.yml @@ -30,6 +30,10 @@ on: description: "Resource group to clean up" required: true default: ops-cli-int-test-rg + keyvault_prefix: + type: string + description: "Prefix of keyvault to delete" + required: false # Run every night at midnight (Pacific) to cleanup resources # schedule: # - cron: '0 8 * * *' From fb8fab193e7ef5fc8a35fecf452b456b7441e6fd Mon Sep 17 00:00:00 2001 From: Victoria Litvinova Date: Fri, 12 Jul 2024 12:02:59 -0700 Subject: [PATCH 3/6] waitaroo --- .github/workflows/cluster_cleanup.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/cluster_cleanup.yml b/.github/workflows/cluster_cleanup.yml index cee0b4856..13d6ba694 100644 --- a/.github/workflows/cluster_cleanup.yml +++ b/.github/workflows/cluster_cleanup.yml @@ -76,8 +76,7 @@ jobs: - name: Delete keyvaults run: | for vault in $(az keyvault list --query "[?starts_with(name, '${{ env.KEYVAULT_PREFIX }}')].name" -o tsv); do - # we can get the recently deleted ones next run - az keyvault delete -n $vault -g ${{ env.RESOURCE_GROUP }} --no-wait + az keyvault delete -n $vault -g ${{ env.RESOURCE_GROUP }} done - name: Purge keyvaults run: | From ae4151a3a733687736293914c001e7e4ee1aadf4 Mon Sep 17 00:00:00 2001 From: Victoria Litvinova Date: Mon, 15 Jul 2024 10:25:57 -0700 Subject: [PATCH 4/6] clean up --- .github/workflows/cluster_cleanup.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cluster_cleanup.yml b/.github/workflows/cluster_cleanup.yml index 13d6ba694..b1c658aa5 100644 --- a/.github/workflows/cluster_cleanup.yml +++ b/.github/workflows/cluster_cleanup.yml @@ -31,9 +31,10 @@ on: required: true default: ops-cli-int-test-rg keyvault_prefix: - type: string - description: "Prefix of keyvault to delete" - required: false + type: string + description: "Prefix of keyvault to delete" + default: "opskv" + required: false # Run every night at midnight (Pacific) to cleanup resources # schedule: # - cron: '0 8 * * *' @@ -41,7 +42,6 @@ on: env: RESOURCE_GROUP: ${{ inputs.resource_group || 'ops-cli-int-test-rg' }} CLUSTER_PREFIX: ${{ inputs.cluster_prefix || 'az-iot-ops-test-cluster' }} - KEYVAULT_PREFIX: ${{ inputs.keyvault_prefix || 'opskv' }} permissions: # required for OpenID federation @@ -75,12 +75,12 @@ jobs: subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} - name: Delete keyvaults run: | - for vault in $(az keyvault list --query "[?starts_with(name, '${{ env.KEYVAULT_PREFIX }}')].name" -o tsv); do + for vault in $(az keyvault list --query "[?starts_with(name, '${{ inputs.keyvault_prefix }}')].name" -o tsv); do az keyvault delete -n $vault -g ${{ env.RESOURCE_GROUP }} done - name: Purge keyvaults run: | - for vault in $(az keyvault list-deleted --query "[?starts_with(name, '${{ env.KEYVAULT_PREFIX }}')].name" -o tsv); do + for vault in $(az keyvault list-deleted --query "[?starts_with(name, '${{ inputs.keyvault_prefix }}')].name" -o tsv); do az keyvault purge -n $vault --no-wait done resource-cleanup: From 598d326cd6d5d88ab7d9fbde5a2498e12a75eb06 Mon Sep 17 00:00:00 2001 From: Victoria Litvinova Date: Mon, 15 Jul 2024 10:53:52 -0700 Subject: [PATCH 5/6] I am stupid + rg --- .github/workflows/cluster_cleanup.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cluster_cleanup.yml b/.github/workflows/cluster_cleanup.yml index b1c658aa5..16533d152 100644 --- a/.github/workflows/cluster_cleanup.yml +++ b/.github/workflows/cluster_cleanup.yml @@ -42,6 +42,7 @@ on: env: RESOURCE_GROUP: ${{ inputs.resource_group || 'ops-cli-int-test-rg' }} CLUSTER_PREFIX: ${{ inputs.cluster_prefix || 'az-iot-ops-test-cluster' }} + KEYVAULT_PREFIX: ${{ inputs.keyvault_prefix || 'opskv' }} permissions: # required for OpenID federation @@ -75,12 +76,12 @@ jobs: subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} - name: Delete keyvaults run: | - for vault in $(az keyvault list --query "[?starts_with(name, '${{ inputs.keyvault_prefix }}')].name" -o tsv); do + for vault in $(az keyvault list -g ${{ env.RESOURCE_GROUP }} --query "[?starts_with(name, '${{ env.KEYVAULT_PREFIX }}')].name" -o tsv); do az keyvault delete -n $vault -g ${{ env.RESOURCE_GROUP }} done - name: Purge keyvaults run: | - for vault in $(az keyvault list-deleted --query "[?starts_with(name, '${{ inputs.keyvault_prefix }}')].name" -o tsv); do + for vault in $(az keyvault list-deleted --query "[?contains(properties.vaultId, '${{ env.RESOURCE_GROUP }}')] | [?starts_with(name, '${{ env.KEYVAULT_PREFIX }}')].name" -o tsv); do az keyvault purge -n $vault --no-wait done resource-cleanup: From ae3ec4769ab744db741b1684d739e7d97d706678 Mon Sep 17 00:00:00 2001 From: Victoria Litvinova Date: Mon, 15 Jul 2024 11:09:31 -0700 Subject: [PATCH 6/6] ryan said this won't run since it is still is a pr --- .github/workflows/cluster_cleanup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cluster_cleanup.yml b/.github/workflows/cluster_cleanup.yml index 16533d152..56f2b11a0 100644 --- a/.github/workflows/cluster_cleanup.yml +++ b/.github/workflows/cluster_cleanup.yml @@ -36,8 +36,8 @@ on: default: "opskv" required: false # Run every night at midnight (Pacific) to cleanup resources - # schedule: - # - cron: '0 8 * * *' + schedule: + - cron: '0 8 * * *' env: RESOURCE_GROUP: ${{ inputs.resource_group || 'ops-cli-int-test-rg' }}