Merge pull request #1288 from solliancenet/mg-t18209-t18210

solliancenet · Jul 29, 2024 · b02263b · b02263b
2 parents 14b980b + ad880eb
commit b02263b
Show file tree

Hide file tree

Showing 45 changed files with 1,108 additions and 1,816 deletions.
diff --git a/deploy/common/data/resource-provider/FoundationaLLM.Configuration/AzureAISearch.json b/deploy/common/data/resource-provider/FoundationaLLM.Configuration/AzureAISearch.json
@@ -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"
+}
+
diff --git a/deploy/common/data/resource-provider/FoundationaLLM.Configuration/AzureEventGrid.json b/deploy/common/data/resource-provider/FoundationaLLM.Configuration/AzureEventGrid.json
@@ -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"
+}
diff --git a/deploy/common/helm/core-api/templates/deployment.yaml b/deploy/common/helm/core-api/templates/deployment.yaml
@@ -67,7 +67,7 @@ spec:
               protocol: TCP
           readinessProbe:
             httpGet:
-              path: /status
+              path: /instances/{{ .Values.instanceId }}/status
               port: 80
             periodSeconds: 3
             timeoutSeconds: 1

diff --git a/deploy/common/helm/gateway-adapter-api/templates/configmap.yaml b/deploy/common/helm/gateway-adapter-api/templates/configmap.yaml
@@ -10,4 +10,4 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data: 
-  AZURE_CLIENT_ID: {{ .Values.azureWorkloadIdentity.gatewayApiClientId }}
+  AZURE_CLIENT_ID: {{ .Values.azureWorkloadIdentity.gatewayAdapterApiClientId }}
diff --git a/deploy/common/helm/gateway-adapter-api/templates/serviceaccount.yaml b/deploy/common/helm/gateway-adapter-api/templates/serviceaccount.yaml
@@ -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"
diff --git a/deploy/common/helm/management-api/templates/deployment.yaml b/deploy/common/helm/management-api/templates/deployment.yaml
@@ -67,7 +67,7 @@ spec:
               protocol: TCP
           readinessProbe:
             httpGet:
-              path: /status
+              path: /instances/{{ .Values.instanceId }}/status
               port: 80
             periodSeconds: 3
             timeoutSeconds: 1

diff --git a/deploy/common/helm/state-api/templates/configmap.yaml b/deploy/common/helm/state-api/templates/configmap.yaml
@@ -10,4 +10,4 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data: 
-  AZURE_CLIENT_ID: {{ .Values.azureWorkloadIdentity.gatewayApiClientId }}
+  AZURE_CLIENT_ID: {{ .Values.azureWorkloadIdentity.stateApiClientId }}
diff --git a/deploy/common/helm/state-api/templates/serviceaccount.yaml b/deploy/common/helm/state-api/templates/serviceaccount.yaml
@@ -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"
diff --git a/deploy/standard/Deployment-Manifest.template.json b/deploy/standard/Deployment-Manifest.template.json