Skip to content

Commit 26a71ac

Browse files
authored
Merge pull request #310 from azure-javaee/bugfix_offer_guidname
BugFix: Weblogic AKS Offer can' be redeployed with the same resource group as before with different region in the same subscription
2 parents c30f49c + cb2ff8a commit 26a71ac

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<properties>
4141
<!-- versions start -->
4242
<!-- weblogic azure aks versions -->
43-
<version.wls-on-aks-azure-marketplace>1.0.75</version.wls-on-aks-azure-marketplace>
43+
<version.wls-on-aks-azure-marketplace>1.0.76</version.wls-on-aks-azure-marketplace>
4444
<!-- weblogic azure vm versions -->
4545
<version.arm-oraclelinux-wls>1.0.27</version.arm-oraclelinux-wls>
4646
<version.arm-oraclelinux-wls-admin>1.0.50</version.arm-oraclelinux-wls-admin>

weblogic-azure-aks/src/main/bicep/modules/_uamiAndRoles.bicep

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
44
*/
55

66
param location string
7+
param name_deploymentScriptContributorRoleAssignmentName string = newGuid()
78

89
// https://docs.microsoft.com/en-us/azure/role-based-access-control/built-in-roles
910
var const_roleDefinitionIdOfContributor = 'b24988ac-6180-42a0-ab88-20f7382dd24c'
10-
var name_deploymentScriptUserDefinedManagedIdentity = 'wls-aks-deployment-script-user-defined-managed-itentity'
11-
var name_deploymentScriptContributorRoleAssignmentName = guid('${resourceGroup().id}${name_deploymentScriptUserDefinedManagedIdentity}Deployment Script')
11+
var name_deploymentScriptUserDefinedManagedIdentity = 'wls-aks-deployment-script-user-defined-managed-itentity-${substring(uniqueString(name_deploymentScriptContributorRoleAssignmentName),0,5)}'
12+
1213

1314
// UAMI for deployment script
1415
resource uamiForDeploymentScript 'Microsoft.ManagedIdentity/userAssignedIdentities@${azure.apiVersionForIdentity}' = {

0 commit comments

Comments
 (0)