Merge pull request #2063 from solliancenet/mg-s19720-2

Deployment changes in support of 0.9.2 QS and STD
solliancenet · Jan 24, 2025 · 2294017 · 2294017
2 parents ce3e285 + 2a1db78
commit 2294017
Show file tree

Hide file tree

Showing 53 changed files with 635 additions and 145 deletions.
diff --git a/deploy/common/config/openAiDeploymentConfig.json b/deploy/common/config/openAiDeploymentConfig.json
@@ -1,72 +1,29 @@
 [
-    {
-        "name": "completions",
-        "locations": [
-            "eastus",
-            "eastus2",
-            "japaneast",
-            "northcentralus",
-            "switzerlandnorth"
-        ],
-        "raiPolicyName": "",
-        "model": {
-            "format": "OpenAI",
-            "name": "gpt-35-turbo",
-            "version": "0613"
-        },
-        "sku": {
-            "capacity": 10,
-            "name": "Standard"
-        }
-    },
-    {
-        "name": "completions",
-        "locations": [
-          "austrailiaeast",
-          "canadaeast",
-          "francecentral",
-          "southindia",
-          "swedencentral",
-          "uksouth",
-          "westus"
-        ],
-        "raiPolicyName": "",
-        "model": {
-          "format": "OpenAI",
-          "name": "gpt-35-turbo",
-          "version": "1106"
-        },
-        "sku": {
-          "capacity": 10,
-          "name": "Standard"
-        }
-      },
       {
-        "name": "completions4",
+        "name": "completions4o",
         "locations": [
-          "austrailiaeast",
-          "canadaeast",
+          "eastus",
           "eastus2",
-          "francecentral",
-          "norwayeast",
+          "northcentralus",
+          "southcentralus",
           "southindia",
           "swedencentral",
-          "uksouth",
-          "westus"
+          "westus",
+          "westus3"
         ],
         "raiPolicyName": "",
         "model": {
           "format": "OpenAI",
-          "name": "gpt-4",
-          "version": "1106-Preview"
+          "name": "gpt-4o",
+          "version": "2024-08-06"
         },
         "sku": {
-          "capacity": 4,
+          "capacity": 100,
           "name": "Standard"
         }
       },
       {
-        "name": "completions4o",
+        "name": "completions4o-mini",
         "locations": [
           "eastus",
           "eastus2",
@@ -80,11 +37,11 @@
         "raiPolicyName": "",
         "model": {
           "format": "OpenAI",
-          "name": "gpt-4o",
-          "version": "2024-05-13"
+          "name": "gpt-4o-mini",
+          "version": "2024-07-18"
         },
         "sku": {
-          "capacity": 100,
+          "capacity": 8,
           "name": "Standard"
         }
       },
@@ -110,19 +67,24 @@
         "name": "embeddings",
         "locations": [
           "austrailiaeast",
+          "brazilsouth",
           "canadaeast",
           "eastus",
           "eastus2",
           "francecentral",
           "japaneast",
           "northcentralus",
           "norwayeast",
+          "southafricanorth",
           "southcentralus",
+          "southindia",
           "swedencentral",
           "switzerlandnorth",
+          "uaenorth",
           "uksouth",
           "westeurope",
-          "westus"
+          "westus",
+          "westus3"
         ],
         "raiPolicyName": "Microsoft.Default",
         "model": {
@@ -138,15 +100,25 @@
       {
         "name": "embeddings-3-large",
         "locations": [
+          "austrailiaeast",
           "canadaeast",
           "eastus",
-          "eastus2"
+          "eastus2",
+          "francecentral",
+          "japaneast",
+          "norwayeast",
+          "polandcentral",
+          "southindia",
+          "swedencentral",
+          "switzerlandnorth",
+          "uksouth",
+          "westus3"
         ],
         "raiPolicyName": "Microsoft.Default",
         "model": {
           "format": "OpenAI",
           "name": "text-embedding-3-large",
-          "version": ""
+          "version": "1"
         },
         "sku": {
           "capacity": 60,
@@ -156,15 +128,19 @@
       {
         "name": "embeddings-3-small",
         "locations": [
+          "austrailiaeast",
           "canadaeast",
           "eastus",
-          "eastus2"
+          "eastus2",
+          "japaneast",
+          "switzerlandnorth",
+          "westus"
         ],
         "raiPolicyName": "Microsoft.Default",
         "model": {
           "format": "OpenAI",
           "name": "text-embedding-3-small",
-          "version": ""
+          "version": "1"
         },
         "sku": {
           "capacity": 60,

diff --git a/deploy/common/data/resource-provider/FoundationaLLM.Agent/OpenAIAssistants.json b/deploy/common/data/resource-provider/FoundationaLLM.Agent/OpenAIAssistants.json
@@ -0,0 +1,15 @@
+{
+    "type": "azure-openai-assistants-workflow",
+    "name": "OpenAIAssistants",
+    "object_id": "/instances/4c988d6d-8c58-4b58-8e13-3a7ceebe63ba/providers/FoundationaLLM.Agent/workflows/OpenAIAssistants",
+    "display_name": "OpenAIAssistants",
+    "description": "Open AI Assistants workflow",
+    "cost_center": null,
+    "properties": null,
+    "created_on": "2024-11-08T10:08:27.1953263+00:00",
+    "updated_on": "0001-01-01T00:00:00+00:00",
+    "created_by": "[email protected]",
+    "updated_by": null,
+    "deleted": false,
+    "expiration_date": null
+  }
diff --git a/deploy/common/data/resource-provider/FoundationaLLM.Agent/_resource-references.json b/deploy/common/data/resource-provider/FoundationaLLM.Agent/_resource-references.json
@@ -5,6 +5,12 @@
 			"Filename": "/FoundationaLLM.Agent/FoundationaLLM.json",
 			"Type": "knowledge-management",
 			"Deleted": false
+		},
+		{
+			"Name": "OpenAIAssistants",
+			"Filename": "/FoundationaLLM.Agent/OpenAIAssistants.json",
+			"Type": "workflow",
+			"Deleted": false
 		}
 	]
 }
diff --git a/deploy/common/helm/gatekeeper-api/templates/deployment.yaml b/deploy/common/helm/gatekeeper-api/templates/deployment.yaml
@@ -65,6 +65,12 @@ spec:
             - name: http
               containerPort: 80
               protocol: TCP
+          readinessProbe:
+            httpGet:
+              path: /instances/{{ .Values.instanceId }}/status
+              port: 80
+            periodSeconds: 3
+            timeoutSeconds: 1
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           securityContext:

diff --git a/deploy/common/helm/gatekeeper-integration-api/templates/deployment.yaml b/deploy/common/helm/gatekeeper-integration-api/templates/deployment.yaml
@@ -65,6 +65,12 @@ spec:
             - name: http
               containerPort: 80
               protocol: TCP
+          readinessProbe:
+            httpGet:
+              path: /status
+              port: 80
+            periodSeconds: 3
+            timeoutSeconds: 1
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           securityContext:

diff --git a/deploy/common/helm/gateway-adapter-api/templates/deployment.yaml b/deploy/common/helm/gateway-adapter-api/templates/deployment.yaml
@@ -65,6 +65,12 @@ spec:
             - name: http
               containerPort: 80
               protocol: TCP
+          readinessProbe:
+            httpGet:
+              path: /status
+              port: 80
+            periodSeconds: 3
+            timeoutSeconds: 1
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           securityContext:

diff --git a/deploy/common/helm/gateway-api/templates/deployment.yaml b/deploy/common/helm/gateway-api/templates/deployment.yaml
@@ -65,6 +65,12 @@ spec:
             - name: http
               containerPort: 80
               protocol: TCP
+          readinessProbe:
+            httpGet:
+              path: /status
+              port: 80
+            periodSeconds: 3
+            timeoutSeconds: 1
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           securityContext:

diff --git a/deploy/common/helm/langchain-api/templates/deployment.yaml b/deploy/common/helm/langchain-api/templates/deployment.yaml
@@ -65,6 +65,12 @@ spec:
             - name: http
               containerPort: 80
               protocol: TCP
+          readinessProbe:
+            httpGet:
+              path: /status
+              port: 80
+            periodSeconds: 3
+            timeoutSeconds: 1
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           securityContext:

diff --git a/deploy/common/helm/orchestration-api/templates/deployment.yaml b/deploy/common/helm/orchestration-api/templates/deployment.yaml
@@ -65,6 +65,12 @@ spec:
             - name: http
               containerPort: 80
               protocol: TCP
+          readinessProbe:
+            httpGet:
+              path: /instances/{{ .Values.instanceId }}/status
+              port: 80
+            periodSeconds: 3
+            timeoutSeconds: 1
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           securityContext:

diff --git a/deploy/common/helm/semantic-kernel-api/templates/deployment.yaml b/deploy/common/helm/semantic-kernel-api/templates/deployment.yaml
@@ -65,6 +65,12 @@ spec:
             - name: http
               containerPort: 80
               protocol: TCP
+          readinessProbe:
+            httpGet:
+              path: /instances/{{ .Values.instanceId }}/status
+              port: 80
+            periodSeconds: 3
+            timeoutSeconds: 1
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           securityContext:

diff --git a/deploy/common/helm/state-api/templates/deployment.yaml b/deploy/common/helm/state-api/templates/deployment.yaml
@@ -65,6 +65,12 @@ spec:
             - name: http
               containerPort: 80
               protocol: TCP
+          readinessProbe:
+            httpGet:
+              path: /status
+              port: 80
+            periodSeconds: 3
+            timeoutSeconds: 1
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           securityContext:

diff --git a/deploy/common/helm/vectorization-job/templates/deployment.yaml b/deploy/common/helm/vectorization-job/templates/deployment.yaml
@@ -65,6 +65,12 @@ spec:
             - name: http
               containerPort: 80
               protocol: TCP
+          readinessProbe:
+            httpGet:
+              path: /status
+              port: 80
+            periodSeconds: 3
+            timeoutSeconds: 1
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           securityContext:

diff --git a/deploy/common/scripts/Get-AzCopy.ps1 b/deploy/common/scripts/Get-AzCopy.ps1
@@ -24,19 +24,19 @@ Set-StrictMode -Version 3.0
 $ErrorActionPreference = "Stop"
 
 # AzCopy tool version to be downloaded
-$AZCOPY_VERSION = "10.26.0"
+$AZCOPY_VERSION = "10.27.1"
 
 # Determine OS and set the download URL and file extension accordingly
 if ($IsWindows) {
-	$url = "https://azcopyvnext.azureedge.net/releases/release-10.26.0-20240731/azcopy_windows_amd64_10.26.0.zip"
+	$url = "https://azcopyvnext-awgzd8g7aagqhzhe.b02.azurefd.net/releases/release-10.27.1-20241113/azcopy_windows_amd64_10.27.1.zip"
 	$os = "windows"
 	$ext = "zip"
 }elseif ($IsMacOS) {
-	$url = "https://azcopyvnext.azureedge.net/releases/release-10.26.0-20240731/azcopy_darwin_amd64_10.26.0.zip"
+	$url = "https://azcopyvnext-awgzd8g7aagqhzhe.b02.azurefd.net/releases/release-10.27.1-20241113/azcopy_darwin_amd64_10.27.1.zip"
 	$os = "darwin"
 	$ext = "zip"
 }elseif ($IsLinux) {
-	$url = "https://azcopyvnext.azureedge.net/releases/release-10.26.0-20240731/azcopy_linux_amd64_10.26.0.tar.gz"
+	$url = "https://azcopyvnext-awgzd8g7aagqhzhe.b02.azurefd.net/releases/release-10.27.1-20241113/azcopy_linux_amd64_10.27.1.tar.gz"
 	$os = "linux"
 	$ext = "tar.gz"
 }

diff --git a/deploy/quick-start/azd-hooks/postprovision.ps1 b/deploy/quick-start/azd-hooks/postprovision.ps1
@@ -63,6 +63,8 @@ $env:GUID10 = $($(New-Guid).Guid)
 $env:GUID11 = $($(New-Guid).Guid)
 $env:GUID12 = $($(New-Guid).Guid)
 $env:GUID13 = $($(New-Guid).Guid)
+$env:GUID14 = $($(New-Guid).Guid)
+$env:GUID15 = $($(New-Guid).Guid)
 
 $env:POLICYGUID01 = $($(New-Guid).Guid)
 $env:POLICYGUID02 = $($(New-Guid).Guid)

diff --git a/deploy/quick-start/config/version.json b/deploy/quick-start/config/version.json
@@ -1,3 +1,3 @@
 {
-    "version": "0.8.4"
+    "version": "0.9.1-rc121"
 }