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

Adding Gateway Adapter API and State API to Standard Deployment #1288

Merged
merged 16 commits into from
Jul 29, 2024
Merged

Adding Gateway Adapter API and State API to Standard Deployment #1288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
45605d4
Adding GatewayAdapterAPI and StateAPI to Standard AZD template
hatboyzero Jul 26, 2024
232b4cf
Merge remote-tracking branch 'origin/main' into mg-t18209-t18210
hatboyzero Jul 26, 2024
51d65fb
Merge remote-tracking branch 'origin/main' into mg-t18209-t18210
hatboyzero Jul 26, 2024
747baba
Resolving issue with standard deployment cosmosdb.bicep and testing d…
hatboyzero Jul 27, 2024
6e58e97
More updates to resolve issues with AZD Standard deployment
hatboyzero Jul 27, 2024
91257a9
Setting correct MSI client IDs for Gateway Adapter API and State API
hatboyzero Jul 27, 2024
22dcf41
Merge remote-tracking branch 'origin/main' into poc/0.8.0-mg
hatboyzero Jul 27, 2024
060896c
Cleaning up scripts and correcting naming errors
hatboyzero Jul 27, 2024
aa4e1a5
Adding Standard specific assets and updating appconfig.template.json …
hatboyzero Jul 28, 2024
9abfb38
Merge remote-tracking branch 'origin/cj-refactor-app-config' into mg-…
hatboyzero Jul 28, 2024
4bb04de
Aligning Standard deployment with incoming changes around generated a…
hatboyzero Jul 28, 2024
8a5583a
Merge remote-tracking branch 'origin/cj-refactor-app-config' into mg-…
hatboyzero Jul 28, 2024
34cc13a
Aligning Standard deployment with incoming changes around generated a…
hatboyzero Jul 28, 2024
0bbed54
Merge remote-tracking branch 'origin/cj-refactor-app-config' into mg-…
hatboyzero Jul 29, 2024
4004a20
Merge remote-tracking branch 'origin/main' into mg-t18209-t18210
hatboyzero Jul 29, 2024
ad880eb
Setting version to grab test images
hatboyzero Jul 29, 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
16 changes: 16 additions & 0 deletions deploy/common/data/resource-provider/FoundationaLLM.Configuration/AzureAISearch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"type": "api-endpoint",
"name": "AzureAISearch",
"object_id": "/instances/f34f0a89-83b1-43b3-a5f9-e8bbdfa9f251/providers/FoundationaLLM.Configuration/apiEndpoints/AzureAISearch",
"display_name": null,
"description": null,
"cost_center": null,
"category": "General",
"authentication_type": "AzureIdentity",
"authentication_parameters": {},
"url": "https://search-mg08-fllmstd-westus-storage.search.windows.net",
"url_exceptions": [],
"timeout_seconds": 60,
"retry_strategy_name": "ExponentialBackoff"
}

17 changes: 17 additions & 0 deletions deploy/common/data/resource-provider/FoundationaLLM.Configuration/AzureEventGrid.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"type": "api-endpoint",
"name": "AzureEventGrid",
"object_id": "/instances/f34f0a89-83b1-43b3-a5f9-e8bbdfa9f251/providers/FoundationaLLM.Configuration/apiEndpoints/AzureEventGrid",
"display_name": null,
"description": null,
"cost_center": null,
"category": "General",
"authentication_type": "APIKey",
"authentication_parameters": {
"api_key_configuration_name": "FoundationaLLM:APIEndpoints:AzureEventGrid:APIKey"
},
"url": "https://eg-mg08-fllmstd-westus-svc.westus3-1.eventgrid.azure.net/",
"url_exceptions": [],
"timeout_seconds": 60,
"retry_strategy_name": "ExponentialBackoff"
}
2 changes: 1 addition & 1 deletion deploy/common/helm/core-api/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ spec:
protocol: TCP
readinessProbe:
httpGet:
path: /status
path: /instances/{{ .Values.instanceId }}/status
port: 80
periodSeconds: 3
timeoutSeconds: 1
Expand Down
2 changes: 1 addition & 1 deletion deploy/common/helm/gateway-adapter-api/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ metadata:
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
data:
AZURE_CLIENT_ID: {{ .Values.azureWorkloadIdentity.gatewayApiClientId }}
AZURE_CLIENT_ID: {{ .Values.azureWorkloadIdentity.gatewayAdapterApiClientId }}
2 changes: 1 addition & 1 deletion deploy/common/helm/gateway-adapter-api/templates/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: ServiceAccount
metadata:
name: {{ .Values.serviceAccountName }}
annotations:
azure.workload.identity/client-id: {{ .Values.azureWorkloadIdentity.gatewayApiClientId }}
azure.workload.identity/client-id: {{ .Values.azureWorkloadIdentity.gatewayAdapterApiClientId }}
azure.workload.identity/tenant-id: {{ .Values.azureWorkloadIdentity.tenantId }}
labels:
azure.workload.identity/use: "true"
2 changes: 1 addition & 1 deletion deploy/common/helm/management-api/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ spec:
protocol: TCP
readinessProbe:
httpGet:
path: /status
path: /instances/{{ .Values.instanceId }}/status
port: 80
periodSeconds: 3
timeoutSeconds: 1
Expand Down
2 changes: 1 addition & 1 deletion deploy/common/helm/state-api/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ metadata:
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
data:
AZURE_CLIENT_ID: {{ .Values.azureWorkloadIdentity.gatewayApiClientId }}
AZURE_CLIENT_ID: {{ .Values.azureWorkloadIdentity.stateApiClientId }}
2 changes: 1 addition & 1 deletion deploy/common/helm/state-api/templates/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: ServiceAccount
metadata:
name: {{ .Values.serviceAccountName }}
annotations:
azure.workload.identity/client-id: {{ .Values.azureWorkloadIdentity.gatewayApiClientId }}
azure.workload.identity/client-id: {{ .Values.azureWorkloadIdentity.stateApiClientId }}
azure.workload.identity/tenant-id: {{ .Values.azureWorkloadIdentity.tenantId }}
labels:
azure.workload.identity/use: "true"
80 changes: 0 additions & 80 deletions deploy/standard/Deployment-Manifest.template.json
View file
Open in desktop

This file was deleted.

Loading
Loading