Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Standard to establish a peering to an existing hub VNET #1300

Merged
merged 10 commits into from
Aug 1, 2024
Merged

Update Standard to establish a peering to an existing hub VNET #1300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c324820
Update Standard to establish a peering to an existing hub VNET
hatboyzero Jul 30, 2024
4e1d4c9
Removed generation of host entries for /etc/hosts for resources
hatboyzero Jul 30, 2024
c3a3454
Updated PR based on comments and adding parameter to set allowed exte…
hatboyzero Jul 30, 2024
3d3d674
Consolidating dns into networking-rg.bicep
hatboyzero Jul 30, 2024
26463ad
Addressing PR comments around allowedExternalCidr and networkName
hatboyzero Jul 30, 2024
cc55af7
Merge remote-tracking branch 'origin/main' into mg-hub-integration
hatboyzero Jul 31, 2024
5357610
Correcting secret names
hatboyzero Jul 31, 2024
09d8a9f
Merge remote-tracking branch 'origin/main' into mg-hub-integration
hatboyzero Jul 31, 2024
062e2b6
Merge remote-tracking branch 'origin/main' into mg-hub-integration
hatboyzero Aug 1, 2024
7ff2388
Aligning standard appconfig.template.json with the generated template
hatboyzero Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion deploy/common/data/resource-provider/FoundationaLLM.Configuration/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
AuthorizationAPI.json
AzureContentSafety.json
AzureEventGrid.json
GatekeeperAPI.json
GatekeeperIntegrationAPI.json
GatewayAPI.json
Expand All @@ -10,4 +11,6 @@ VectorizationAPI.json
VectorizationWorker.json
StateAPI.json
GatewayAdapterAPI.json
AzureOpenAI.json
AzureOpenAI.json
AzureAISearch.json
AzureEventGrid.json
16 changes: 0 additions & 16 deletions deploy/common/data/resource-provider/FoundationaLLM.Configuration/AzureAISearch.json
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions deploy/common/data/resource-provider/FoundationaLLM.Configuration/AzureEventGrid.json
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions deploy/standard/azd-hooks/postprovision.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ try {
app = $env:FLLM_APP_RG
auth = $env:FLLM_AUTH_RG
data = $env:FLLM_DATA_RG
dns = $env:FLLM_DNS_RG
jbx = $env:FLLM_JBX_RG
net = $env:FLLM_NET_RG
oai = $env:FLLM_OAI_RG
Expand All @@ -39,4 +38,4 @@ try {
finally {
Pop-Location
Set-PSDebug -Trace 0 # Echo every command (0 to disable, 1 to enable)
}
}
71 changes: 39 additions & 32 deletions deploy/standard/config/appconfig.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,28 +113,28 @@
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:AuthorizationAPI:APIUrl",
"key": "FoundationaLLM:APIEndpoints:AuthorizationAPI:Essentials:APIUrl",
"value": "http://authorization-api/authorization",
"label": null,
"content_type": "",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:AuthorizationAPI:APIScope",
"key": "FoundationaLLM:APIEndpoints:AuthorizationAPI:Essentials:APIScope",
"value": "{{authorizationApiScope}}",
"label": null,
"content_type": "",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:CoreAPI:APIUrl",
"key": "FoundationaLLM:APIEndpoints:CoreAPI:Essentials:APIUrl",
"value": "https://{{coreApiHostname}}/core",
"label": null,
"content_type": "",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:CoreAPI:AppInsightsConnectionString",
"key": "FoundationaLLM:APIEndpoints:CoreAPI:Essentials:AppInsightsConnectionString",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-appinsights-connectionstring\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
Expand Down Expand Up @@ -218,29 +218,29 @@
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:CoreWorker:APIKey",
"key": "FoundationaLLM:APIEndpoints:CoreWorker:Essentials:APIKey",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-apiendpoints-coreworker-apikey\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:CoreWorker:AppInsightsConnectionString",
"key": "FoundationaLLM:APIEndpoints:CoreWorker:Essentials:AppInsightsConnectionString",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-appinsights-connectionstring\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:GatekeeperAPI:APIKey",
"key": "FoundationaLLM:APIEndpoints:GatekeeperAPI:Essentials:APIKey",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-apiendpoints-gatekeeperapi-apikey\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:GatekeeperAPI:AppInsightsConnectionString",
"value": "{\"uri\":\"https://kv-mg08-fllmstd-west-ops.vault.azure.net/secrets/foundationallm-appinsights-connectionstring\"}",
"key": "FoundationaLLM:APIEndpoints:GatekeeperAPI:Essentials:AppInsightsConnectionString",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-appinsights-connectionstring\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
Expand Down Expand Up @@ -281,70 +281,70 @@
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:GatekeeperIntegrationAPI:APIKey",
"key": "FoundationaLLM:APIEndpoints:GatekeeperIntegrationAPI:Essentials:APIKey",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-apiendpoints-gatekeeperintergrationapi-apikey\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:GatekeeperIntegrationAPI:AppInsightsConnectionString",
"key": "FoundationaLLM:APIEndpoints:GatekeeperIntegrationAPI:Essentials:AppInsightsConnectionString",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-appinsights-connectionstring\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:OrchestrationAPI:APIKey",
"key": "FoundationaLLM:APIEndpoints:OrchestrationAPI:Essentials:APIKey",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-apiendpoints-orchestrationapi-apikey\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:OrchestrationAPI:AppInsightsConnectionString",
"key": "FoundationaLLM:APIEndpoints:OrchestrationAPI:Essentials:AppInsightsConnectionString",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-appinsights-connectionstring\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:LangChainAPI:APIKey",
"key": "FoundationaLLM:APIEndpoints:LangChainAPI:Essentials:APIKey",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-apiendpoints-langchainapi-apikey\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:LangChainAPI:AppInsightsConnectionString",
"key": "FoundationaLLM:APIEndpoints:LangChainAPI:Essentials:AppInsightsConnectionString",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-appinsights-connectionstring\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:SemanticKernelAPI:APIKey",
"key": "FoundationaLLM:APIEndpoints:SemanticKernelAPI:Essentials:APIKey",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-apiendpoints-semantickernelapi-apikey\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:SemanticKernelAPI:AppInsightsConnectionString",
"key": "FoundationaLLM:APIEndpoints:SemanticKernelAPI:Essentials:AppInsightsConnectionString",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-appinsights-connectionstring\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:ManagementAPI:APIUrl",
"key": "FoundationaLLM:APIEndpoints:ManagementAPI:Essentials:APIUrl",
"value": "https://{{managementApiHostname}}/management",
"label": null,
"content_type": "",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:ManagementAPI:AppInsightsConnectionString",
"key": "FoundationaLLM:APIEndpoints:ManagementAPI:Essentials:AppInsightsConnectionString",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-appinsights-connectionstring\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
Expand Down Expand Up @@ -386,42 +386,42 @@
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:VectorizationAPI:APIKey",
"key": "FoundationaLLM:APIEndpoints:VectorizationAPI:Essentials:APIKey",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-apiendpoints-vectorizationapi-apikey\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:VectorizationAPI:AppInsightsConnectionString",
"key": "FoundationaLLM:APIEndpoints:VectorizationAPI:Essentials:AppInsightsConnectionString",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-appinsights-connectionstring\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:VectorizationWorker:APIKey",
"key": "FoundationaLLM:APIEndpoints:VectorizationWorker:Essentials:APIKey",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-apiendpoints-vectorizationworker-apikey\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:VectorizationWorker:AppInsightsConnectionString",
"key": "FoundationaLLM:APIEndpoints:VectorizationWorker:Essentials:AppInsightsConnectionString",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-appinsights-connectionstring\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:GatewayAPI:APIKey",
"key": "FoundationaLLM:APIEndpoints:GatewayAPI:Essentials:APIKey",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-apiendpoints-gatewayapi-apikey\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:GatewayAPI:AppInsightsConnectionString",
"key": "FoundationaLLM:APIEndpoints:GatewayAPI:Essentials:AppInsightsConnectionString",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-appinsights-connectionstring\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
Expand All @@ -435,28 +435,35 @@
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:GatewayAdapterAPI:APIKey",
"key": "FoundationaLLM:APIEndpoints:GatewayAdapterAPI:Essentials:APIKey",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-apiendpoints-gatewayadapterapi-apikey\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:GatewayAdapterAPI:AppInsightsConnectionString",
"key": "FoundationaLLM:APIEndpoints:GatewayAdapterAPI:Essentials:AppInsightsConnectionString",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-appinsights-connectionstring\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:StateAPI:APIKey",
"key": "FoundationaLLM:APIEndpoints:StateAPI:Essentials:APIUrl",
"value": "http://state-api/state",
"label": null,
"content_type": "",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:StateAPI:Essentials:APIKey",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-apinedpoints-stateapi-apikey\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:StateAPI:AppInsightsConnectionString",
"key": "FoundationaLLM:APIEndpoints:StateAPI:Essentials:AppInsightsConnectionString",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-appinsights-connectionstring\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
Expand Down Expand Up @@ -484,14 +491,14 @@
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:AzureOpenAI:APIKey",
"key": "FoundationaLLM:APIEndpoints:AzureOpenAI:Essentials:APIKey",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-apiendpoints-azureopenai-apikey\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:AzureEventGrid:APIKey",
"key": "FoundationaLLM:APIEndpoints:AzureEventGrid:Essentials:APIKey",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-apiendpoints-azureeventgrid-apikey\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
Expand All @@ -505,7 +512,7 @@
"tags": {}
},
{
"key": "FoundationaLLM:APIEndpoints:AzureContentSafety:APIKey",
"key": "FoundationaLLM:APIEndpoints:AzureContentSafety:Essentials:APIKey",
"value": "{\"uri\":\"{{keyvaultUri}}secrets/foundationallm-apiendpoints-azurecontentsafety-apikey\"}",
"label": null,
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
Expand Down
2 changes: 1 addition & 1 deletion deploy/standard/config/version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "0.8.0-mg-test"
"version": "0.8.0"
}
Loading
Loading