Chiac/svc #893
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -231,42 +231,42 @@ module rpCosmosDb '../modules/rp-cosmos.bicep' = if (deployFrontendCosmos) { | |
| output cosmosDBName string = deployFrontendCosmos ? rpCosmosDb.outputs.cosmosDBName : '' | ||
| output frontend_mi_client_id string = frontendMI.uamiClientID | ||
|
|
||
| // // | ||
| // // M A E S T R O | ||
| // // | ||
|
|
||
| // module maestroServer '../modules/maestro/maestro-server.bicep' = { | ||
| // name: 'maestro-server' | ||
| // params: { | ||
| // maestroInfraResourceGroup: regionalResourceGroup | ||
| // maestroEventGridNamespaceName: maestroEventGridNamespacesName | ||
| // mqttClientName: maestroServerMqttClientName | ||
| // certKeyVaultName: serviceKeyVaultName | ||
| // certKeyVaultResourceGroup: serviceKeyVaultResourceGroup | ||
| // keyVaultOfficerManagedIdentityName: aroDevopsMsiId | ||
| // maestroCertificateDomain: maestroCertDomain | ||
| // deployPostgres: deployMaestroPostgres | ||
| // postgresServerName: maestroPostgresServerName | ||
| // postgresServerVersion: maestroPostgresServerVersion | ||
| // postgresServerMinTLSVersion: maestroPostgresServerMinTLSVersion | ||
| // postgresServerStorageSizeGB: maestroPostgresServerStorageSizeGB | ||
| // privateEndpointSubnetId: svcCluster.outputs.aksNodeSubnetId | ||
| // privateEndpointVnetId: svcCluster.outputs.aksVnetId | ||
| // postgresServerPrivate: maestroPostgresPrivate | ||
| // maestroServerManagedIdentityPrincipalId: filter( | ||
| // svcCluster.outputs.userAssignedIdentities, | ||
| // id => id.uamiName == 'maestro-server' | ||
| // )[0].uamiPrincipalID | ||
| // maestroServerManagedIdentityName: filter( | ||
| // svcCluster.outputs.userAssignedIdentities, | ||
| // id => id.uamiName == 'maestro-server' | ||
| // )[0].uamiName | ||
| // location: location | ||
| // } | ||
| // dependsOn: [ | ||
| // serviceKeyVault | ||
| // ] | ||
| // } | ||
|
|
||
| // | ||
| // K E Y V A U L T S | ||
|
|
@@ -320,7 +320,7 @@ module cs '../modules/cluster-service.bicep' = if (deployCsInfra) { | |
| clusterServiceManagedIdentityName: clusterServiceMIName | ||
| } | ||
| dependsOn: [ | ||
| // maestroServer | ||
| svcCluster | ||
| ] | ||
| } | ||
|
|
@@ -371,60 +371,60 @@ module imageServiceKeyVaultAccess '../modules/keyvault/keyvault-secret-access.bi | |
| ] | ||
| } | ||
|
|
||
| // resource imageSyncAcrResourceGroups 'Microsoft.Resources/resourceGroups@2023-07-01' existing = [ | ||
| // for rg in imageSyncAcrResourceGroupNames: { | ||
| // name: rg | ||
| // scope: subscription() | ||
| // } | ||
| // ] | ||
|
|
||
| // module acrPushRole '../modules/acr-permissions.bicep' = [ | ||
| // for (_, i) in imageSyncAcrResourceGroupNames: { | ||
| // name: guid(imageSyncAcrResourceGroups[i].id, resourceGroup().name, 'image-sync', 'push') | ||
| // scope: imageSyncAcrResourceGroups[i] | ||
| // params: { | ||
| // principalId: imageSyncManagedIdentityPrincipalId | ||
| // grantPushAccess: true | ||
| // acrResourceGroupid: imageSyncAcrResourceGroups[i].id | ||
| // } | ||
| // } | ||
| // ] | ||
|
Comment on lines
+374
to
+391
There was a problem hiding this comment. this has been removed from main #896 |
||
|
|
||
| // resource clustersServiceAcrResourceGroups 'Microsoft.Resources/resourceGroups@2023-07-01' existing = [ | ||
| // for rg in clustersServiceAcrResourceGroupNames: { | ||
| // name: rg | ||
| // scope: subscription() | ||
| // } | ||
| // ] | ||
|
|
||
| // module acrManageTokenRole '../modules/acr-permissions.bicep' = [ | ||
| // for (_, i) in clustersServiceAcrResourceGroupNames: { | ||
| // name: guid(clustersServiceAcrResourceGroups[i].id, resourceGroup().name, 'clusters-service', 'manage-tokens') | ||
| // scope: clustersServiceAcrResourceGroups[i] | ||
| // params: { | ||
| // principalId: csManagedIdentityPrincipalId | ||
| // grantManageTokenAccess: true | ||
| // acrResourceGroupid: clustersServiceAcrResourceGroups[i].id | ||
| // } | ||
| // } | ||
| // ] | ||
|
Comment on lines
+393
to
+410
There was a problem hiding this comment. this code has been moved to |
||
|
|
||
| // // oidc | ||
|
|
||
| // module oidc '../modules/oidc/main.bicep' = { | ||
| // name: '${deployment().name}-oidc' | ||
| // params: { | ||
| // location: location | ||
| // storageAccountName: oidcStorageAccountName | ||
| // rpMsiName: clusterServiceMIName | ||
| // skuName: oidcStorageAccountSku | ||
| // aroDevopsMsiId: aroDevopsMsiId | ||
| // deploymentScriptLocation: location | ||
| // } | ||
| // dependsOn: [ | ||
| // svcCluster | ||
| // ] | ||
| // } | ||
|
Comment on lines
+411
to
+427
There was a problem hiding this comment. the permission issue has been fixed in main - #897 |
||
|
|
||
| // | ||
| // E V E N T G R I D P R I V A T E E N D P O I N T C O N N E C T I O N | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ func EV2Mapping(input config.Variables, prefix []string) (map[string]string, map | |
| } | ||
| replaced[key] = replacement | ||
| } else { | ||
| placeholder := fmt.Sprintf("__%s__", strings.Join(nestedKey, "_")) | ||
|
There was a problem hiding this comment. fixed in main including the tests - #901 |
||
| output[placeholder] = strings.Join(nestedKey, ".") | ||
| replaced[key] = placeholder | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm. this would try to delegate the regional zone into the regional zone as child zone and parent zone would be the same