Skip to content

Commit 9f9ae02

Browse files
chaudharinirajchaudhariniraj
committed
bicep build changes
1 parent 318391b commit 9f9ae02

1 file changed

Lines changed: 80 additions & 58 deletions

File tree

‎infra/main.json‎

Lines changed: 80 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"metadata": {
66
"_generator": {
77
"name": "bicep",
8-
"version": "0.44.1.10279",
9-
"templateHash": "3841741921827855283"
8+
"version": "0.43.8.12551",
9+
"templateHash": "9984485182269407267"
1010
},
1111
"name": "Content Processing Solution Accelerator",
1212
"description": "Bicep template to deploy the Content Processing Solution Accelerator with AVM compliance."
@@ -105,20 +105,6 @@
105105
"description": "Optional. Capacity of the GPT deployment: (minimum 10)."
106106
}
107107
},
108-
"containerRegistryEndpoint": {
109-
"type": "string",
110-
"defaultValue": "cpscontainerreg.azurecr.io",
111-
"metadata": {
112-
"description": "Optional. The container registry login server/endpoint for the container images (for example, an Azure Container Registry endpoint)."
113-
}
114-
},
115-
"imageTag": {
116-
"type": "string",
117-
"defaultValue": "latest_v2",
118-
"metadata": {
119-
"description": "Optional. The image tag for the container images."
120-
}
121-
},
122108
"enablePrivateNetworking": {
123109
"type": "bool",
124110
"defaultValue": false,
@@ -339,8 +325,8 @@
339325
"metadata": {
340326
"_generator": {
341327
"name": "bicep",
342-
"version": "0.44.1.10279",
343-
"templateHash": "4148028483891244972"
328+
"version": "0.43.8.12551",
329+
"templateHash": "13206959925771644022"
344330
}
345331
},
346332
"definitions": {
@@ -19308,8 +19294,8 @@
1930819294
"metadata": {
1930919295
"_generator": {
1931019296
"name": "bicep",
19311-
"version": "0.44.1.10279",
19312-
"templateHash": "14763088429533772999"
19297+
"version": "0.43.8.12551",
19298+
"templateHash": "13200482898648544945"
1931319299
}
1931419300
},
1931519301
"parameters": {
@@ -23334,8 +23320,8 @@
2333423320
"metadata": {
2333523321
"_generator": {
2333623322
"name": "bicep",
23337-
"version": "0.44.1.10279",
23338-
"templateHash": "14944034125601240095"
23323+
"version": "0.43.8.12551",
23324+
"templateHash": "15729887991536611208"
2333923325
}
2334023326
},
2334123327
"parameters": {
@@ -23938,8 +23924,8 @@
2393823924
"metadata": {
2393923925
"_generator": {
2394023926
"name": "bicep",
23941-
"version": "0.44.1.10279",
23942-
"templateHash": "3008626070117491750"
23927+
"version": "0.43.8.12551",
23928+
"templateHash": "8672669912945312056"
2394323929
},
2394423930
"name": "Container Registry Module"
2394523931
},
@@ -36241,11 +36227,6 @@
3624136227
"diagnosticSettings": "[if(parameters('enableMonitoring'), createObject('value', createArray(createObject('workspaceResourceId', reference('logAnalyticsWorkspace').outputs.resourceId.value))), createObject('value', null()))]",
3624236228
"roleAssignments": {
3624336229
"value": [
36244-
{
36245-
"principalId": "[reference('avmManagedIdentity').outputs.principalId.value]",
36246-
"roleDefinitionIdOrName": "8e3af657-a8ff-443c-a75c-2fe8c4bcb635",
36247-
"principalType": "ServicePrincipal"
36248-
},
3624936230
{
3625036231
"principalId": "[reference('avmContainerApp').outputs.systemAssignedMIPrincipalId.value]",
3625136232
"roleDefinitionIdOrName": "Cognitive Services OpenAI User",
@@ -36316,8 +36297,8 @@
3631636297
"metadata": {
3631736298
"_generator": {
3631836299
"name": "bicep",
36319-
"version": "0.44.1.10279",
36320-
"templateHash": "9717412251971567270"
36300+
"version": "0.43.8.12551",
36301+
"templateHash": "9621562991003135575"
3632136302
},
3632236303
"name": "Cognitive Services",
3632336304
"description": "This module deploys a Cognitive Service."
@@ -37576,8 +37557,8 @@
3757637557
"metadata": {
3757737558
"_generator": {
3757837559
"name": "bicep",
37579-
"version": "0.44.1.10279",
37580-
"templateHash": "7181684108515692296"
37560+
"version": "0.43.8.12551",
37561+
"templateHash": "8864856500234357706"
3758137562
}
3758237563
},
3758337564
"definitions": {
@@ -39309,8 +39290,8 @@
3930939290
"metadata": {
3931039291
"_generator": {
3931139292
"name": "bicep",
39312-
"version": "0.44.1.10279",
39313-
"templateHash": "4868310155755856428"
39293+
"version": "0.43.8.12551",
39294+
"templateHash": "312284397710022090"
3931439295
}
3931539296
},
3931639297
"definitions": {
@@ -39463,8 +39444,8 @@
3946339444
"metadata": {
3946439445
"_generator": {
3946539446
"name": "bicep",
39466-
"version": "0.44.1.10279",
39467-
"templateHash": "4168378797065634217"
39447+
"version": "0.43.8.12551",
39448+
"templateHash": "276675105610077046"
3946839449
}
3946939450
},
3947039451
"definitions": {
@@ -39681,8 +39662,8 @@
3968139662
"metadata": {
3968239663
"_generator": {
3968339664
"name": "bicep",
39684-
"version": "0.44.1.10279",
39685-
"templateHash": "7181684108515692296"
39665+
"version": "0.43.8.12551",
39666+
"templateHash": "8864856500234357706"
3968639667
}
3968739668
},
3968839669
"definitions": {
@@ -41414,8 +41395,8 @@
4141441395
"metadata": {
4141541396
"_generator": {
4141641397
"name": "bicep",
41417-
"version": "0.44.1.10279",
41418-
"templateHash": "4868310155755856428"
41398+
"version": "0.43.8.12551",
41399+
"templateHash": "312284397710022090"
4141941400
}
4142041401
},
4142141402
"definitions": {
@@ -41568,8 +41549,8 @@
4156841549
"metadata": {
4156941550
"_generator": {
4157041551
"name": "bicep",
41571-
"version": "0.44.1.10279",
41572-
"templateHash": "4168378797065634217"
41552+
"version": "0.43.8.12551",
41553+
"templateHash": "276675105610077046"
4157341554
}
4157441555
},
4157541556
"definitions": {
@@ -41809,7 +41790,6 @@
4180941790
"dependsOn": [
4181041791
"avmContainerApp",
4181141792
"avmContainerApp_Workflow",
41812-
"avmManagedIdentity",
4181341793
"logAnalyticsWorkspace"
4181441794
]
4181541795
},
@@ -44169,7 +44149,12 @@
4416944149
"value": "[parameters('enableTelemetry')]"
4417044150
},
4417144151
"registries": {
44172-
"value": null
44152+
"value": [
44153+
{
44154+
"server": "[reference('avmContainerRegistry').outputs.loginServer.value]",
44155+
"identity": "[reference('avmContainerRegistryReader').outputs.resourceId.value]"
44156+
}
44157+
]
4417344158
},
4417444159
"managedIdentities": {
4417544160
"value": {
@@ -44183,7 +44168,7 @@
4418344168
"value": [
4418444169
{
4418544170
"name": "[format('ca-{0}', variables('solutionSuffix'))]",
44186-
"image": "[format('{0}/contentprocessor:{1}', parameters('containerRegistryEndpoint'), parameters('imageTag'))]",
44171+
"image": "mcr.microsoft.com/k8se/quickstart:latest",
4418744172
"resources": {
4418844173
"cpu": 4,
4418944174
"memory": "8.0Gi"
@@ -45771,6 +45756,7 @@
4577145756
"dependsOn": [
4577245757
"applicationInsights",
4577345758
"avmContainerAppEnv",
45759+
"avmContainerRegistry",
4577445760
"avmContainerRegistryReader"
4577545761
]
4577645762
},
@@ -45800,7 +45786,12 @@
4580045786
"value": "[parameters('enableTelemetry')]"
4580145787
},
4580245788
"registries": {
45803-
"value": null
45789+
"value": [
45790+
{
45791+
"server": "[reference('avmContainerRegistry').outputs.loginServer.value]",
45792+
"identity": "[reference('avmContainerRegistryReader').outputs.resourceId.value]"
45793+
}
45794+
]
4580445795
},
4580545796
"tags": {
4580645797
"value": "[parameters('tags')]"
@@ -45817,7 +45808,7 @@
4581745808
"value": [
4581845809
{
4581945810
"name": "[format('ca-{0}-api', variables('solutionSuffix'))]",
45820-
"image": "[format('{0}/contentprocessorapi:{1}', parameters('containerRegistryEndpoint'), parameters('imageTag'))]",
45811+
"image": "mcr.microsoft.com/k8se/quickstart:latest",
4582145812
"resources": {
4582245813
"cpu": 4,
4582345814
"memory": "8.0Gi"
@@ -47469,6 +47460,7 @@
4746947460
"dependsOn": [
4747047461
"applicationInsights",
4747147462
"avmContainerAppEnv",
47463+
"avmContainerRegistry",
4747247464
"avmContainerRegistryReader"
4747347465
]
4747447466
},
@@ -47498,7 +47490,12 @@
4749847490
"value": "[parameters('enableTelemetry')]"
4749947491
},
4750047492
"registries": {
47501-
"value": null
47493+
"value": [
47494+
{
47495+
"server": "[reference('avmContainerRegistry').outputs.loginServer.value]",
47496+
"identity": "[reference('avmContainerRegistryReader').outputs.resourceId.value]"
47497+
}
47498+
]
4750247499
},
4750347500
"tags": {
4750447501
"value": "[parameters('tags')]"
@@ -47546,7 +47543,7 @@
4754647543
"value": [
4754747544
{
4754847545
"name": "[format('ca-{0}-web', variables('solutionSuffix'))]",
47549-
"image": "[format('{0}/contentprocessorweb:{1}', parameters('containerRegistryEndpoint'), parameters('imageTag'))]",
47546+
"image": "mcr.microsoft.com/k8se/quickstart:latest",
4755047547
"resources": {
4755147548
"cpu": 4,
4755247549
"memory": "8.0Gi"
@@ -49120,6 +49117,7 @@
4912049117
"dependsOn": [
4912149118
"avmContainerApp_API",
4912249119
"avmContainerAppEnv",
49120+
"avmContainerRegistry",
4912349121
"avmContainerRegistryReader"
4912449122
]
4912549123
},
@@ -49149,7 +49147,12 @@
4914949147
"value": "[parameters('enableTelemetry')]"
4915049148
},
4915149149
"registries": {
49152-
"value": null
49150+
"value": [
49151+
{
49152+
"server": "[reference('avmContainerRegistry').outputs.loginServer.value]",
49153+
"identity": "[reference('avmContainerRegistryReader').outputs.resourceId.value]"
49154+
}
49155+
]
4915349156
},
4915449157
"tags": {
4915549158
"value": "[parameters('tags')]"
@@ -49166,7 +49169,7 @@
4916649169
"value": [
4916749170
{
4916849171
"name": "[format('ca-{0}-wkfl', variables('solutionSuffix'))]",
49169-
"image": "[format('{0}/contentprocessorworkflow:{1}', parameters('containerRegistryEndpoint'), parameters('imageTag'))]",
49172+
"image": "mcr.microsoft.com/k8se/quickstart:latest",
4917049173
"resources": {
4917149174
"cpu": 4,
4917249175
"memory": "8.0Gi"
@@ -50751,6 +50754,7 @@
5075150754
"dependsOn": [
5075250755
"applicationInsights",
5075350756
"avmContainerAppEnv",
50757+
"avmContainerRegistry",
5075450758
"avmContainerRegistryReader"
5075550759
]
5075650760
},
@@ -61434,7 +61438,12 @@
6143461438
"value": "Consumption"
6143561439
},
6143661440
"registries": {
61437-
"value": null
61441+
"value": [
61442+
{
61443+
"server": "[reference('avmContainerRegistry').outputs.loginServer.value]",
61444+
"identity": "[reference('avmContainerRegistryReader').outputs.resourceId.value]"
61445+
}
61446+
]
6143861447
},
6143961448
"tags": {
6144061449
"value": "[parameters('tags')]"
@@ -61451,7 +61460,7 @@
6145161460
"value": [
6145261461
{
6145361462
"name": "[format('ca-{0}', variables('solutionSuffix'))]",
61454-
"image": "[format('{0}/contentprocessor:{1}', parameters('containerRegistryEndpoint'), parameters('imageTag'))]",
61463+
"image": "mcr.microsoft.com/k8se/quickstart:latest",
6145561464
"resources": {
6145661465
"cpu": 4,
6145761466
"memory": "8.0Gi"
@@ -63038,6 +63047,7 @@
6303863047
"applicationInsights",
6303963048
"avmAppConfig",
6304063049
"avmContainerAppEnv",
63050+
"avmContainerRegistry",
6304163051
"avmContainerRegistryReader",
6304263052
"cognitiveServicePrivateEndpoint"
6304363053
]
@@ -63068,7 +63078,12 @@
6306863078
"value": "Consumption"
6306963079
},
6307063080
"registries": {
63071-
"value": null
63081+
"value": [
63082+
{
63083+
"server": "[reference('avmContainerRegistry').outputs.loginServer.value]",
63084+
"identity": "[reference('avmContainerRegistryReader').outputs.resourceId.value]"
63085+
}
63086+
]
6307263087
},
6307363088
"tags": {
6307463089
"value": "[parameters('tags')]"
@@ -63085,7 +63100,7 @@
6308563100
"value": [
6308663101
{
6308763102
"name": "[format('ca-{0}-api', variables('solutionSuffix'))]",
63088-
"image": "[format('{0}/contentprocessorapi:{1}', parameters('containerRegistryEndpoint'), parameters('imageTag'))]",
63103+
"image": "mcr.microsoft.com/k8se/quickstart:latest",
6308963104
"resources": {
6309063105
"cpu": 4,
6309163106
"memory": "8.0Gi"
@@ -64738,6 +64753,7 @@
6473864753
"applicationInsights",
6473964754
"avmAppConfig",
6474064755
"avmContainerAppEnv",
64756+
"avmContainerRegistry",
6474164757
"avmContainerRegistryReader",
6474264758
"cognitiveServicePrivateEndpoint"
6474364759
]
@@ -64768,7 +64784,12 @@
6476864784
"value": "Consumption"
6476964785
},
6477064786
"registries": {
64771-
"value": null
64787+
"value": [
64788+
{
64789+
"server": "[reference('avmContainerRegistry').outputs.loginServer.value]",
64790+
"identity": "[reference('avmContainerRegistryReader').outputs.resourceId.value]"
64791+
}
64792+
]
6477264793
},
6477364794
"tags": {
6477464795
"value": "[parameters('tags')]"
@@ -64785,7 +64806,7 @@
6478564806
"value": [
6478664807
{
6478764808
"name": "[format('ca-{0}-wkfl', variables('solutionSuffix'))]",
64788-
"image": "[format('{0}/contentprocessorworkflow:{1}', parameters('containerRegistryEndpoint'), parameters('imageTag'))]",
64809+
"image": "mcr.microsoft.com/k8se/quickstart:latest",
6478964810
"resources": {
6479064811
"cpu": 4,
6479164812
"memory": "8.0Gi"
@@ -66371,6 +66392,7 @@
6637166392
"applicationInsights",
6637266393
"avmAppConfig",
6637366394
"avmContainerAppEnv",
66395+
"avmContainerRegistry",
6637466396
"avmContainerRegistryReader"
6637566397
]
6637666398
}

0 commit comments

Comments
 (0)