Skip to content

Commit 3e3cb43

Browse files
committed
Use uniqueString(deployment().name) for revision suffix to ensure unique revisions per deployment
1 parent 735e507 commit 3e3cb43

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

cloud-infrastructure/cluster/deploy-cluster.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ else
4949
fi
5050

5151
CURRENT_DATE=$(date +'%Y-%m-%dT%H-%M')
52+
export REVISION_SUFFIX=$(printf "%04x" $RANDOM | head -c 4)
5253

5354
cd "$(dirname "${BASH_SOURCE[0]}")"
5455

cloud-infrastructure/cluster/main-cluster.bicep

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ param backOfficeVersion string
1313
param applicationInsightsConnectionString string
1414
param communicationServicesDataLocation string = 'europe'
1515
param mailSenderDisplayName string = 'PlatformPlatform'
16+
param revisionSuffix string
1617

1718
var storageAccountUniquePrefix = replace(clusterResourceGroupName, '-', '')
1819
var tags = { environment: environment, 'managed-by': 'bicep' }
@@ -244,6 +245,7 @@ module accountManagementWorkers '../modules/container-app.bicep' = {
244245
userAssignedIdentityName: accountManagementIdentityName
245246
ingress: true
246247
hasProbesEndpoint: false
248+
revisionSuffix: revisionSuffix
247249
environmentVariables: accountManagementEnvironmentVariables
248250
}
249251
}
@@ -268,6 +270,7 @@ module accountManagementApi '../modules/container-app.bicep' = {
268270
userAssignedIdentityName: accountManagementIdentityName
269271
ingress: true
270272
hasProbesEndpoint: true
273+
revisionSuffix: revisionSuffix
271274
environmentVariables: accountManagementEnvironmentVariables
272275
}
273276
dependsOn: [accountManagementWorkers]
@@ -370,6 +373,7 @@ module backOfficeWorkers '../modules/container-app.bicep' = {
370373
userAssignedIdentityName: backOfficeIdentityName
371374
ingress: true
372375
hasProbesEndpoint: false
376+
revisionSuffix: revisionSuffix
373377
environmentVariables: backOfficeEnvironmentVariables
374378
}
375379
}
@@ -394,6 +398,7 @@ module backOfficeApi '../modules/container-app.bicep' = {
394398
userAssignedIdentityName: backOfficeIdentityName
395399
ingress: true
396400
hasProbesEndpoint: true
401+
revisionSuffix: revisionSuffix
397402
environmentVariables: backOfficeEnvironmentVariables
398403
}
399404
dependsOn: [backOfficeWorkers]
@@ -438,6 +443,7 @@ module appGateway '../modules/container-app.bicep' = {
438443
hasProbesEndpoint: false
439444
domainName: domainName == '' ? '' : domainName
440445
external: true
446+
revisionSuffix: revisionSuffix
441447
environmentVariables: [
442448
{
443449
name: 'AZURE_CLIENT_ID'

cloud-infrastructure/cluster/main-cluster.bicepparam

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ param appGatewayVersion = readEnvironmentVariable('APP_GATEWAY_VERSION')
1212
param accountManagementVersion = readEnvironmentVariable('ACCOUNT_MANAGEMENT_VERSION')
1313
param backOfficeVersion = readEnvironmentVariable('BACK_OFFICE_VERSION')
1414
param applicationInsightsConnectionString = readEnvironmentVariable('APPLICATIONINSIGHTS_CONNECTION_STRING')
15+
param revisionSuffix = readEnvironmentVariable('REVISION_SUFFIX')

cloud-infrastructure/modules/container-app.bicep

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ param hasProbesEndpoint bool
1717
param domainName string = ''
1818
param external bool = false
1919
param environmentVariables object[] = []
20-
param uniqueSuffix string = substring(newGuid(), 0, 4)
20+
param revisionSuffix string
2121

2222
resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2024-11-30' existing = {
2323
scope: resourceGroup(clusterResourceGroupName)
@@ -57,8 +57,8 @@ var image = useQuickStartImage
5757
? 'ghcr.io/platformplatform/quickstart:latest'
5858
: '${containerRegistryServerUrl}/${containerImageName}:${containerImageTag}'
5959

60-
// Create a revisionSuffix that contains the version but is be unique for each deployment. E.g. "2024-4-24-1557-tzyb"
61-
var revisionSuffix = '${replace(containerImageTag, '.', '-')}-${substring(uniqueSuffix, 0, 4)}'
60+
// Create a revisionSuffix that contains the version and random suffix. E.g. "2025-11-19-756-a3f2"
61+
var fullRevisionSuffix = '${replace(containerImageTag, '.', '-')}-${revisionSuffix}'
6262

6363
resource containerApp 'Microsoft.App/containerApps@2025-07-01' = {
6464
name: name
@@ -136,7 +136,7 @@ resource containerApp 'Microsoft.App/containerApps@2025-07-01' = {
136136
]
137137
}
138138
]
139-
revisionSuffix: revisionSuffix
139+
revisionSuffix: fullRevisionSuffix
140140
scale: {
141141
minReplicas: minReplicas
142142
maxReplicas: maxReplicas

0 commit comments

Comments
 (0)