Skip to content

Commit 2de51cd

Browse files
Merge pull request #265 from microsoft/fix/dynamic-region-list-ckm
fix: quota check script with dynamic region handling
2 parents f2aa57c + 6f846d8 commit 2de51cd

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

.github/workflows/bicep_deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
export AZURE_CLIENT_SECRET=${{ secrets.AZURE_CLIENT_SECRET }}
2121
export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
2222
export GPT_MIN_CAPACITY="30"
23+
export AZURE_REGIONS="${{ vars.AZURE_REGIONS }}"
2324
2425
chmod +x infra/scripts/checkquota_ckmv2.sh
2526
if ! infra/scripts/checkquota_ckmv2.sh; then

.github/workflows/deploy-KMGeneric.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
2929
export GPT_MIN_CAPACITY="100"
3030
export TEXT_EMBEDDING_MIN_CAPACITY="80"
31+
export AZURE_REGIONS="${{ vars.AZURE_REGIONS_KM }}"
3132
3233
chmod +x infra/scripts/checkquota_km.sh
3334
if ! infra/scripts/checkquota_km.sh; then

infra/scripts/checkquota_ckmv2.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# List of Azure regions to check for quota (update as needed)
4-
REGIONS=("eastus" "eastus2" "northcentralus")
4+
IFS=', ' read -ra REGIONS <<< "$AZURE_REGIONS"
55

66
SUBSCRIPTION_ID="${AZURE_SUBSCRIPTION_ID}"
77
GPT_MIN_CAPACITY="${GPT_MIN_CAPACITY}"
@@ -17,7 +17,7 @@ if ! az login --service-principal -u "$AZURE_CLIENT_ID" -p "$AZURE_CLIENT_SECRET
1717
fi
1818

1919
echo "🔄 Validating required environment variables..."
20-
if [[ -z "$SUBSCRIPTION_ID" || -z "$GPT_MIN_CAPACITY" ]]; then
20+
if [[ -z "$SUBSCRIPTION_ID" || -z "$GPT_MIN_CAPACITY" || -z "$REGIONS" ]]; then
2121
echo "❌ ERROR: Missing required environment variables."
2222
exit 1
2323
fi

infra/scripts/checkquota_km.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# List of Azure regions to check for quota (update as needed)
4-
REGIONS=("eastus" "eastus2")
4+
IFS=', ' read -ra REGIONS <<< "$AZURE_REGIONS"
55

66
SUBSCRIPTION_ID="${AZURE_SUBSCRIPTION_ID}"
77
GPT_MIN_CAPACITY="${GPT_MIN_CAPACITY}"
@@ -18,7 +18,7 @@ if ! az login --service-principal -u "$AZURE_CLIENT_ID" -p "$AZURE_CLIENT_SECRET
1818
fi
1919

2020
echo "🔄 Validating required environment variables..."
21-
if [[ -z "$SUBSCRIPTION_ID" || -z "$GPT_MIN_CAPACITY" || -z "$TEXT_EMBEDDING_MIN_CAPACITY" ]]; then
21+
if [[ -z "$SUBSCRIPTION_ID" || -z "$GPT_MIN_CAPACITY" || -z "$TEXT_EMBEDDING_MIN_CAPACITY" || -z "$REGIONS" ]]; then
2222
echo "❌ ERROR: Missing required environment variables."
2323
exit 1
2424
fi

0 commit comments

Comments
 (0)