Merge pull request #2859 from dkirby-ms/agora_2.0

go to main
microsoft · Nov 16, 2024 · 2ffa903 · 2ffa903
2 parents f393d3c + 722f3b5
commit 2ffa903
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/azure_jumpstart_ag/contoso_hypermarket/bicep/main.bicep b/azure_jumpstart_ag/contoso_hypermarket/bicep/main.bicep
@@ -27,7 +27,7 @@ param logAnalyticsWorkspaceName string = 'Ag-Workspace-${namingGuid}'
 param githubAccount string = 'microsoft'
 
 @description('Target GitHub branch')
-param githubBranch string = 'agora_2.0'
+param githubBranch string = 'main'
 
 @description('Choice to deploy Bastion to connect to the client VM')
 param deployBastion bool = false
@@ -93,16 +93,17 @@ param azureOpenAIModel object = {
     apiVersion: '2024-08-01-preview'
 }
 
-@description('Option to deploy GPU-enabled nodes for the K3s Worker nodes.')
-param deployGPUNodes bool = false
+// @description('Option to deploy GPU-enabled nodes for the K3s Worker nodes.')
+// param deployGPUNodes bool = false
 
 @description('The sku name of the K3s cluster worker nodes.')
 @allowed([
   'Standard_D8s_v5'
   'Standard_NV6ads_A10_v5'
   'Standard_NV4as_v4'
 ])
-param k8sWorkerNodesSku string = deployGPUNodes ? 'Standard_NV4as_v4' : 'Standard_D8s_v5'
+param k8sWorkerNodesSku string = 'Standard_D8s_v5'
+//param k8sWorkerNodesSku string = deployGPUNodes ? 'Standard_NV4as_v4' : 'Standard_D8s_v5'
 
 var templateBaseUrl = 'https://raw.githubusercontent.com/${githubAccount}/azure_arc/${githubBranch}/azure_jumpstart_ag/'
 var k3sClusterNodesCount = 2 // Number of nodes to deploy in the K3s cluster

diff --git a/azure_jumpstart_ag/contoso_hypermarket/bicep/main.bicepparam b/azure_jumpstart_ag/contoso_hypermarket/bicep/main.bicepparam
@@ -7,4 +7,3 @@ param deployBastion = false
 param customLocationRPOID = ''
 param sshRSAPublicKey = ''
 param fabricCapacityAdmin = ''
-param deployGPUNodes = false