Skip to content

Commit 10909a2

Browse files
Merge pull request #469 from VishalSh-Microsoft/psl-acrchanges-codmod-vs7
feat: add Azure Container Registry module, enhance deployment scripts and update model configuration.
2 parents d34aa72 + 2854a95 commit 10909a2

12 files changed

Lines changed: 670 additions & 3321 deletions

docs/AzureGPTQuotaSettings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
3. **Go to** the `Management Center` from the bottom-left navigation menu.
66
4. Select `Quota`
77
- Click on the `GlobalStandard` dropdown.
8-
- Select the required **GPT model** (`GPT-4, GPT-4o`).
8+
- Select the required **GPT model** (`GPT-5.1`).
99
- Choose the **region** where the deployment is hosted.
1010
5. Request More Quota or delete any unused model deployments as needed.

docs/CustomizingAzdParameters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ By default this template will use the environment name as the prefix to prevent
1212
| `AZURE_LOCATION` | string | `<User selects during deployment>` | Location of the Azure resources. Controls where the infrastructure will be deployed. |
1313
| `AZURE_ENV_AI_SERVICE_LOCATION` | string | `<User selects during deployment>` | Location of the Azure resources. Controls where the Azure AI Services will be deployed. |
1414
| `AZURE_ENV_MODEL_DEPLOYMENT_TYPE` | string | `GlobalStandard` | Change the Model Deployment Type (allowed values: Standard, GlobalStandard). |
15-
| `AZURE_ENV_GPT_MODEL_NAME` | string | `gpt-5.1` | Set the Model Name (allowed values: gpt-5.1). |
15+
| `AZURE_ENV_GPT_MODEL_NAME` | string | `gpt-5.1` | Set the Model Name (default: gpt-5.1). |
1616
| `AZURE_ENV_GPT_MODEL_VERSION` | string | `2025-11-13` | Set the Azure model version (allowed values: 2025-11-13) |
1717
| `AZURE_ENV_GPT_MODEL_CAPACITY` | integer | `150` | Set the Model Capacity (choose a number based on available GPT model capacity in your subscription). |
1818
| `AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID`| string | Guide to get your [Existing Workspace ID](re-use-log-analytics.md) | Set this if you want to reuse an existing Log Analytics Workspace instead of creating a new one. |

docs/EXAMPLE-CustomizingAzdParameters.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ Change the Model Deployment Type (allowed values: Standard, GlobalStandard)
1717
azd env set AZURE_ENV_MODEL_DEPLOYMENT_TYPE GlobalStandard
1818
```
1919

20-
Set the Model Name (allowed values: gpt-4o)
20+
Set the Model Name (default: gpt-5.1)
2121

2222
```shell
23-
azd env set AZURE_ENV_MODEL_NAME gpt-4o
23+
azd env set AZURE_ENV_GPT_MODEL_NAME gpt-5.1
2424
```
2525

2626
Change the Model Capacity (choose a number based on available GPT model capacity in your subscription)

docs/quota_check.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Check Quota Availability Before Deployment
22

33
Before deploying the accelerator, **ensure sufficient quota availability** for the required model.
4-
> **For Global Standard | GPT-4o - the capacity to at least 200K tokens for optimal performance.**
4+
> **For Global Standard | GPT-5.1 - ensure capacity is at least 200K tokens for optimal performance.**
55
66
### Login if you have not done so already
77
```
@@ -14,7 +14,7 @@ az login --use-device-code
1414

1515
### 📌 Default Models & Capacities:
1616
```
17-
gpt-4o:150
17+
gpt-5.1:150
1818
```
1919
### 📌 Default Regions:
2020
```
@@ -40,15 +40,15 @@ eastus, uksouth, eastus2, northcentralus, swedencentral, westus, westus2, southc
4040
```
4141
✔️ Check specific model(s) in default regions:
4242
```
43-
./quota_check_params.sh --models gpt-4o:150
43+
./quota_check_params.sh --models gpt-5.1:150
4444
```
4545
✔️ Check default models in specific region(s):
4646
```
4747
./quota_check_params.sh --regions eastus,westus
4848
```
4949
✔️ Passing Both models and regions:
5050
```
51-
./quota_check_params.sh --models gpt-4o:150 --regions eastus,westus2
51+
./quota_check_params.sh --models gpt-5.1:150 --regions eastus,westus2
5252
```
5353
✔️ All parameters combined:
5454
```

infra/main.bicep

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,7 @@ var privateDnsZones = [
334334
'privatelink.oms.opinsights.azure.com' // Log Analytics OMS endpoints
335335
'privatelink.ods.opinsights.azure.com' // Log Analytics ODS ingestion endpoints
336336
'privatelink.agentsvc.azure-automation.net' // Agent service automation endpoints
337+
'privatelink.azurecr.io' // Azure Container Registry
337338
]
338339

339340
// DNS Zone Index Constants
@@ -348,6 +349,7 @@ var dnsZoneIndex = {
348349
oms: 7
349350
ods: 8
350351
agentSvc: 9
352+
containerRegistry: 10
351353
}
352354

353355
// ===================================================
@@ -902,15 +904,16 @@ module cosmosDb 'modules/cosmosDb.bicep' = {
902904
// and then updates the container apps to run the freshly built images.
903905
var placeholderContainerImage = 'mcr.microsoft.com/azuredocs/containerapps-helloworld:latest'
904906

905-
module containerRegistry 'br/public:avm/res/container-registry/registry:0.12.1' = {
906-
name: take('avm.res.container-registry.registry.${solutionSuffix}', 64)
907+
module containerRegistry 'modules/containerRegistry.bicep' = {
908+
name: take('module.container-registry.${solutionSuffix}', 64)
907909
params: {
908-
#disable-next-line BCP334 // solutionSuffix always yields a name of sufficient length at deployment time
909-
name: take('cr${solutionSuffix}', 50)
910+
acrName: take('cr${solutionSuffix}', 50)
910911
location: location
911-
acrSku: enableRedundancy ? 'Premium' : 'Standard'
912-
acrAdminUserEnabled: false
913-
zoneRedundancy: enableRedundancy ? 'Enabled' : 'Disabled'
912+
acrSku: (enableRedundancy || enablePrivateNetworking) ? 'Premium' : 'Standard'
913+
publicNetworkAccess: enablePrivateNetworking ? 'Disabled' : 'Enabled'
914+
enablePrivateNetworking: enablePrivateNetworking
915+
backendSubnetResourceId: enablePrivateNetworking ? virtualNetwork!.outputs.pepsSubnetResourceId : ''
916+
privateDnsZoneResourceId: enablePrivateNetworking ? avmPrivateDnsZones[dnsZoneIndex.containerRegistry]!.outputs.resourceId : ''
914917
roleAssignments: [
915918
{
916919
principalId: appIdentity.outputs.principalId

0 commit comments

Comments
 (0)