expose max client session per auth name for event grid.

Signed-off-by: morvencao <[email protected]>
Azure · Jun 11, 2024 · 6d6a6e8 · 6d6a6e8
1 parent 9fe1c00
commit 6d6a6e8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/dev-infrastructure/configurations/svc-cluster.bicepparam b/dev-infrastructure/configurations/svc-cluster.bicepparam
@@ -15,6 +15,7 @@ param maestroNamespace = 'maestro'
 param maestroKeyVaultName = take('maestro-kv-${uniqueString(currentUserId)}', 24)
 param maestroEventGridNamespacesName = '${maestroInfraResourceGroup}-eventgrid'
 param maestroCertDomain = 'selfsigned.maestro.keyvault.aro-int.azure.com'
+param maxClientSessionsPerAuthName = 2
 param deployCsInfra = false
 param csNamespace = 'cluster-service'
 param csPostgresServerName = take('cs-pg-${uniqueString(currentUserId)}', 60)

diff --git a/dev-infrastructure/docs/development-setup.md b/dev-infrastructure/docs/development-setup.md
@@ -111,7 +111,9 @@ This will delete:
 
 ## Maestro Infrastructure
 
-Maestro infrastructure is provisioned as part of the svc-cluster. To deploy the Maestro infrastructure and deploy the Maestro server onto the service cluster set the `deployMaestroInfra` toggle to `true` and run
+Maestro infrastructure is provisioned as part of the svc-cluster. To deploy the Maestro infrastructure and deploy the Maestro server onto the service cluster set the `deployMaestroInfra` toggle to `true`. If you plan to run the Maestro server or agent with multiple replicas, set `maxClientSessionsPerAuthName` to the number of replicas.
+
+Then run the command:
 
 ```sh
 cd dev-infrastructure

diff --git a/dev-infrastructure/modules/maestro/maestro-infra.bicep b/dev-infrastructure/modules/maestro/maestro-infra.bicep
@@ -29,6 +29,9 @@ param location string
 @description('An optional user ID that will get admin access for Key Vault. For dev purposes.')
 param currentUserId string
 
+@description('The maximum client sessions per authentication name for the EventGrid MQTT broker')
+param maxClientSessionsPerAuthName int
+
 @description('The name for the Key Vault for Maestro certificates')
 param maestroKeyVaultName string
 
@@ -130,7 +133,7 @@ resource eventGridNamespace 'Microsoft.EventGrid/namespaces@2023-12-15-preview'
     publicNetworkAccess: 'Enabled'
     topicSpacesConfiguration: {
       state: 'Enabled'
-      maximumClientSessionsPerAuthenticationName: 1
+      maximumClientSessionsPerAuthenticationName: maxClientSessionsPerAuthName
       clientAuthentication: {
         alternativeAuthenticationNameSources: [
           'ClientCertificateDns'

diff --git a/dev-infrastructure/templates/svc-cluster.bicep b/dev-infrastructure/templates/svc-cluster.bicep
@@ -71,6 +71,9 @@ param csNamespace string
 @maxLength(60)
 param csPostgresServerName string
 
+@description('The maximum client sessions per authentication name for the EventGrid MQTT broker')
+param maxClientSessionsPerAuthName int
+
 module svcCluster '../modules/aks-cluster-base.bicep' = {
   name: 'svc-cluster'
   scope: resourceGroup()
@@ -117,6 +120,7 @@ module maestroInfra '../modules/maestro/maestro-infra.bicep' = if (deployMaestro
     eventGridNamespaceName: maestroEventGridNamespacesName
     location: location
     currentUserId: currentUserId
+    maxClientSessionsPerAuthName: maxClientSessionsPerAuthName
     maestroKeyVaultName: maestroKeyVaultName
     kvCertOfficerManagedIdentityName: maestroKeyVaultCertOfficerMSIName
   }