From e37dafb108c1e16daf1a4107d0371e8262b7d1f7 Mon Sep 17 00:00:00 2001 From: gnsuryan Date: Tue, 3 Jun 2025 05:49:12 +0000 Subject: [PATCH 1/4] changes to upgrade wls-on-aks to support 14.1.2 --- .../src/main/arm/createUiDefinition.json | 30 +++++++++++++++---- .../src/main/arm/scripts/common.sh | 8 ++--- .../src/main/arm/scripts/createLbSvc.sh | 2 +- .../src/main/arm/scripts/genImageModel.sh | 6 ++-- .../queryDomainConfigurations.sh | 2 +- .../main/arm/scripts/setupDBConnections.sh | 2 +- .../src/main/arm/scripts/setupWLSDomain.sh | 2 +- .../src/main/arm/scripts/utility.sh | 4 +-- .../main/arm/scripts/validateApplications.sh | 2 +- .../resources/aks_well_tested_version.json | 4 +-- .../main/resources/weblogic_cpu_images.json | 16 ++++++++++ .../resources/weblogic_tooling_family.json | 18 +++++------ 12 files changed, 67 insertions(+), 29 deletions(-) diff --git a/weblogic-azure-aks/src/main/arm/createUiDefinition.json b/weblogic-azure-aks/src/main/arm/createUiDefinition.json index e5f6bf90d..841c624db 100644 --- a/weblogic-azure-aks/src/main/arm/createUiDefinition.json +++ b/weblogic-azure-aks/src/main/arm/createUiDefinition.json @@ -556,19 +556,39 @@ "name": "oracleImageSelector", "type": "Microsoft.Common.DropDown", "label": "Select desired combination of WebLogic Server, JDK and Operating System or fully qualified Docker tag", - "defaultValue": "14.1.1.0-11", + "defaultValue": "14.1.2.0-17-ol9", "multiLine": true, "toolTip": "Select image", "constraints": { "allowedValues": [ + { + "label": "14.1.2.0-17-ol9", + "description": "14c (14.1.2.0) on JDK 17 on Oracle Linux 9", + "value": "14.1.2.0-generic-jdk17-ol9" + }, + { + "label": "14.1.2.0-21-ol9", + "description": "14c (14.1.2.0) on JDK 21 on Oracle Linux 9", + "value": "14.1.2.0-generic-jdk21-ol9" + }, + { + "label": "14.1.2.0-17-ol8", + "description": "14c (14.1.2.0) on JDK 17 on Oracle Linux 8", + "value": "14.1.2.0-generic-jdk17-ol8" + }, + { + "label": "14.1.2.0-21-ol8", + "description": "14c (14.1.2.0) on JDK 21 on Oracle Linux 8", + "value": "14.1.2.0-generic-jdk21-ol8" + }, { "label": "14.1.1.0-8", - "description": "14c on JDK 8 on Oracle Linux 7", + "description": "14c (14.1.1.0) on JDK 8 on Oracle Linux 7", "value": "14.1.1.0-8" }, { "label": "14.1.1.0-11", - "description": "14c on JDK 11 on Oracle Linux 7", + "description": "14c (14.1.1.0) on JDK 11 on Oracle Linux 7", "value": "14.1.1.0-11" }, { @@ -578,12 +598,12 @@ }, { "label": "14.1.1.0-8-ol8", - "description": "14c on JDK 8 on Oracle Linux 8", + "description": "14c (14.1.1.0.0) on JDK 8 on Oracle Linux 8", "value": "14.1.1.0-8-ol8" }, { "label": "14.1.1.0-11-ol8", - "description": "14c on JDK 11 on Oracle Linux 8", + "description": "14c (14.1.1.0.0) on JDK 11 on Oracle Linux 8", "value": "14.1.1.0-11-ol8" }, { diff --git a/weblogic-azure-aks/src/main/arm/scripts/common.sh b/weblogic-azure-aks/src/main/arm/scripts/common.sh index 49b17c2df..708a49205 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/common.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/common.sh @@ -34,8 +34,8 @@ export externalJDBCLibrariesDirectoryName="externalJDBCLibraries" export constFalse="false" export constTrue="true" export constIntrospectorJobActiveDeadlineSeconds=300 # for Guaranteed Qos -export constPostgreDriverName="postgresql-42.5.1.jar" -export constMSSQLDriverName="mssql-jdbc-10.2.1.jre8.jar" +export constPostgreDriverName="postgresql-42.7.5.jar" +export constMSSQLDriverName="mssql-jdbc-11.2.3.jre17.jar" export constAzureCoreVersion="1.34.0" export constDbPodIdentitySelector="db-pod-identity" # do not change the value export constPreclassDirectoryName="preclassLibraries" @@ -64,6 +64,6 @@ export retryMaxAttempt=5 # retry attempt for curl command export retryInterval=10 export wlsContainerName="weblogic-server" -export wlsPostgresqlDriverUrl="https://jdbc.postgresql.org/download/postgresql-42.5.1.jar" -export wlsMSSQLDriverUrl="https://repo.maven.apache.org/maven2/com/microsoft/sqlserver/mssql-jdbc/10.2.1.jre8/mssql-jdbc-10.2.1.jre8.jar" +export wlsPostgresqlDriverUrl="https://jdbc.postgresql.org/download/postgresql-42.7.5.jar" +export wlsMSSQLDriverUrl="https://repo1.maven.org/maven2/com/microsoft/sqlserver/mssql-jdbc/11.2.3.jre17/mssql-jdbc-11.2.3.jre17.jar" export jdkArm64Url="https://aka.ms/download-jdk/microsoft-jdk-11.0.23-linux-aarch64.tar.gz" \ No newline at end of file diff --git a/weblogic-azure-aks/src/main/arm/scripts/createLbSvc.sh b/weblogic-azure-aks/src/main/arm/scripts/createLbSvc.sh index b170253ca..bb58a6c07 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/createLbSvc.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/createLbSvc.sh @@ -393,7 +393,7 @@ function validate_admin_console_url() { jq '.spec.ports[] | select(.name=="internal-t3") | .port') local adminConsoleUrl="http://${svcAdminServer}.${wlsDomainNS}:${adminTargetPort}/console/" - kubectl exec -it ${podName} -n ${wlsDomainNS} -c ${wlsContainerName} \ + kubectl exec ${podName} -n ${wlsDomainNS} -c ${wlsContainerName} \ -- bash -c 'curl --write-out "%{http_code}\n" --silent --output /dev/null "'${adminConsoleUrl}'" | grep "302"' if [ $? == 1 ]; then diff --git a/weblogic-azure-aks/src/main/arm/scripts/genImageModel.sh b/weblogic-azure-aks/src/main/arm/scripts/genImageModel.sh index 63495d256..106bd86a3 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/genImageModel.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/genImageModel.sh @@ -135,7 +135,9 @@ cat <>${filePath} SecurityConfiguration: NodeManagerUsername: "@@SECRET:__weblogic-credentials__:username@@" NodeManagerPasswordEncrypted: "@@SECRET:__weblogic-credentials__:password@@" - + SecureMode: + SecureModeEnabled: false + resources: SelfTuning: MinThreadsConstraint: @@ -198,4 +200,4 @@ EOF done # print model -cat ${filePath} \ No newline at end of file +cat ${filePath} diff --git a/weblogic-azure-aks/src/main/arm/scripts/inline-scripts/queryDomainConfigurations.sh b/weblogic-azure-aks/src/main/arm/scripts/inline-scripts/queryDomainConfigurations.sh index 85121f908..4719c0748 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/inline-scripts/queryDomainConfigurations.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/inline-scripts/queryDomainConfigurations.sh @@ -53,7 +53,7 @@ fi echo "Query WebLogic version and patch numbers" targetFile4Versions=/tmp/version.info -kubectl exec -it ${podName} -n ${wlsDomainNS} -c ${wlsContainerName} \ +kubectl exec ${podName} -n ${wlsDomainNS} -c ${wlsContainerName} \ -- bash -c 'source $ORACLE_HOME/wlserver/server/bin/setWLSEnv.sh > /dev/null 2>&1 && java weblogic.version -verbose >"'${targetFile4Versions}'"' if [ $? != 0 ]; then echo >&2 "Fail to run java weblogic.version." diff --git a/weblogic-azure-aks/src/main/arm/scripts/setupDBConnections.sh b/weblogic-azure-aks/src/main/arm/scripts/setupDBConnections.sh index 8d208b341..9156f292b 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/setupDBConnections.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/setupDBConnections.sh @@ -252,7 +252,7 @@ EOF echo "copy test script ${testDatasourceScript} to pod path /tmp/${dsScriptFileName}" targetDSFilePath=/tmp/${dsScriptFileName} kubectl cp ${testDatasourceScript} -n ${wlsDomainNS} ${podName}:${targetDSFilePath} - kubectl exec -it ${podName} -n ${wlsDomainNS} -c ${wlsContainerName} -- bash -c "wlst.sh ${targetDSFilePath}" | grep "State is Running" + kubectl exec ${podName} -n ${wlsDomainNS} -c ${wlsContainerName} -- bash -c "wlst.sh ${targetDSFilePath}" | grep "State is Running" if [ $? == 1 ];then echo_stderr "Failed to configure datasource ${JDBC_DATASOURCE_NAME}. Please make sure the input values are correct." diff --git a/weblogic-azure-aks/src/main/arm/scripts/setupWLSDomain.sh b/weblogic-azure-aks/src/main/arm/scripts/setupWLSDomain.sh index 7462fc65a..56cb7594e 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/setupWLSDomain.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/setupWLSDomain.sh @@ -663,7 +663,7 @@ function parsing_ssl_certs_and_create_ssl_secret() { --from-literal=ssltruststorepassword=${WLS_SSL_TRUST_PASSWORD} kubectl -n ${wlsDomainNS} label secret ${kubectlWLSSSLCredentialsName} weblogic.domainUID=${WLS_DOMAIN_UID} - javaOptions=" -Dweblogic.security.SSL.ignoreHostnameVerification=true -Dweblogic.security.SSL.trustedCAKeyStore=${sharedPath}/${wlsTrustKeyStoreJKSFileName} ${javaOptions}" + javaOptions=" -Dweblogic.security.SSL.ignoreHostnameVerification=true -Dweblogic.security.SSL.trustedCAKeyStore=${sharedPath}/${wlsTrustKeyStoreJKSFileName} -Dweblogic.security.SSL.trustedCAKeyStorePassPhrase=${WLS_SSL_TRUST_PASSWORD} ${javaOptions}" fi } diff --git a/weblogic-azure-aks/src/main/arm/scripts/utility.sh b/weblogic-azure-aks/src/main/arm/scripts/utility.sh index 878267bcf..7807937f3 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/utility.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/utility.sh @@ -228,7 +228,7 @@ function utility_validate_application_status() { local targetFilePath=/tmp/checkApplicationStatus.py echo "copy ${pyScriptPath} to ${targetFilePath}" kubectl cp ${pyScriptPath} -n ${wlsDomainNS} ${podName}:${targetFilePath} - kubectl exec -it ${podName} -n ${wlsDomainNS} -c "weblogic-server" \ + kubectl exec ${podName} -n ${wlsDomainNS} -c "weblogic-server" \ -- bash -c "wlst.sh ${targetFilePath} -user ${wlsUser} -password ${wlsPassword} -t3ChannelAddress ${t3ChannelAddress} -t3ChannelPort ${adminTargetPort}" | grep "Summary: all applications are active" @@ -349,7 +349,7 @@ function utility_wait_for_pod_restarted() { while [ ${updatedPodNum} -le ${appReplicas} ] && [ $attempt -le ${checkPodStatusMaxAttemps} ]; do echo "attempts ${attempt}" ret=$(kubectl get pods -n ${wlsDomainNS} -l weblogic.domainUID=${wlsDomainUID} -o json | - jq '.items[] | .metadata.creationTimestamp' | tr -d "\"") + jq '.items[] | select(all(.status.containerStatuses[]; .ready == true)) | .metadata.creationTimestamp' | tr -d "\"") counter=0 for item in $ret; do diff --git a/weblogic-azure-aks/src/main/arm/scripts/validateApplications.sh b/weblogic-azure-aks/src/main/arm/scripts/validateApplications.sh index 96ea633fb..f074a9eb3 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/validateApplications.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/validateApplications.sh @@ -27,4 +27,4 @@ install_kubectl connect_aks $AKS_NAME $AKS_RESOURCE_GROUP_NAME -validate_app +validate_app \ No newline at end of file diff --git a/weblogic-azure-aks/src/main/resources/aks_well_tested_version.json b/weblogic-azure-aks/src/main/resources/aks_well_tested_version.json index 3b8c596c6..241909628 100644 --- a/weblogic-azure-aks/src/main/resources/aks_well_tested_version.json +++ b/weblogic-azure-aks/src/main/resources/aks_well_tested_version.json @@ -1,6 +1,6 @@ { "name": "Known-good version of Azure Kubernetes Service", "description": "This version is known to work for all the features of Azure WebLogic on AKS offer.", - "value": "1.30.7", - "testedDate": "2025-02-10" + "value": "1.31.7", + "testedDate": "2025-05-08" } diff --git a/weblogic-azure-aks/src/main/resources/weblogic_cpu_images.json b/weblogic-azure-aks/src/main/resources/weblogic_cpu_images.json index a616bd1a9..a40c77669 100644 --- a/weblogic-azure-aks/src/main/resources/weblogic_cpu_images.json +++ b/weblogic-azure-aks/src/main/resources/weblogic_cpu_images.json @@ -2,6 +2,22 @@ "name": "Oracle WebLogic Server docker image tags mapping for Azure Marketplace offer", "description": "List image tag mapping from Oracle Container Registry middleware/weblogic and middleware/weblogic_cpu repository.", "items": [ + { + "gaTag": "14.1.2.0-generic-jdk17-ol9", + "cpuTag": "14.1.2.0-generic-jdk17-ol9" + }, + { + "gaTag": "14.1.2.0-generic-jdk21-ol9", + "cpuTag": "14.1.2.0-generic-jdk21-ol9" + }, + { + "gaTag": "14.1.2.0-generic-jdk17-ol8", + "cpuTag": "14.1.2.0-generic-jdk17-ol8" + }, + { + "gaTag": "14.1.2.0-generic-jdk21-ol8", + "cpuTag": "14.1.2.0-generic-jdk21-ol8" + }, { "gaTag": "14.1.1.0-11", "cpuTag": "14.1.1.0-generic-jdk11-ol7" diff --git a/weblogic-azure-aks/src/main/resources/weblogic_tooling_family.json b/weblogic-azure-aks/src/main/resources/weblogic_tooling_family.json index e73e37d7d..bb8fec93a 100644 --- a/weblogic-azure-aks/src/main/resources/weblogic_tooling_family.json +++ b/weblogic-azure-aks/src/main/resources/weblogic_tooling_family.json @@ -11,23 +11,23 @@ { "key": "WDT", "description": "Oracle WebLogic Deploy Tooling", - "version": "3.5.2", - "downloadURL": "https://github.com/oracle/weblogic-deploy-tooling/releases/download/release-3.5.2/weblogic-deploy.zip", - "testedDate": "2024-03-13" + "version": "4.3.5", + "downloadURL": "https://github.com/oracle/weblogic-deploy-tooling/releases/download/release-4.3.5/weblogic-deploy.zip", + "testedDate": "2025-05-26" }, { "key": "WIT", "description": "Oracle WebLogic Image Tool", - "version": "1.13.2", - "downloadURL": "https://github.com/oracle/weblogic-image-tool/releases/download/release-1.13.2/imagetool.zip", - "testedDate": "2024-07-15" + "version": "1.15.0", + "downloadURL": "https://github.com/oracle/weblogic-image-tool/releases/download/release-1.15.0/imagetool.zip", + "testedDate": "2025-05-08" }, { "key": "WME", "description": "Oracle Weblogic Monitoring Exporter. IMPORTANT note to maintener: This value is hard coded in enablePrometheusMetrics.sh. Please update it there also.", - "version": "2.1.9", - "imageURL": "ghcr.io/oracle/weblogic-monitoring-exporter:2.1.9", - "testedDate": "2024-02-29" + "version": "2.3.0", + "imageURL": "ghcr.io/oracle/weblogic-monitoring-exporter:2.3.0", + "testedDate": "2025-05-08" } ] } From 0cde0dfabbd96820e3d61428d92ba2bcdadd51d4 Mon Sep 17 00:00:00 2001 From: gnsuryan Date: Tue, 3 Jun 2025 06:04:32 +0000 Subject: [PATCH 2/4] changes done for local testing --- .../src/main/arm/scripts/common.sh | 12 +++---- .../src/main/bicep/mainTemplate.bicep | 34 +++++++++---------- .../src/main/bicep/modules/_appGateway.bicep | 4 +-- .../bicep/modules/_azure-resoruces/_acr.bicep | 6 ++-- .../bicep/modules/_azure-resoruces/_aks.bicep | 12 +++---- .../_azure-resoruces/_aksPodIdentity.bicep | 2 +- .../_azure-resoruces/_appgateway.bicep | 10 +++--- .../_autoGeneratedPfxCertInKeyVault.bicep | 12 +++---- .../modules/_azure-resoruces/_dnsZones.bicep | 6 ++-- .../modules/_azure-resoruces/_storage.bicep | 8 ++--- .../_azure-resoruces/_vnetAppGateway.bicep | 14 ++++---- .../_ds-create-networking.bicep | 6 ++-- .../_ds-create-wls-cluster.bicep | 8 ++--- .../_ds-datasource-connection.bicep | 6 ++-- .../_ds-output-domain-configurations.bicep | 6 ++-- .../_ds-validate-applications.bicep | 6 ++-- .../_ds-validate-parameters.bicep | 6 ++-- .../_deployment-scripts/_ds_enable_hpa.bicep | 6 ++-- .../_ds_enable_prometheus_metrics.bicep | 6 ++-- .../_ds_ensure_available_agic.bicep | 2 +- .../_ds_install_agic.bicep | 6 ++-- ...ery_available_private_ip_from_subnet.bicep | 6 ++-- .../_ds_update-applications.bicep | 2 +- .../_ds_validate_agic.bicep | 6 ++-- .../bicep/modules/_enableAutoScaling.bicep | 2 +- .../bicep/modules/_enablePromethuesKeda.bicep | 16 ++++----- .../bicep/modules/_globalUamiAndRoles.bicep | 6 ++-- .../modules/_preDeployedAzureResources.bicep | 2 +- .../_agicNetworkContributor.bicep | 4 +-- .../_agicRoleAssignment.bicep | 4 +-- .../_aksClusterMioRoleOverDbIdentity.bicep | 6 ++-- .../_roleAssignmentinRgScope.bicep | 4 +-- .../_roleAssignmentinSubscription.bicep | 4 +-- .../bicep/modules/_setupDBConnection.bicep | 2 +- .../_setupPasswordlessDBConnection.bicep | 4 +-- .../src/main/bicep/modules/networking.bicep | 2 +- .../bicep/modules/setupWebLogicCluster.bicep | 4 +-- 37 files changed, 126 insertions(+), 126 deletions(-) diff --git a/weblogic-azure-aks/src/main/arm/scripts/common.sh b/weblogic-azure-aks/src/main/arm/scripts/common.sh index 708a49205..aa486c40a 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/common.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/common.sh @@ -50,12 +50,12 @@ export curlMaxTime=120 # seconds export ocrLoginServer="container-registry.oracle.com" export ocrGaImagePath="middleware/weblogic" export ocrCpuImagePath="middleware/weblogic_cpu" -export gitUrl4CpuImages="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/weblogic_cpu_images.json" -export gitUrl4AksWellTestedVersionJsonFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/aks_well_tested_version.json" -export gitUrl4AksToolingWellTestedVersionJsonFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/aks_tooling_well_tested_versions.json" -export gitUrl4WLSToolingFamilyJsonFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/weblogic_tooling_family.json" -export gitUrl4AzureIdentityExtensionsPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml" -export gitUrl4MySQLDriverPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/mysql-connector-java.xml" +export gitUrl4CpuImages="https://raw.githubusercontent.com/gnsuryan/weblogic-azure/main/weblogic-azure-aks/src/main/resources/weblogic_cpu_images.json" +export gitUrl4AksWellTestedVersionJsonFile="https://raw.githubusercontent.com/gnsuryan/weblogic-azure/main/weblogic-azure-aks/src/main/resources/aks_well_tested_version.json" +export gitUrl4AksToolingWellTestedVersionJsonFile="https://raw.githubusercontent.com/gnsuryan/weblogic-azure/main/weblogic-azure-aks/src/main/resources/aks_tooling_well_tested_versions.json" +export gitUrl4WLSToolingFamilyJsonFile="https://raw.githubusercontent.com/gnsuryan/weblogic-azure/main/weblogic-azure-aks/src/main/resources/weblogic_tooling_family.json" +export gitUrl4AzureIdentityExtensionsPomFile="https://raw.githubusercontent.com/gnsuryan/weblogic-azure/main/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml" +export gitUrl4MySQLDriverPomFile="https://raw.githubusercontent.com/gnsuryan/weblogic-azure/main/weblogic-azure-aks/src/main/resources/mysql-connector-java.xml" export optUninstallMaxTry=5 # Max attempts to wait for the operator uninstalled export optUninstallInterval=10 diff --git a/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep b/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep index 54058c483..9e2e3622c 100644 --- a/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep +++ b/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep @@ -199,7 +199,7 @@ param sslUploadedPrivateKeyAlias string = newGuid() @secure() @description('Password of the private key') param sslUploadedPrivateKeyPassPhrase string = newGuid() -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object = {} @description('Public port of the custom T3 channel in admin server') param t3ChannelAdminPort int = 7005 @@ -266,22 +266,22 @@ var _enableAppGWIngress = enableAppGWIngress // We can streamline the following code with a user-defined function, but it is not supported in Partner Center. // For status, see https://dev.azure.com/edburns-msft/Open%20Standard%20Enterprise%20Java%20(Java%20EE)%20on%20Azure/_workitems/edit/6219 var _objTagsByResource = { - '${identifier.accounts}': contains(tagsByResource, '${identifier.accounts}') ? tagsByResource['${identifier.accounts}'] : json('{}') - '${identifier.managedClusters}': contains(tagsByResource, '${identifier.managedClusters}') ? tagsByResource['${identifier.managedClusters}'] : json('{}') - '${identifier.applicationGateways}': contains(tagsByResource, '${identifier.applicationGateways}') ? tagsByResource['${identifier.applicationGateways}'] : json('{}') - '${identifier.registries}': contains(tagsByResource, '${identifier.registries}') ? tagsByResource['${identifier.registries}'] : json('{}') - '${identifier.virtualMachines}': contains(tagsByResource, '${identifier.virtualMachines}') ? tagsByResource['${identifier.virtualMachines}'] : json('{}') - '${identifier.virtualMachinesExtensions}': contains(tagsByResource, '${identifier.virtualMachinesExtensions}') ? tagsByResource['${identifier.virtualMachinesExtensions}'] : json('{}') - '${identifier.virtualNetworks}': contains(tagsByResource, '${identifier.virtualNetworks}') ? tagsByResource['${identifier.virtualNetworks}'] : json('{}') - '${identifier.networkInterfaces}': contains(tagsByResource, '${identifier.networkInterfaces}') ? tagsByResource['${identifier.networkInterfaces}'] : json('{}') - '${identifier.networkSecurityGroups}': contains(tagsByResource, '${identifier.networkSecurityGroups}') ? tagsByResource['${identifier.networkSecurityGroups}'] : json('{}') - '${identifier.publicIPAddresses}': contains(tagsByResource, '${identifier.publicIPAddresses}') ? tagsByResource['${identifier.publicIPAddresses}'] : json('{}') - '${identifier.storageAccounts}': contains(tagsByResource, '${identifier.storageAccounts}') ? tagsByResource['${identifier.storageAccounts}'] : json('{}') - '${identifier.vaults}': contains(tagsByResource, '${identifier.vaults}') ? tagsByResource['${identifier.vaults}'] : json('{}') - '${identifier.userAssignedIdentities}': contains(tagsByResource, '${identifier.userAssignedIdentities}') ? tagsByResource['${identifier.userAssignedIdentities}'] : json('{}') - '${identifier.dnszones}': contains(tagsByResource, '${identifier.dnszones}') ? tagsByResource['${identifier.dnszones}'] : json('{}') - '${identifier.workspaces}': contains(tagsByResource, '${identifier.workspaces}') ? tagsByResource['${identifier.workspaces}'] : json('{}') - '${identifier.deploymentScripts}': contains(tagsByResource, '${identifier.deploymentScripts}') ? tagsByResource['${identifier.deploymentScripts}'] : json('{}') + 'Microsoft.Monitor/accounts': contains(tagsByResource, 'Microsoft.Monitor/accounts') ? tagsByResource['Microsoft.Monitor/accounts'] : json('{}') + 'Microsoft.ContainerService/managedClusters': contains(tagsByResource, 'Microsoft.ContainerService/managedClusters') ? tagsByResource['Microsoft.ContainerService/managedClusters'] : json('{}') + 'Microsoft.Network/applicationGateways': contains(tagsByResource, 'Microsoft.Network/applicationGateways') ? tagsByResource['Microsoft.Network/applicationGateways'] : json('{}') + 'Microsoft.ContainerRegistry/registries': contains(tagsByResource, 'Microsoft.ContainerRegistry/registries') ? tagsByResource['Microsoft.ContainerRegistry/registries'] : json('{}') + 'Microsoft.Compute/virtualMachines': contains(tagsByResource, 'Microsoft.Compute/virtualMachines') ? tagsByResource['Microsoft.Compute/virtualMachines'] : json('{}') + 'Virtual machine extension': contains(tagsByResource, 'Virtual machine extension') ? tagsByResource['Virtual machine extension'] : json('{}') + 'Microsoft.Network/virtualNetworks': contains(tagsByResource, 'Microsoft.Network/virtualNetworks') ? tagsByResource['Microsoft.Network/virtualNetworks'] : json('{}') + 'Microsoft.Network/networkInterfaces': contains(tagsByResource, 'Microsoft.Network/networkInterfaces') ? tagsByResource['Microsoft.Network/networkInterfaces'] : json('{}') + 'Microsoft.Network/networkSecurityGroups': contains(tagsByResource, 'Microsoft.Network/networkSecurityGroups') ? tagsByResource['Microsoft.Network/networkSecurityGroups'] : json('{}') + 'Microsoft.Network/publicIPAddresses': contains(tagsByResource, 'Microsoft.Network/publicIPAddresses') ? tagsByResource['Microsoft.Network/publicIPAddresses'] : json('{}') + 'Microsoft.Storage/storageAccounts': contains(tagsByResource, 'Microsoft.Storage/storageAccounts') ? tagsByResource['Microsoft.Storage/storageAccounts'] : json('{}') + 'Microsoft.KeyVault/vaults': contains(tagsByResource, 'Microsoft.KeyVault/vaults') ? tagsByResource['Microsoft.KeyVault/vaults'] : json('{}') + 'Microsoft.ManagedIdentity/userAssignedIdentities': contains(tagsByResource, 'Microsoft.ManagedIdentity/userAssignedIdentities') ? tagsByResource['Microsoft.ManagedIdentity/userAssignedIdentities'] : json('{}') + 'Microsoft.Network/dnszones': contains(tagsByResource, 'Microsoft.Network/dnszones') ? tagsByResource['Microsoft.Network/dnszones'] : json('{}') + 'Microsoft.OperationalInsights/workspaces': contains(tagsByResource, 'Microsoft.OperationalInsights/workspaces') ? tagsByResource['Microsoft.OperationalInsights/workspaces'] : json('{}') + 'Microsoft.Resources/deploymentScripts': contains(tagsByResource, 'Microsoft.Resources/deploymentScripts') ? tagsByResource['Microsoft.Resources/deploymentScripts'] : json('{}') } var const_aksName = createAKSCluster ? 'wlsonaks${const_globalResourceNameSuffix}' : aksClusterName var const_appGatewaySSLCertOptionGenerateCert = 'generateCert' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep b/weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep index 3c35a64ce..febf02c7c 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep @@ -32,7 +32,7 @@ param trustedRootCertificateDeploymentName string @secure() param vnetForApplicationGateway object param vnetRGNameForApplicationGateway string -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object // To mitigate arm-ttk error: Type Mismatch: Parameter in nested template is defined as string, but the parent template defines it as bool. @@ -59,7 +59,7 @@ module pidAppgwWithCustomCertificate './_pids/_pid.bicep' = if (_signedFrontendC } // get key vault object from a resource group -resource existingKeyvault 'Microsoft.KeyVault/vaults@${azure.apiVersionForKeyVault}' existing = { +resource existingKeyvault 'Microsoft.KeyVault/vaults@2024-11-01' existing = { name: autoGeneratedSSLCertKeyVaultName } diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_acr.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_acr.bicep index 297f81567..0f908e978 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_acr.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_acr.bicep @@ -3,10 +3,10 @@ param acrName string param location string -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object -resource registries 'Microsoft.ContainerRegistry/registries@${azure.apiVersionForContainerRegistries}' = { +resource registries 'Microsoft.ContainerRegistry/registries@2023-07-01' = { name: acrName location: location sku: { @@ -37,7 +37,7 @@ resource registries 'Microsoft.ContainerRegistry/registries@${azure.apiVersionFo zoneRedundancy: 'Disabled' anonymousPullEnabled: false } - tags: tagsByResource['${identifier.registries}'] + tags: tagsByResource['Microsoft.ContainerRegistry/registries'] } output acrName string = acrName diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aks.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aks.bicep index 021434135..bc823fd93 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aks.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aks.bicep @@ -25,7 +25,7 @@ param aksVersion string = 'default' @description('In addition to the CPU and memory metrics included in AKS by default, you can enable Container Insights for more comprehensive data on the overall performance and health of your cluster. Billing is based on data ingestion and retention settings.') param enableAzureMonitoring bool = false param location string -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param utcValue string = utcNow() @@ -42,10 +42,10 @@ var obj_aciEnableOmsAgent = { } } -resource azureMonitoringWorkspace 'Microsoft.OperationalInsights/workspaces@${azure.apiVersionForInsightsWorkspaces}' = if (enableAzureMonitoring) { +resource azureMonitoringWorkspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = if (enableAzureMonitoring) { name: name_aciWorkspace location: location - tags: tagsByResource['${identifier.workspaces}'] + tags: tagsByResource['Microsoft.OperationalInsights/workspaces'] properties: { sku: { name: aciWorkspaceSku @@ -59,10 +59,10 @@ resource azureMonitoringWorkspace 'Microsoft.OperationalInsights/workspaces@${az } } -resource aksCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' = { +resource aksCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' = { name: aksClusterName location: location - tags: tagsByResource['${identifier.managedClusters}'] + tags: tagsByResource['Microsoft.ContainerService/managedClusters'] properties: { kubernetesVersion: aksVersion dnsPrefix: '${aksClusterName}-dns' @@ -81,7 +81,7 @@ resource aksCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersi availabilityZones: agentAvailabilityZones mode: 'System' osType: 'Linux' - tags: tagsByResource['${identifier.managedClusters}'] + tags: tagsByResource['Microsoft.ContainerService/managedClusters'] } ] addonProfiles: { diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aksPodIdentity.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aksPodIdentity.bicep index 9b440d89f..09a711300 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aksPodIdentity.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aksPodIdentity.bicep @@ -12,7 +12,7 @@ param location string var const_APIVersion = '2022-01-31-PREVIEW' -resource configAKSPodIdentity 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' = { +resource configAKSPodIdentity 'Microsoft.ContainerService/managedClusters@2023-08-01' = { name: aksClusterName location: location properties: { diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep index beaa9cad8..6c6aff06b 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep @@ -20,7 +20,7 @@ param staticPrivateFrontentIP string = '10.0.0.1' @secure() param trustedRootCertData string = newGuid() param usePrivateIP bool = false -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param utcValue string = utcNow() @@ -80,13 +80,13 @@ var obj_tagIngress = { 'managed-by-k8s-ingress': 'true' } -resource gatewayPublicIP 'Microsoft.Network/publicIPAddresses@${azure.apiVersionForPublicIPAddresses}' = { +resource gatewayPublicIP 'Microsoft.Network/publicIPAddresses@2023-06-01' = { name: gatewayPublicIPAddressName sku: { name: 'Standard' } location: location - tags: tagsByResource['${identifier.publicIPAddresses}'] + tags: tagsByResource['Microsoft.Network/publicIPAddresses'] properties: { publicIPAllocationMethod: 'Static' dnsSettings: { @@ -95,10 +95,10 @@ resource gatewayPublicIP 'Microsoft.Network/publicIPAddresses@${azure.apiVersion } } -resource wafv2AppGateway 'Microsoft.Network/applicationGateways@${azure.apiVersionForApplicationGateways}' = { +resource wafv2AppGateway 'Microsoft.Network/applicationGateways@2023-06-01' = { name: gatewayName location: location - tags: union(tagsByResource['${identifier.applicationGateways}'], obj_tagIngress) + tags: union(tagsByResource['Microsoft.Network/applicationGateways'], obj_tagIngress) properties: { sku: { name: 'WAF_v2' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_autoGeneratedPfxCertInKeyVault.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_autoGeneratedPfxCertInKeyVault.bicep index c7f4022f2..6f139db35 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_autoGeneratedPfxCertInKeyVault.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_autoGeneratedPfxCertInKeyVault.bicep @@ -28,7 +28,7 @@ param sku string = 'Standard' @description('Subject name to create a new certificate, example: \'CN=contoso.com\'.') param subjectName string = 'contoso.xyz' -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param utcValue string = utcNow() @@ -37,10 +37,10 @@ var obj_extraTag= { } var const_identityId = '${substring(string(identity.userAssignedIdentities), indexOf(string(identity.userAssignedIdentities), '"') + 1, lastIndexOf(string(identity.userAssignedIdentities), '"') - (indexOf(string(identity.userAssignedIdentities), '"') + 1))}' -resource keyvault 'Microsoft.KeyVault/vaults@${azure.apiVersionForKeyVault}' = { +resource keyvault 'Microsoft.KeyVault/vaults@2024-11-01' = { name: keyVaultName location: location - tags: union(tagsByResource['${identifier.vaults}'], obj_extraTag) + tags: union(tagsByResource['Microsoft.KeyVault/vaults'], obj_extraTag) properties: { sku: { family: 'A' @@ -63,15 +63,15 @@ resource keyvault 'Microsoft.KeyVault/vaults@${azure.apiVersionForKeyVault}' = { } } -resource createAddCertificate 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource createAddCertificate 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: 'ds-create-add-appgw-certificate-${_globalResourceNameSuffix}' location: location identity: identity kind: 'AzurePowerShell' - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { forceUpdateTag: utcValue - azPowerShellVersion: '${azure.powershell.version}' + azPowerShellVersion: '11.5' timeout: 'PT30M' arguments: ' -vaultName ${keyVaultName} -certificateName ${secretName} -subjectName ${subjectName}' scriptContent: '\n param(\n [string] [Parameter(Mandatory=$true)] $vaultName,\n [string] [Parameter(Mandatory=$true)] $certificateName,\n [string] [Parameter(Mandatory=$true)] $subjectName\n )\n\n $ErrorActionPreference = \'Stop\'\n $DeploymentScriptOutputs = @{}\n\n $existingCert = Get-AzKeyVaultCertificate -VaultName $vaultName -Name $certificateName\n\n if ($existingCert -and $existingCert.Certificate.Subject -eq $subjectName) {\n\n Write-Host \'Certificate $certificateName in vault $vaultName is already present.\'\n\n $DeploymentScriptOutputs[\'certThumbprint\'] = $existingCert.Thumbprint\n $existingCert | Out-String\n }\n else {\n $policy = New-AzKeyVaultCertificatePolicy -SubjectName $subjectName -IssuerName Self -ValidityInMonths 12 -Verbose\n\n # private key is added as a secret that can be retrieved in the ARM template\n Add-AzKeyVaultCertificate -VaultName $vaultName -Name $certificateName -CertificatePolicy $policy -Verbose\n\n $newCert = Get-AzKeyVaultCertificate -VaultName $vaultName -Name $certificateName\n\n # it takes a few seconds for KeyVault to finish\n $tries = 0\n do {\n Write-Host \'Waiting for certificate creation completion...\'\n Start-Sleep -Seconds 10\n $operation = Get-AzKeyVaultCertificateOperation -VaultName $vaultName -Name $certificateName\n $tries++\n\n if ($operation.Status -eq \'failed\')\n {\n throw \'Creating certificate $certificateName in vault $vaultName failed with error $($operation.ErrorMessage)\'\n }\n\n if ($tries -gt 120)\n {\n throw \'Timed out waiting for creation of certificate $certificateName in vault $vaultName\'\n }\n } while ($operation.Status -ne \'completed\')\n\n $DeploymentScriptOutputs[\'certThumbprint\'] = $newCert.Thumbprint\n $newCert | Out-String\n }\n ' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_dnsZones.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_dnsZones.bicep index 18f740809..bfd70b8b1 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_dnsZones.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_dnsZones.bicep @@ -1,12 +1,12 @@ @description('Azure DNS Zone name.') param dnszoneName string -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object -resource dnszoneName_resource 'Microsoft.Network/dnszones@${azure.apiVersionForDNSZone}' = { +resource dnszoneName_resource 'Microsoft.Network/dnszones@2023-07-01-preview' = { name: dnszoneName location: 'global' - tags: tagsByResource['${identifier.dnszones}'] + tags: tagsByResource['Microsoft.Network/dnszones'] properties: { zoneType: 'Public' } diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_storage.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_storage.bicep index 009b1a669..3d36bd617 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_storage.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_storage.bicep @@ -4,7 +4,7 @@ param fileShareName string param location string param storageAccountName string = 'stg-contoso' -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param utcValue string = utcNow() @@ -14,11 +14,11 @@ var obj_extraTag = { 'created-by-azure-weblogic': utcValue } -resource storageAccount 'Microsoft.Storage/storageAccounts@${azure.apiVersionForStorage}' = { +resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { name: storageAccountName location: location kind: 'StorageV2' - tags: union(tagsByResource['${identifier.storageAccounts}'], obj_extraTag) + tags: union(tagsByResource['Microsoft.Storage/storageAccounts'], obj_extraTag) sku: { name: const_sku tier: 'Standard' @@ -42,7 +42,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@${azure.apiVersionFor } } -resource fileService 'Microsoft.Storage/storageAccounts/fileServices/shares@${azure.apiVersionForStorageFileService}' = { +resource fileService 'Microsoft.Storage/storageAccounts/fileServices/shares@2023-05-01' = { name: '${storageAccount.name}/default/${fileShareName}' properties: { accessTier: 'TransactionOptimized' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_vnetAppGateway.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_vnetAppGateway.bicep index 2a5badc4e..2fbded7b4 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_vnetAppGateway.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_vnetAppGateway.bicep @@ -19,7 +19,7 @@ param vnetForApplicationGateway object = { } } } -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param utcValue string = utcNow() @@ -30,22 +30,22 @@ var name_subnet = vnetForApplicationGateway.subnets.gatewaySubnet.name var name_vnet = vnetForApplicationGateway.name // Get existing VNET. -resource existingVnet 'Microsoft.Network/virtualNetworks@${azure.apiVersionForVirtualNetworks}' existing = if (!const_newVnet) { +resource existingVnet 'Microsoft.Network/virtualNetworks@2023-06-01' existing = if (!const_newVnet) { name: name_vnet scope: resourceGroup(vnetForApplicationGateway.resourceGroup) } // Get existing subnet. -resource existingSubnet 'Microsoft.Network/virtualNetworks/subnets@${azure.apiVersionForVirtualNetworks}' existing = if (!const_newVnet) { +resource existingSubnet 'Microsoft.Network/virtualNetworks/subnets@2023-06-01' existing = if (!const_newVnet) { name: name_subnet parent: existingVnet } // Create new network security group. -resource nsg 'Microsoft.Network/networkSecurityGroups@${azure.apiVersionForNetworkSecurityGroups}' = if (const_newVnet) { +resource nsg 'Microsoft.Network/networkSecurityGroups@2023-06-01' = if (const_newVnet) { name: nsgName location: location - tags: tagsByResource['${identifier.networkSecurityGroups}'] + tags: tagsByResource['Microsoft.Network/networkSecurityGroups'] properties: { securityRules: [ { @@ -82,10 +82,10 @@ resource nsg 'Microsoft.Network/networkSecurityGroups@${azure.apiVersionForNetwo } // Create new VNET and subnet. -resource newVnet 'Microsoft.Network/virtualNetworks@${azure.apiVersionForVirtualNetworks}' = if (const_newVnet) { +resource newVnet 'Microsoft.Network/virtualNetworks@2023-06-01' = if (const_newVnet) { name: name_vnet location: location - tags: tagsByResource['${identifier.virtualNetworks}'] + tags: tagsByResource['Microsoft.Network/virtualNetworks'] properties: { addressSpace: { addressPrefixes: const_vnetAddressPrefixes diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-networking.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-networking.bicep index 901fe4f83..55204039a 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-networking.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-networking.bicep @@ -35,7 +35,7 @@ param useInternalLB bool = false param utcValue string = utcNow() param wlsDomainName string = 'domain1' param wlsDomainUID string = 'sample-domain1' -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object var const_commonScript = 'common.sh' @@ -46,12 +46,12 @@ var const_scriptLocation = uri(_artifactsLocation, 'scripts/') var const_primaryScript = 'setupNetworking.sh' var const_utilityScript = 'utility.sh' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: 'ds-networking-deployment-${_globalResourceNameSuffix}' location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion environmentVariables: [ diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep index 6c4d3eea5..384a26bd9 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep @@ -31,7 +31,7 @@ param managedServerPrefix string = 'managed-server' param ocrSSOPSW string param ocrSSOUser string param storageAccountName string = 'null' -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param t3ChannelAdminPort int = 7005 param t3ChannelClusterPort int = 8011 @@ -83,12 +83,12 @@ var const_setUpDomainScript = 'setupWLSDomain.sh' var const_updateDomainConfigScript= 'updateDomainConfig.sh' var const_utilityScript= 'utility.sh' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: 'ds-wls-cluster-creation-${_globalResourceNameSuffix}' location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion environmentVariables: [ @@ -174,7 +174,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers } { name: 'TAG_VM' - value: string(tagsByResource['${identifier.virtualMachines}']) + value: string(tagsByResource['Microsoft.Compute/virtualMachines']) } { name: 'URL_3RD_DATASOURCE' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep index 19d5678d3..ccaaca56d 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep @@ -22,7 +22,7 @@ param enablePswlessConnection bool = false param identity object = {} param jdbcDataSourceName string param location string -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param utcValue string = utcNow() param wlsDomainUID string = 'sample-domain1' @@ -38,12 +38,12 @@ var const_dbUtilityScript='dbUtility.sh' var const_scriptLocation = uri(_artifactsLocation, 'scripts/') var const_utilityScript= 'utility.sh' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: 'ds-wls-db-connection-${_globalResourceNameSuffix}' location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion environmentVariables: [ diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-output-domain-configurations.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-output-domain-configurations.bicep index d86fc1353..0aa9907ce 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-output-domain-configurations.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-output-domain-configurations.bicep @@ -7,7 +7,7 @@ param aksClusterName string = '' param azCliVersion string = '' param identity object = {} param location string -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param utcValue string = utcNow() param wlsClusterName string = 'cluster-1' @@ -18,12 +18,12 @@ var base64_common = loadFileAsBase64('../../../arm/scripts/common.sh') var base64_queryDomainConfigurations = loadFileAsBase64('../../../arm/scripts/inline-scripts/queryDomainConfigurations.sh') var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh') -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: 'ds-query-wls-configurations-${_globalResourceNameSuffix}' location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion environmentVariables: [ diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep index c3e6b5f37..1e6ef13dd 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep @@ -11,7 +11,7 @@ param aksClusterName string = '' param azCliVersion string = '' param identity object = {} param location string -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param utcValue string = utcNow() param wlsDomainUID string = 'sample-domain1' @@ -27,12 +27,12 @@ var const_utilityScript= 'utility.sh' var const_commonScript= 'common.sh' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: 'ds-wls-validate-applications-${_globalResourceNameSuffix}' location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion environmentVariables: [ diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep index c865a2e6a..60527b7c2 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep @@ -42,7 +42,7 @@ param sslUploadedCustomTrustKeyStoreType string param sslUploadedPrivateKeyAlias string @secure() param sslUploadedPrivateKeyPassPhrase string -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param useAksWellTestedVersion bool = true param userProvidedAcr string @@ -61,12 +61,12 @@ var const_arguments = '${location} ${createAKSCluster} ${aksAgentPoolVMSize} ${a var const_checkDNSZone = enableDNSConfiguration && !createDNSZone var const_deploymentName = 'ds-validate-parameters-and-fail-fast-${_globalResourceNameSuffix}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion arguments: const_arguments diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_hpa.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_hpa.bicep index ec3571b0f..f54078507 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_hpa.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_hpa.bicep @@ -12,7 +12,7 @@ param azCliVersion string param hpaScaleType string = 'cpu' param identity object = {} param location string -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param utcValue string = utcNow() param utilizationPercentage int @@ -25,12 +25,12 @@ var base64_enableHpa = loadFileAsBase64('../../../arm/scripts/inline-scripts/ena var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh') var const_deploymentName='ds-enable-hpa-${_globalResourceNameSuffix}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion scriptContent: format('{0}\r\n\r\n{1}\r\n\r\n{2}',base64ToString(base64_common), base64ToString(base64_utility), base64ToString(base64_enableHpa)) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep index 3be6c611a..304420d26 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep @@ -9,7 +9,7 @@ param azCliVersion string param identity object = {} param kedaUamiName string param location string -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param utcValue string = utcNow() param wlsClusterSize int @@ -28,12 +28,12 @@ var const_deploymentName = 'ds-enable-promethues-metrics-${_globalResourceNameSu var const_kedaNamespace= 'keda' var const_kedaSa= 'keda-operator' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion scriptContent: format('{0}\r\n\r\n{1}\r\n\r\n{2}', base64ToString(base64_common), base64ToString(base64_utility), base64ToString(base64_enableHpa)) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_ensure_available_agic.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_ensure_available_agic.bicep index e42042a66..8a84a0818 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_ensure_available_agic.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_ensure_available_agic.bicep @@ -15,7 +15,7 @@ var base64_enableAgic = loadFileAsBase64('../../../arm/scripts/inline-scripts/en var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh') var const_deploymentName='ds-validate-agic-${uniqueString(utcValue)}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: const_deploymentName location: location kind: 'AzureCLI' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_install_agic.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_install_agic.bicep index fc355f699..a8ff819b5 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_install_agic.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_install_agic.bicep @@ -8,7 +8,7 @@ param appgwName string = 'appgw-contoso' param azCliVersion string = '' param identity object = {} param location string -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param utcValue string = utcNow() @@ -18,12 +18,12 @@ var base64_enableAgic = loadFileAsBase64('../../../arm/scripts/inline-scripts/en var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh') var const_deploymentName='ds-install-agic-${_globalResourceNameSuffix}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion scriptContent: format('{0}\r\n\r\n{1}\r\n\r\n{2}',base64ToString(base64_common), base64ToString(base64_utility), base64ToString(base64_enableAgic)) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_query_available_private_ip_from_subnet.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_query_available_private_ip_from_subnet.bicep index ea3ad9025..ff01f9a8f 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_query_available_private_ip_from_subnet.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_query_available_private_ip_from_subnet.bicep @@ -7,7 +7,7 @@ param knownIP string = '10.0.0.1' param identity object = {} param location string -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param utcValue string = utcNow() @@ -16,12 +16,12 @@ var base64_common = loadFileAsBase64('../../../arm/scripts/common.sh') var base64_queryPrivateIPForAppGateway = loadFileAsBase64('../../../arm/scripts/inline-scripts/queryPrivateIPForAppGateway.sh') var const_deploymentName = 'ds-query-private-ip-${uniqueString(utcValue)}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion scriptContent: format('{0}\r\n\r\n{1}', base64ToString(base64_common), base64ToString(base64_queryPrivateIPForAppGateway)) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_update-applications.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_update-applications.bicep index 8f0623b14..f8dd606db 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_update-applications.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_update-applications.bicep @@ -35,7 +35,7 @@ var const_scriptLocation = uri(_artifactsLocation, 'scripts/') var const_updateAppScript= 'updateApplications.sh' var const_utilityScript= 'utility.sh' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: 'ds-wls-update-applications-${uniqueString(utcValue)}' location: location kind: 'AzureCLI' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_validate_agic.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_validate_agic.bicep index 437ac0128..66942fe07 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_validate_agic.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_validate_agic.bicep @@ -7,7 +7,7 @@ param aksClusterRGName string param azCliVersion string = '' param identity object = {} param location string -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param utcValue string = utcNow() @@ -17,12 +17,12 @@ var base64_enableAgic = loadFileAsBase64('../../../arm/scripts/inline-scripts/va var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh') var const_deploymentName='ds-validate-agic-${_globalResourceNameSuffix}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['${identifier.deploymentScripts}'] + tags: tagsByResource['Microsoft.Resources/deploymentScripts'] properties: { azCliVersion: azCliVersion scriptContent: format('{0}\r\n\r\n{1}\r\n\r\n{2}',base64ToString(base64_common), base64ToString(base64_utility), base64ToString(base64_enableAgic)) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_enableAutoScaling.bicep b/weblogic-azure-aks/src/main/bicep/modules/_enableAutoScaling.bicep index 59d78778a..057444d33 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_enableAutoScaling.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_enableAutoScaling.bicep @@ -21,7 +21,7 @@ param azCliVersion string param hpaScaleType string = 'cpu' param identity object = {} param location string -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param useHpa bool param utilizationPercentage int diff --git a/weblogic-azure-aks/src/main/bicep/modules/_enablePromethuesKeda.bicep b/weblogic-azure-aks/src/main/bicep/modules/_enablePromethuesKeda.bicep index fc5aa1a2e..e2173e591 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_enablePromethuesKeda.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_enablePromethuesKeda.bicep @@ -8,7 +8,7 @@ param aksClusterRGName string param azCliVersion string param identity object = {} param location string -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param utcValue string = utcNow() param wlsClusterSize int @@ -24,32 +24,32 @@ var name_azureMonitorAccountName = 'ama${_globalResourceNameSuffix}' var name_kedaUserDefinedManagedIdentity = 'kedauami${_globalResourceNameSuffix}' var name_kedaMonitorDataReaderRoleAssignmentName = guid('${resourceGroup().id}${name_kedaUserDefinedManagedIdentity}${_globalResourceNameSuffix}') -resource monitorAccount 'Microsoft.Monitor/accounts@${azure.apiVersionForMonitorAccount}' = { +resource monitorAccount 'Microsoft.Monitor/accounts@2023-04-03' = { name: name_azureMonitorAccountName location: location properties: {} - tags: tagsByResource['${identifier.accounts}'] + tags: tagsByResource['Microsoft.Monitor/accounts'] } // UAMI for KEDA -resource uamiForKeda 'Microsoft.ManagedIdentity/userAssignedIdentities@${azure.apiVersionForIdentity}' = { +resource uamiForKeda 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { name: name_kedaUserDefinedManagedIdentity location: location - tags: tagsByResource['${identifier.userAssignedIdentities}'] + tags: tagsByResource['Microsoft.ManagedIdentity/userAssignedIdentities'] } // Get role resource id -resource monitorDataReaderResourceDefinition 'Microsoft.Authorization/roleDefinitions@${azure.apiVersionForRoleDefinitions}' existing = { +resource monitorDataReaderResourceDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = { name: const_roleDefinitionIdOfMonitorDataReader } // Assign Monitor Data Reader role we need the permission to read data. -resource kedaUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { +resource kedaUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { name: name_kedaMonitorDataReaderRoleAssignmentName scope: monitorAccount properties: { description: 'Assign Monitor Data Reader role role to KEDA Identity ' - principalId: reference(uamiForKeda.id, '${azure.apiVersionForIdentity}', 'full').properties.principalId + principalId: reference(uamiForKeda.id, '2023-01-31', 'full').properties.principalId principalType: 'ServicePrincipal' roleDefinitionId: monitorDataReaderResourceDefinition.id } diff --git a/weblogic-azure-aks/src/main/bicep/modules/_globalUamiAndRoles.bicep b/weblogic-azure-aks/src/main/bicep/modules/_globalUamiAndRoles.bicep index e5acfe269..9bf5fdea1 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_globalUamiAndRoles.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_globalUamiAndRoles.bicep @@ -5,7 +5,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or param _globalResourceNameSuffix string param location string -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param name_deploymentScriptContributorRoleAssignmentName string = newGuid() @@ -14,10 +14,10 @@ var const_roleDefinitionIdOfContributor = 'b24988ac-6180-42a0-ab88-20f7382dd24c' var name_deploymentScriptUserDefinedManagedIdentity = 'wls-aks-deployment-script-user-defined-managed-itentity-${_globalResourceNameSuffix}' // UAMI for deployment script -resource uamiForDeploymentScript 'Microsoft.ManagedIdentity/userAssignedIdentities@${azure.apiVersionForIdentity}' = { +resource uamiForDeploymentScript 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { name: name_deploymentScriptUserDefinedManagedIdentity location: location - tags: tagsByResource['${identifier.userAssignedIdentities}'] + tags: tagsByResource['Microsoft.ManagedIdentity/userAssignedIdentities'] } // Assign Contributor role in subscription scope, we need the permission to get/update resource cross resource group. diff --git a/weblogic-azure-aks/src/main/bicep/modules/_preDeployedAzureResources.bicep b/weblogic-azure-aks/src/main/bicep/modules/_preDeployedAzureResources.bicep index 0790d55a1..7f46a87bb 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_preDeployedAzureResources.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_preDeployedAzureResources.bicep @@ -6,7 +6,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or param acrName string = 'acr-contoso' param acrResourceGroupName string = 'acr-contoso-rg' param createNewAcr bool = false -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param location string diff --git a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicNetworkContributor.bicep b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicNetworkContributor.bicep index e2bc8bed0..1f8666c37 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicNetworkContributor.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicNetworkContributor.bicep @@ -12,12 +12,12 @@ var name_appGwContributorRoleAssignmentName = guid('${resourceGroup().id}${uniqu // https://docs.microsoft.com/en-us/azure/role-based-access-control/built-in-roles var const_roleDefinitionIdOfVnetContributor = '4d97b98b-1d4f-4787-a291-c67834d212e7' -resource aksCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' existing = { +resource aksCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' existing = { name: aksClusterName scope: resourceGroup(aksClusterRGName) } -resource agicUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { +resource agicUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { name: name_appGwContributorRoleAssignmentName properties: { description: 'Assign Network Contributor role to AGIC Identity ' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicRoleAssignment.bicep b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicRoleAssignment.bicep index 85f56df12..5b8fa06a6 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicRoleAssignment.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicRoleAssignment.bicep @@ -12,12 +12,12 @@ var name_appGwContributorRoleAssignmentName = guid('${resourceGroup().id}${uniqu // https://docs.microsoft.com/en-us/azure/role-based-access-control/built-in-roles var const_roleDefinitionIdOfContributor = 'b24988ac-6180-42a0-ab88-20f7382dd24c' -resource aksCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' existing = { +resource aksCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' existing = { name: aksClusterName scope: resourceGroup(aksClusterRGName) } -resource agicUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { +resource agicUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { name: name_appGwContributorRoleAssignmentName properties: { description: 'Assign Resource Group Contributor role to User Assigned Managed Identity ' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_aksClusterMioRoleOverDbIdentity.bicep b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_aksClusterMioRoleOverDbIdentity.bicep index 514d47094..5aaad7ff0 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_aksClusterMioRoleOverDbIdentity.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_aksClusterMioRoleOverDbIdentity.bicep @@ -10,17 +10,17 @@ param dbIdentityName string = '' var const_roleDefinitionIdOfManagedIdentityOperator = 'f1a07417-d97a-45cb-824c-7a7467783830' var name_roleAssignmentName = guid('${subscription().id}${clusterIdentityPrincipalId}Role assignment in resource scope') -resource dbIdentityResource 'Microsoft.ManagedIdentity/userAssignedIdentities@${azure.apiVersionForIdentity}' existing = { +resource dbIdentityResource 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' existing = { name: dbIdentityName } // Get role resource id -resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@${azure.apiVersionForRoleDefinitions}' existing = { +resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = { name: const_roleDefinitionIdOfManagedIdentityOperator } // Assign role -resource roleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { +resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { name: name_roleAssignmentName scope: dbIdentityResource properties: { diff --git a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinRgScope.bicep b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinRgScope.bicep index f5b50c20d..ec44876f3 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinRgScope.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinRgScope.bicep @@ -25,12 +25,12 @@ var const_identityAPIVersion = '2022-01-31-PREVIEW' var name_roleAssignmentName = guid('${subscription().id}${_globalResourceNameSuffix}Role assignment in resource group scope') // Get role resource id -resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@${azure.apiVersionForRoleDefinitions}' existing = { +resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = { name: roleDefinitionId } // Assign role -resource roleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { +resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { name: name_roleAssignmentName properties: { description: 'Assign resource group scope role to User Assigned Managed Identity ' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinSubscription.bicep b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinSubscription.bicep index 9c27fb507..c886338c6 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinSubscription.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinSubscription.bicep @@ -25,12 +25,12 @@ param principalId string = '' var name_roleAssignmentName = guid('${subscription().id}${principalId}Role assignment in subscription scope') // Get role resource id in subscription -resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@${azure.apiVersionForRoleDefinitions}' existing = { +resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = { name: roleDefinitionId } // Assign role -resource roleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { +resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { name: name_roleAssignmentName properties: { description: 'Assign subscription scope role to User Assigned Managed Identity ' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_setupDBConnection.bicep b/weblogic-azure-aks/src/main/bicep/modules/_setupDBConnection.bicep index fb2a44eed..a0c00030a 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_setupDBConnection.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_setupDBConnection.bicep @@ -41,7 +41,7 @@ param identity object = {} @description('JNDI Name for JDBC Datasource') param jdbcDataSourceName string = 'jdbc/contoso' param location string -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object @description('UID of WebLogic domain, used in WebLogic Operator.') param wlsDomainUID string = 'sample-domain1' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep b/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep index a431ba321..d40bedcf0 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep @@ -35,7 +35,7 @@ param identity object = {} @description('JNDI Name for JDBC Datasource') param jdbcDataSourceName string = 'jdbc/contoso' param location string -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param utcValue string = utcNow() @description('UID of WebLogic domain, used in WebLogic Operator.') @@ -87,7 +87,7 @@ module dbIdentityVMContributorRoleAssignment '_rolesAssignment/_roleAssignmentin } } -resource existingAKSCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' existing = { +resource existingAKSCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' existing = { name: aksClusterName scope: resourceGroup(aksClusterRGName) } diff --git a/weblogic-azure-aks/src/main/bicep/modules/networking.bicep b/weblogic-azure-aks/src/main/bicep/modules/networking.bicep index 47374ba3f..043a6ac06 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/networking.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/networking.bicep @@ -49,7 +49,7 @@ param location string param lbSvcValues array = [] param newOrExistingVnetForApplicationGateway string param vnetRGNameForApplicationGateway string -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object @description('True to set up internal load balancer service.') param useInternalLB bool = false diff --git a/weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep b/weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep index 4a91bbfc7..e5dc6330c 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep @@ -84,7 +84,7 @@ param ocrSSOUser string param storageAccountName string = 'stg-contoso' param t3ChannelAdminPort int = 7005 param t3ChannelClusterPort int = 8011 -@description('${label.tagsLabel}') +@description('Tags for the resources') param tagsByResource object param userProvidedAcr string = 'null' param userProvidedAcrRgName string = 'null' @@ -149,7 +149,7 @@ module pidSSLStart './_pids/_pid.bicep' = if (enableCustomSSL) { } } -resource existingAKSCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' existing = if (!createAKSCluster) { +resource existingAKSCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' existing = if (!createAKSCluster) { name: aksClusterName scope: resourceGroup(aksClusterRGName) } From 32b16fcfff74041df80a6cd31f1c9c207624db37 Mon Sep 17 00:00:00 2001 From: gnsuryan Date: Wed, 4 Jun 2025 16:59:30 +0000 Subject: [PATCH 3/4] Revert "changes done for local testing" This reverts commit 0cde0dfabbd96820e3d61428d92ba2bcdadd51d4. --- .../src/main/arm/scripts/common.sh | 12 +++---- .../src/main/bicep/mainTemplate.bicep | 34 +++++++++---------- .../src/main/bicep/modules/_appGateway.bicep | 4 +-- .../bicep/modules/_azure-resoruces/_acr.bicep | 6 ++-- .../bicep/modules/_azure-resoruces/_aks.bicep | 12 +++---- .../_azure-resoruces/_aksPodIdentity.bicep | 2 +- .../_azure-resoruces/_appgateway.bicep | 10 +++--- .../_autoGeneratedPfxCertInKeyVault.bicep | 12 +++---- .../modules/_azure-resoruces/_dnsZones.bicep | 6 ++-- .../modules/_azure-resoruces/_storage.bicep | 8 ++--- .../_azure-resoruces/_vnetAppGateway.bicep | 14 ++++---- .../_ds-create-networking.bicep | 6 ++-- .../_ds-create-wls-cluster.bicep | 8 ++--- .../_ds-datasource-connection.bicep | 6 ++-- .../_ds-output-domain-configurations.bicep | 6 ++-- .../_ds-validate-applications.bicep | 6 ++-- .../_ds-validate-parameters.bicep | 6 ++-- .../_deployment-scripts/_ds_enable_hpa.bicep | 6 ++-- .../_ds_enable_prometheus_metrics.bicep | 6 ++-- .../_ds_ensure_available_agic.bicep | 2 +- .../_ds_install_agic.bicep | 6 ++-- ...ery_available_private_ip_from_subnet.bicep | 6 ++-- .../_ds_update-applications.bicep | 2 +- .../_ds_validate_agic.bicep | 6 ++-- .../bicep/modules/_enableAutoScaling.bicep | 2 +- .../bicep/modules/_enablePromethuesKeda.bicep | 16 ++++----- .../bicep/modules/_globalUamiAndRoles.bicep | 6 ++-- .../modules/_preDeployedAzureResources.bicep | 2 +- .../_agicNetworkContributor.bicep | 4 +-- .../_agicRoleAssignment.bicep | 4 +-- .../_aksClusterMioRoleOverDbIdentity.bicep | 6 ++-- .../_roleAssignmentinRgScope.bicep | 4 +-- .../_roleAssignmentinSubscription.bicep | 4 +-- .../bicep/modules/_setupDBConnection.bicep | 2 +- .../_setupPasswordlessDBConnection.bicep | 4 +-- .../src/main/bicep/modules/networking.bicep | 2 +- .../bicep/modules/setupWebLogicCluster.bicep | 4 +-- 37 files changed, 126 insertions(+), 126 deletions(-) diff --git a/weblogic-azure-aks/src/main/arm/scripts/common.sh b/weblogic-azure-aks/src/main/arm/scripts/common.sh index aa486c40a..708a49205 100644 --- a/weblogic-azure-aks/src/main/arm/scripts/common.sh +++ b/weblogic-azure-aks/src/main/arm/scripts/common.sh @@ -50,12 +50,12 @@ export curlMaxTime=120 # seconds export ocrLoginServer="container-registry.oracle.com" export ocrGaImagePath="middleware/weblogic" export ocrCpuImagePath="middleware/weblogic_cpu" -export gitUrl4CpuImages="https://raw.githubusercontent.com/gnsuryan/weblogic-azure/main/weblogic-azure-aks/src/main/resources/weblogic_cpu_images.json" -export gitUrl4AksWellTestedVersionJsonFile="https://raw.githubusercontent.com/gnsuryan/weblogic-azure/main/weblogic-azure-aks/src/main/resources/aks_well_tested_version.json" -export gitUrl4AksToolingWellTestedVersionJsonFile="https://raw.githubusercontent.com/gnsuryan/weblogic-azure/main/weblogic-azure-aks/src/main/resources/aks_tooling_well_tested_versions.json" -export gitUrl4WLSToolingFamilyJsonFile="https://raw.githubusercontent.com/gnsuryan/weblogic-azure/main/weblogic-azure-aks/src/main/resources/weblogic_tooling_family.json" -export gitUrl4AzureIdentityExtensionsPomFile="https://raw.githubusercontent.com/gnsuryan/weblogic-azure/main/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml" -export gitUrl4MySQLDriverPomFile="https://raw.githubusercontent.com/gnsuryan/weblogic-azure/main/weblogic-azure-aks/src/main/resources/mysql-connector-java.xml" +export gitUrl4CpuImages="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/weblogic_cpu_images.json" +export gitUrl4AksWellTestedVersionJsonFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/aks_well_tested_version.json" +export gitUrl4AksToolingWellTestedVersionJsonFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/aks_tooling_well_tested_versions.json" +export gitUrl4WLSToolingFamilyJsonFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/weblogic_tooling_family.json" +export gitUrl4AzureIdentityExtensionsPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml" +export gitUrl4MySQLDriverPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/mysql-connector-java.xml" export optUninstallMaxTry=5 # Max attempts to wait for the operator uninstalled export optUninstallInterval=10 diff --git a/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep b/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep index 9e2e3622c..54058c483 100644 --- a/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep +++ b/weblogic-azure-aks/src/main/bicep/mainTemplate.bicep @@ -199,7 +199,7 @@ param sslUploadedPrivateKeyAlias string = newGuid() @secure() @description('Password of the private key') param sslUploadedPrivateKeyPassPhrase string = newGuid() -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object = {} @description('Public port of the custom T3 channel in admin server') param t3ChannelAdminPort int = 7005 @@ -266,22 +266,22 @@ var _enableAppGWIngress = enableAppGWIngress // We can streamline the following code with a user-defined function, but it is not supported in Partner Center. // For status, see https://dev.azure.com/edburns-msft/Open%20Standard%20Enterprise%20Java%20(Java%20EE)%20on%20Azure/_workitems/edit/6219 var _objTagsByResource = { - 'Microsoft.Monitor/accounts': contains(tagsByResource, 'Microsoft.Monitor/accounts') ? tagsByResource['Microsoft.Monitor/accounts'] : json('{}') - 'Microsoft.ContainerService/managedClusters': contains(tagsByResource, 'Microsoft.ContainerService/managedClusters') ? tagsByResource['Microsoft.ContainerService/managedClusters'] : json('{}') - 'Microsoft.Network/applicationGateways': contains(tagsByResource, 'Microsoft.Network/applicationGateways') ? tagsByResource['Microsoft.Network/applicationGateways'] : json('{}') - 'Microsoft.ContainerRegistry/registries': contains(tagsByResource, 'Microsoft.ContainerRegistry/registries') ? tagsByResource['Microsoft.ContainerRegistry/registries'] : json('{}') - 'Microsoft.Compute/virtualMachines': contains(tagsByResource, 'Microsoft.Compute/virtualMachines') ? tagsByResource['Microsoft.Compute/virtualMachines'] : json('{}') - 'Virtual machine extension': contains(tagsByResource, 'Virtual machine extension') ? tagsByResource['Virtual machine extension'] : json('{}') - 'Microsoft.Network/virtualNetworks': contains(tagsByResource, 'Microsoft.Network/virtualNetworks') ? tagsByResource['Microsoft.Network/virtualNetworks'] : json('{}') - 'Microsoft.Network/networkInterfaces': contains(tagsByResource, 'Microsoft.Network/networkInterfaces') ? tagsByResource['Microsoft.Network/networkInterfaces'] : json('{}') - 'Microsoft.Network/networkSecurityGroups': contains(tagsByResource, 'Microsoft.Network/networkSecurityGroups') ? tagsByResource['Microsoft.Network/networkSecurityGroups'] : json('{}') - 'Microsoft.Network/publicIPAddresses': contains(tagsByResource, 'Microsoft.Network/publicIPAddresses') ? tagsByResource['Microsoft.Network/publicIPAddresses'] : json('{}') - 'Microsoft.Storage/storageAccounts': contains(tagsByResource, 'Microsoft.Storage/storageAccounts') ? tagsByResource['Microsoft.Storage/storageAccounts'] : json('{}') - 'Microsoft.KeyVault/vaults': contains(tagsByResource, 'Microsoft.KeyVault/vaults') ? tagsByResource['Microsoft.KeyVault/vaults'] : json('{}') - 'Microsoft.ManagedIdentity/userAssignedIdentities': contains(tagsByResource, 'Microsoft.ManagedIdentity/userAssignedIdentities') ? tagsByResource['Microsoft.ManagedIdentity/userAssignedIdentities'] : json('{}') - 'Microsoft.Network/dnszones': contains(tagsByResource, 'Microsoft.Network/dnszones') ? tagsByResource['Microsoft.Network/dnszones'] : json('{}') - 'Microsoft.OperationalInsights/workspaces': contains(tagsByResource, 'Microsoft.OperationalInsights/workspaces') ? tagsByResource['Microsoft.OperationalInsights/workspaces'] : json('{}') - 'Microsoft.Resources/deploymentScripts': contains(tagsByResource, 'Microsoft.Resources/deploymentScripts') ? tagsByResource['Microsoft.Resources/deploymentScripts'] : json('{}') + '${identifier.accounts}': contains(tagsByResource, '${identifier.accounts}') ? tagsByResource['${identifier.accounts}'] : json('{}') + '${identifier.managedClusters}': contains(tagsByResource, '${identifier.managedClusters}') ? tagsByResource['${identifier.managedClusters}'] : json('{}') + '${identifier.applicationGateways}': contains(tagsByResource, '${identifier.applicationGateways}') ? tagsByResource['${identifier.applicationGateways}'] : json('{}') + '${identifier.registries}': contains(tagsByResource, '${identifier.registries}') ? tagsByResource['${identifier.registries}'] : json('{}') + '${identifier.virtualMachines}': contains(tagsByResource, '${identifier.virtualMachines}') ? tagsByResource['${identifier.virtualMachines}'] : json('{}') + '${identifier.virtualMachinesExtensions}': contains(tagsByResource, '${identifier.virtualMachinesExtensions}') ? tagsByResource['${identifier.virtualMachinesExtensions}'] : json('{}') + '${identifier.virtualNetworks}': contains(tagsByResource, '${identifier.virtualNetworks}') ? tagsByResource['${identifier.virtualNetworks}'] : json('{}') + '${identifier.networkInterfaces}': contains(tagsByResource, '${identifier.networkInterfaces}') ? tagsByResource['${identifier.networkInterfaces}'] : json('{}') + '${identifier.networkSecurityGroups}': contains(tagsByResource, '${identifier.networkSecurityGroups}') ? tagsByResource['${identifier.networkSecurityGroups}'] : json('{}') + '${identifier.publicIPAddresses}': contains(tagsByResource, '${identifier.publicIPAddresses}') ? tagsByResource['${identifier.publicIPAddresses}'] : json('{}') + '${identifier.storageAccounts}': contains(tagsByResource, '${identifier.storageAccounts}') ? tagsByResource['${identifier.storageAccounts}'] : json('{}') + '${identifier.vaults}': contains(tagsByResource, '${identifier.vaults}') ? tagsByResource['${identifier.vaults}'] : json('{}') + '${identifier.userAssignedIdentities}': contains(tagsByResource, '${identifier.userAssignedIdentities}') ? tagsByResource['${identifier.userAssignedIdentities}'] : json('{}') + '${identifier.dnszones}': contains(tagsByResource, '${identifier.dnszones}') ? tagsByResource['${identifier.dnszones}'] : json('{}') + '${identifier.workspaces}': contains(tagsByResource, '${identifier.workspaces}') ? tagsByResource['${identifier.workspaces}'] : json('{}') + '${identifier.deploymentScripts}': contains(tagsByResource, '${identifier.deploymentScripts}') ? tagsByResource['${identifier.deploymentScripts}'] : json('{}') } var const_aksName = createAKSCluster ? 'wlsonaks${const_globalResourceNameSuffix}' : aksClusterName var const_appGatewaySSLCertOptionGenerateCert = 'generateCert' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep b/weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep index febf02c7c..3c35a64ce 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_appGateway.bicep @@ -32,7 +32,7 @@ param trustedRootCertificateDeploymentName string @secure() param vnetForApplicationGateway object param vnetRGNameForApplicationGateway string -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object // To mitigate arm-ttk error: Type Mismatch: Parameter in nested template is defined as string, but the parent template defines it as bool. @@ -59,7 +59,7 @@ module pidAppgwWithCustomCertificate './_pids/_pid.bicep' = if (_signedFrontendC } // get key vault object from a resource group -resource existingKeyvault 'Microsoft.KeyVault/vaults@2024-11-01' existing = { +resource existingKeyvault 'Microsoft.KeyVault/vaults@${azure.apiVersionForKeyVault}' existing = { name: autoGeneratedSSLCertKeyVaultName } diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_acr.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_acr.bicep index 0f908e978..297f81567 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_acr.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_acr.bicep @@ -3,10 +3,10 @@ param acrName string param location string -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object -resource registries 'Microsoft.ContainerRegistry/registries@2023-07-01' = { +resource registries 'Microsoft.ContainerRegistry/registries@${azure.apiVersionForContainerRegistries}' = { name: acrName location: location sku: { @@ -37,7 +37,7 @@ resource registries 'Microsoft.ContainerRegistry/registries@2023-07-01' = { zoneRedundancy: 'Disabled' anonymousPullEnabled: false } - tags: tagsByResource['Microsoft.ContainerRegistry/registries'] + tags: tagsByResource['${identifier.registries}'] } output acrName string = acrName diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aks.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aks.bicep index bc823fd93..021434135 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aks.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aks.bicep @@ -25,7 +25,7 @@ param aksVersion string = 'default' @description('In addition to the CPU and memory metrics included in AKS by default, you can enable Container Insights for more comprehensive data on the overall performance and health of your cluster. Billing is based on data ingestion and retention settings.') param enableAzureMonitoring bool = false param location string -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() @@ -42,10 +42,10 @@ var obj_aciEnableOmsAgent = { } } -resource azureMonitoringWorkspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = if (enableAzureMonitoring) { +resource azureMonitoringWorkspace 'Microsoft.OperationalInsights/workspaces@${azure.apiVersionForInsightsWorkspaces}' = if (enableAzureMonitoring) { name: name_aciWorkspace location: location - tags: tagsByResource['Microsoft.OperationalInsights/workspaces'] + tags: tagsByResource['${identifier.workspaces}'] properties: { sku: { name: aciWorkspaceSku @@ -59,10 +59,10 @@ resource azureMonitoringWorkspace 'Microsoft.OperationalInsights/workspaces@2022 } } -resource aksCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' = { +resource aksCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' = { name: aksClusterName location: location - tags: tagsByResource['Microsoft.ContainerService/managedClusters'] + tags: tagsByResource['${identifier.managedClusters}'] properties: { kubernetesVersion: aksVersion dnsPrefix: '${aksClusterName}-dns' @@ -81,7 +81,7 @@ resource aksCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' = { availabilityZones: agentAvailabilityZones mode: 'System' osType: 'Linux' - tags: tagsByResource['Microsoft.ContainerService/managedClusters'] + tags: tagsByResource['${identifier.managedClusters}'] } ] addonProfiles: { diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aksPodIdentity.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aksPodIdentity.bicep index 09a711300..9b440d89f 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aksPodIdentity.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aksPodIdentity.bicep @@ -12,7 +12,7 @@ param location string var const_APIVersion = '2022-01-31-PREVIEW' -resource configAKSPodIdentity 'Microsoft.ContainerService/managedClusters@2023-08-01' = { +resource configAKSPodIdentity 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' = { name: aksClusterName location: location properties: { diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep index 6c6aff06b..beaa9cad8 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep @@ -20,7 +20,7 @@ param staticPrivateFrontentIP string = '10.0.0.1' @secure() param trustedRootCertData string = newGuid() param usePrivateIP bool = false -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() @@ -80,13 +80,13 @@ var obj_tagIngress = { 'managed-by-k8s-ingress': 'true' } -resource gatewayPublicIP 'Microsoft.Network/publicIPAddresses@2023-06-01' = { +resource gatewayPublicIP 'Microsoft.Network/publicIPAddresses@${azure.apiVersionForPublicIPAddresses}' = { name: gatewayPublicIPAddressName sku: { name: 'Standard' } location: location - tags: tagsByResource['Microsoft.Network/publicIPAddresses'] + tags: tagsByResource['${identifier.publicIPAddresses}'] properties: { publicIPAllocationMethod: 'Static' dnsSettings: { @@ -95,10 +95,10 @@ resource gatewayPublicIP 'Microsoft.Network/publicIPAddresses@2023-06-01' = { } } -resource wafv2AppGateway 'Microsoft.Network/applicationGateways@2023-06-01' = { +resource wafv2AppGateway 'Microsoft.Network/applicationGateways@${azure.apiVersionForApplicationGateways}' = { name: gatewayName location: location - tags: union(tagsByResource['Microsoft.Network/applicationGateways'], obj_tagIngress) + tags: union(tagsByResource['${identifier.applicationGateways}'], obj_tagIngress) properties: { sku: { name: 'WAF_v2' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_autoGeneratedPfxCertInKeyVault.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_autoGeneratedPfxCertInKeyVault.bicep index 6f139db35..c7f4022f2 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_autoGeneratedPfxCertInKeyVault.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_autoGeneratedPfxCertInKeyVault.bicep @@ -28,7 +28,7 @@ param sku string = 'Standard' @description('Subject name to create a new certificate, example: \'CN=contoso.com\'.') param subjectName string = 'contoso.xyz' -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() @@ -37,10 +37,10 @@ var obj_extraTag= { } var const_identityId = '${substring(string(identity.userAssignedIdentities), indexOf(string(identity.userAssignedIdentities), '"') + 1, lastIndexOf(string(identity.userAssignedIdentities), '"') - (indexOf(string(identity.userAssignedIdentities), '"') + 1))}' -resource keyvault 'Microsoft.KeyVault/vaults@2024-11-01' = { +resource keyvault 'Microsoft.KeyVault/vaults@${azure.apiVersionForKeyVault}' = { name: keyVaultName location: location - tags: union(tagsByResource['Microsoft.KeyVault/vaults'], obj_extraTag) + tags: union(tagsByResource['${identifier.vaults}'], obj_extraTag) properties: { sku: { family: 'A' @@ -63,15 +63,15 @@ resource keyvault 'Microsoft.KeyVault/vaults@2024-11-01' = { } } -resource createAddCertificate 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource createAddCertificate 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: 'ds-create-add-appgw-certificate-${_globalResourceNameSuffix}' location: location identity: identity kind: 'AzurePowerShell' - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { forceUpdateTag: utcValue - azPowerShellVersion: '11.5' + azPowerShellVersion: '${azure.powershell.version}' timeout: 'PT30M' arguments: ' -vaultName ${keyVaultName} -certificateName ${secretName} -subjectName ${subjectName}' scriptContent: '\n param(\n [string] [Parameter(Mandatory=$true)] $vaultName,\n [string] [Parameter(Mandatory=$true)] $certificateName,\n [string] [Parameter(Mandatory=$true)] $subjectName\n )\n\n $ErrorActionPreference = \'Stop\'\n $DeploymentScriptOutputs = @{}\n\n $existingCert = Get-AzKeyVaultCertificate -VaultName $vaultName -Name $certificateName\n\n if ($existingCert -and $existingCert.Certificate.Subject -eq $subjectName) {\n\n Write-Host \'Certificate $certificateName in vault $vaultName is already present.\'\n\n $DeploymentScriptOutputs[\'certThumbprint\'] = $existingCert.Thumbprint\n $existingCert | Out-String\n }\n else {\n $policy = New-AzKeyVaultCertificatePolicy -SubjectName $subjectName -IssuerName Self -ValidityInMonths 12 -Verbose\n\n # private key is added as a secret that can be retrieved in the ARM template\n Add-AzKeyVaultCertificate -VaultName $vaultName -Name $certificateName -CertificatePolicy $policy -Verbose\n\n $newCert = Get-AzKeyVaultCertificate -VaultName $vaultName -Name $certificateName\n\n # it takes a few seconds for KeyVault to finish\n $tries = 0\n do {\n Write-Host \'Waiting for certificate creation completion...\'\n Start-Sleep -Seconds 10\n $operation = Get-AzKeyVaultCertificateOperation -VaultName $vaultName -Name $certificateName\n $tries++\n\n if ($operation.Status -eq \'failed\')\n {\n throw \'Creating certificate $certificateName in vault $vaultName failed with error $($operation.ErrorMessage)\'\n }\n\n if ($tries -gt 120)\n {\n throw \'Timed out waiting for creation of certificate $certificateName in vault $vaultName\'\n }\n } while ($operation.Status -ne \'completed\')\n\n $DeploymentScriptOutputs[\'certThumbprint\'] = $newCert.Thumbprint\n $newCert | Out-String\n }\n ' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_dnsZones.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_dnsZones.bicep index bfd70b8b1..18f740809 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_dnsZones.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_dnsZones.bicep @@ -1,12 +1,12 @@ @description('Azure DNS Zone name.') param dnszoneName string -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object -resource dnszoneName_resource 'Microsoft.Network/dnszones@2023-07-01-preview' = { +resource dnszoneName_resource 'Microsoft.Network/dnszones@${azure.apiVersionForDNSZone}' = { name: dnszoneName location: 'global' - tags: tagsByResource['Microsoft.Network/dnszones'] + tags: tagsByResource['${identifier.dnszones}'] properties: { zoneType: 'Public' } diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_storage.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_storage.bicep index 3d36bd617..009b1a669 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_storage.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_storage.bicep @@ -4,7 +4,7 @@ param fileShareName string param location string param storageAccountName string = 'stg-contoso' -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() @@ -14,11 +14,11 @@ var obj_extraTag = { 'created-by-azure-weblogic': utcValue } -resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { +resource storageAccount 'Microsoft.Storage/storageAccounts@${azure.apiVersionForStorage}' = { name: storageAccountName location: location kind: 'StorageV2' - tags: union(tagsByResource['Microsoft.Storage/storageAccounts'], obj_extraTag) + tags: union(tagsByResource['${identifier.storageAccounts}'], obj_extraTag) sku: { name: const_sku tier: 'Standard' @@ -42,7 +42,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } } -resource fileService 'Microsoft.Storage/storageAccounts/fileServices/shares@2023-05-01' = { +resource fileService 'Microsoft.Storage/storageAccounts/fileServices/shares@${azure.apiVersionForStorageFileService}' = { name: '${storageAccount.name}/default/${fileShareName}' properties: { accessTier: 'TransactionOptimized' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_vnetAppGateway.bicep b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_vnetAppGateway.bicep index 2fbded7b4..2a5badc4e 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_vnetAppGateway.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_vnetAppGateway.bicep @@ -19,7 +19,7 @@ param vnetForApplicationGateway object = { } } } -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() @@ -30,22 +30,22 @@ var name_subnet = vnetForApplicationGateway.subnets.gatewaySubnet.name var name_vnet = vnetForApplicationGateway.name // Get existing VNET. -resource existingVnet 'Microsoft.Network/virtualNetworks@2023-06-01' existing = if (!const_newVnet) { +resource existingVnet 'Microsoft.Network/virtualNetworks@${azure.apiVersionForVirtualNetworks}' existing = if (!const_newVnet) { name: name_vnet scope: resourceGroup(vnetForApplicationGateway.resourceGroup) } // Get existing subnet. -resource existingSubnet 'Microsoft.Network/virtualNetworks/subnets@2023-06-01' existing = if (!const_newVnet) { +resource existingSubnet 'Microsoft.Network/virtualNetworks/subnets@${azure.apiVersionForVirtualNetworks}' existing = if (!const_newVnet) { name: name_subnet parent: existingVnet } // Create new network security group. -resource nsg 'Microsoft.Network/networkSecurityGroups@2023-06-01' = if (const_newVnet) { +resource nsg 'Microsoft.Network/networkSecurityGroups@${azure.apiVersionForNetworkSecurityGroups}' = if (const_newVnet) { name: nsgName location: location - tags: tagsByResource['Microsoft.Network/networkSecurityGroups'] + tags: tagsByResource['${identifier.networkSecurityGroups}'] properties: { securityRules: [ { @@ -82,10 +82,10 @@ resource nsg 'Microsoft.Network/networkSecurityGroups@2023-06-01' = if (const_ne } // Create new VNET and subnet. -resource newVnet 'Microsoft.Network/virtualNetworks@2023-06-01' = if (const_newVnet) { +resource newVnet 'Microsoft.Network/virtualNetworks@${azure.apiVersionForVirtualNetworks}' = if (const_newVnet) { name: name_vnet location: location - tags: tagsByResource['Microsoft.Network/virtualNetworks'] + tags: tagsByResource['${identifier.virtualNetworks}'] properties: { addressSpace: { addressPrefixes: const_vnetAddressPrefixes diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-networking.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-networking.bicep index 55204039a..901fe4f83 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-networking.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-networking.bicep @@ -35,7 +35,7 @@ param useInternalLB bool = false param utcValue string = utcNow() param wlsDomainName string = 'domain1' param wlsDomainUID string = 'sample-domain1' -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object var const_commonScript = 'common.sh' @@ -46,12 +46,12 @@ var const_scriptLocation = uri(_artifactsLocation, 'scripts/') var const_primaryScript = 'setupNetworking.sh' var const_utilityScript = 'utility.sh' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: 'ds-networking-deployment-${_globalResourceNameSuffix}' location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion environmentVariables: [ diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep index 384a26bd9..6c4d3eea5 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep @@ -31,7 +31,7 @@ param managedServerPrefix string = 'managed-server' param ocrSSOPSW string param ocrSSOUser string param storageAccountName string = 'null' -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param t3ChannelAdminPort int = 7005 param t3ChannelClusterPort int = 8011 @@ -83,12 +83,12 @@ var const_setUpDomainScript = 'setupWLSDomain.sh' var const_updateDomainConfigScript= 'updateDomainConfig.sh' var const_utilityScript= 'utility.sh' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: 'ds-wls-cluster-creation-${_globalResourceNameSuffix}' location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion environmentVariables: [ @@ -174,7 +174,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { } { name: 'TAG_VM' - value: string(tagsByResource['Microsoft.Compute/virtualMachines']) + value: string(tagsByResource['${identifier.virtualMachines}']) } { name: 'URL_3RD_DATASOURCE' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep index ccaaca56d..19d5678d3 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep @@ -22,7 +22,7 @@ param enablePswlessConnection bool = false param identity object = {} param jdbcDataSourceName string param location string -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() param wlsDomainUID string = 'sample-domain1' @@ -38,12 +38,12 @@ var const_dbUtilityScript='dbUtility.sh' var const_scriptLocation = uri(_artifactsLocation, 'scripts/') var const_utilityScript= 'utility.sh' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: 'ds-wls-db-connection-${_globalResourceNameSuffix}' location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion environmentVariables: [ diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-output-domain-configurations.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-output-domain-configurations.bicep index 0aa9907ce..d86fc1353 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-output-domain-configurations.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-output-domain-configurations.bicep @@ -7,7 +7,7 @@ param aksClusterName string = '' param azCliVersion string = '' param identity object = {} param location string -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() param wlsClusterName string = 'cluster-1' @@ -18,12 +18,12 @@ var base64_common = loadFileAsBase64('../../../arm/scripts/common.sh') var base64_queryDomainConfigurations = loadFileAsBase64('../../../arm/scripts/inline-scripts/queryDomainConfigurations.sh') var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh') -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: 'ds-query-wls-configurations-${_globalResourceNameSuffix}' location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion environmentVariables: [ diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep index 1e6ef13dd..c3e6b5f37 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep @@ -11,7 +11,7 @@ param aksClusterName string = '' param azCliVersion string = '' param identity object = {} param location string -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() param wlsDomainUID string = 'sample-domain1' @@ -27,12 +27,12 @@ var const_utilityScript= 'utility.sh' var const_commonScript= 'common.sh' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: 'ds-wls-validate-applications-${_globalResourceNameSuffix}' location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion environmentVariables: [ diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep index 60527b7c2..c865a2e6a 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep @@ -42,7 +42,7 @@ param sslUploadedCustomTrustKeyStoreType string param sslUploadedPrivateKeyAlias string @secure() param sslUploadedPrivateKeyPassPhrase string -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param useAksWellTestedVersion bool = true param userProvidedAcr string @@ -61,12 +61,12 @@ var const_arguments = '${location} ${createAKSCluster} ${aksAgentPoolVMSize} ${a var const_checkDNSZone = enableDNSConfiguration && !createDNSZone var const_deploymentName = 'ds-validate-parameters-and-fail-fast-${_globalResourceNameSuffix}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion arguments: const_arguments diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_hpa.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_hpa.bicep index f54078507..ec3571b0f 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_hpa.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_hpa.bicep @@ -12,7 +12,7 @@ param azCliVersion string param hpaScaleType string = 'cpu' param identity object = {} param location string -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() param utilizationPercentage int @@ -25,12 +25,12 @@ var base64_enableHpa = loadFileAsBase64('../../../arm/scripts/inline-scripts/ena var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh') var const_deploymentName='ds-enable-hpa-${_globalResourceNameSuffix}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion scriptContent: format('{0}\r\n\r\n{1}\r\n\r\n{2}',base64ToString(base64_common), base64ToString(base64_utility), base64ToString(base64_enableHpa)) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep index 304420d26..3be6c611a 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep @@ -9,7 +9,7 @@ param azCliVersion string param identity object = {} param kedaUamiName string param location string -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() param wlsClusterSize int @@ -28,12 +28,12 @@ var const_deploymentName = 'ds-enable-promethues-metrics-${_globalResourceNameSu var const_kedaNamespace= 'keda' var const_kedaSa= 'keda-operator' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion scriptContent: format('{0}\r\n\r\n{1}\r\n\r\n{2}', base64ToString(base64_common), base64ToString(base64_utility), base64ToString(base64_enableHpa)) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_ensure_available_agic.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_ensure_available_agic.bicep index 8a84a0818..e42042a66 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_ensure_available_agic.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_ensure_available_agic.bicep @@ -15,7 +15,7 @@ var base64_enableAgic = loadFileAsBase64('../../../arm/scripts/inline-scripts/en var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh') var const_deploymentName='ds-validate-agic-${uniqueString(utcValue)}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: const_deploymentName location: location kind: 'AzureCLI' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_install_agic.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_install_agic.bicep index a8ff819b5..fc355f699 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_install_agic.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_install_agic.bicep @@ -8,7 +8,7 @@ param appgwName string = 'appgw-contoso' param azCliVersion string = '' param identity object = {} param location string -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() @@ -18,12 +18,12 @@ var base64_enableAgic = loadFileAsBase64('../../../arm/scripts/inline-scripts/en var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh') var const_deploymentName='ds-install-agic-${_globalResourceNameSuffix}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion scriptContent: format('{0}\r\n\r\n{1}\r\n\r\n{2}',base64ToString(base64_common), base64ToString(base64_utility), base64ToString(base64_enableAgic)) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_query_available_private_ip_from_subnet.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_query_available_private_ip_from_subnet.bicep index ff01f9a8f..ea3ad9025 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_query_available_private_ip_from_subnet.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_query_available_private_ip_from_subnet.bicep @@ -7,7 +7,7 @@ param knownIP string = '10.0.0.1' param identity object = {} param location string -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() @@ -16,12 +16,12 @@ var base64_common = loadFileAsBase64('../../../arm/scripts/common.sh') var base64_queryPrivateIPForAppGateway = loadFileAsBase64('../../../arm/scripts/inline-scripts/queryPrivateIPForAppGateway.sh') var const_deploymentName = 'ds-query-private-ip-${uniqueString(utcValue)}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion scriptContent: format('{0}\r\n\r\n{1}', base64ToString(base64_common), base64ToString(base64_queryPrivateIPForAppGateway)) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_update-applications.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_update-applications.bicep index f8dd606db..8f0623b14 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_update-applications.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_update-applications.bicep @@ -35,7 +35,7 @@ var const_scriptLocation = uri(_artifactsLocation, 'scripts/') var const_updateAppScript= 'updateApplications.sh' var const_utilityScript= 'utility.sh' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: 'ds-wls-update-applications-${uniqueString(utcValue)}' location: location kind: 'AzureCLI' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_validate_agic.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_validate_agic.bicep index 66942fe07..437ac0128 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_validate_agic.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_validate_agic.bicep @@ -7,7 +7,7 @@ param aksClusterRGName string param azCliVersion string = '' param identity object = {} param location string -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() @@ -17,12 +17,12 @@ var base64_enableAgic = loadFileAsBase64('../../../arm/scripts/inline-scripts/va var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh') var const_deploymentName='ds-validate-agic-${_globalResourceNameSuffix}' -resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = { +resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = { name: const_deploymentName location: location kind: 'AzureCLI' identity: identity - tags: tagsByResource['Microsoft.Resources/deploymentScripts'] + tags: tagsByResource['${identifier.deploymentScripts}'] properties: { azCliVersion: azCliVersion scriptContent: format('{0}\r\n\r\n{1}\r\n\r\n{2}',base64ToString(base64_common), base64ToString(base64_utility), base64ToString(base64_enableAgic)) diff --git a/weblogic-azure-aks/src/main/bicep/modules/_enableAutoScaling.bicep b/weblogic-azure-aks/src/main/bicep/modules/_enableAutoScaling.bicep index 057444d33..59d78778a 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_enableAutoScaling.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_enableAutoScaling.bicep @@ -21,7 +21,7 @@ param azCliVersion string param hpaScaleType string = 'cpu' param identity object = {} param location string -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param useHpa bool param utilizationPercentage int diff --git a/weblogic-azure-aks/src/main/bicep/modules/_enablePromethuesKeda.bicep b/weblogic-azure-aks/src/main/bicep/modules/_enablePromethuesKeda.bicep index e2173e591..fc5aa1a2e 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_enablePromethuesKeda.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_enablePromethuesKeda.bicep @@ -8,7 +8,7 @@ param aksClusterRGName string param azCliVersion string param identity object = {} param location string -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() param wlsClusterSize int @@ -24,32 +24,32 @@ var name_azureMonitorAccountName = 'ama${_globalResourceNameSuffix}' var name_kedaUserDefinedManagedIdentity = 'kedauami${_globalResourceNameSuffix}' var name_kedaMonitorDataReaderRoleAssignmentName = guid('${resourceGroup().id}${name_kedaUserDefinedManagedIdentity}${_globalResourceNameSuffix}') -resource monitorAccount 'Microsoft.Monitor/accounts@2023-04-03' = { +resource monitorAccount 'Microsoft.Monitor/accounts@${azure.apiVersionForMonitorAccount}' = { name: name_azureMonitorAccountName location: location properties: {} - tags: tagsByResource['Microsoft.Monitor/accounts'] + tags: tagsByResource['${identifier.accounts}'] } // UAMI for KEDA -resource uamiForKeda 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { +resource uamiForKeda 'Microsoft.ManagedIdentity/userAssignedIdentities@${azure.apiVersionForIdentity}' = { name: name_kedaUserDefinedManagedIdentity location: location - tags: tagsByResource['Microsoft.ManagedIdentity/userAssignedIdentities'] + tags: tagsByResource['${identifier.userAssignedIdentities}'] } // Get role resource id -resource monitorDataReaderResourceDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = { +resource monitorDataReaderResourceDefinition 'Microsoft.Authorization/roleDefinitions@${azure.apiVersionForRoleDefinitions}' existing = { name: const_roleDefinitionIdOfMonitorDataReader } // Assign Monitor Data Reader role we need the permission to read data. -resource kedaUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { +resource kedaUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { name: name_kedaMonitorDataReaderRoleAssignmentName scope: monitorAccount properties: { description: 'Assign Monitor Data Reader role role to KEDA Identity ' - principalId: reference(uamiForKeda.id, '2023-01-31', 'full').properties.principalId + principalId: reference(uamiForKeda.id, '${azure.apiVersionForIdentity}', 'full').properties.principalId principalType: 'ServicePrincipal' roleDefinitionId: monitorDataReaderResourceDefinition.id } diff --git a/weblogic-azure-aks/src/main/bicep/modules/_globalUamiAndRoles.bicep b/weblogic-azure-aks/src/main/bicep/modules/_globalUamiAndRoles.bicep index 9bf5fdea1..e5acfe269 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_globalUamiAndRoles.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_globalUamiAndRoles.bicep @@ -5,7 +5,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or param _globalResourceNameSuffix string param location string -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param name_deploymentScriptContributorRoleAssignmentName string = newGuid() @@ -14,10 +14,10 @@ var const_roleDefinitionIdOfContributor = 'b24988ac-6180-42a0-ab88-20f7382dd24c' var name_deploymentScriptUserDefinedManagedIdentity = 'wls-aks-deployment-script-user-defined-managed-itentity-${_globalResourceNameSuffix}' // UAMI for deployment script -resource uamiForDeploymentScript 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { +resource uamiForDeploymentScript 'Microsoft.ManagedIdentity/userAssignedIdentities@${azure.apiVersionForIdentity}' = { name: name_deploymentScriptUserDefinedManagedIdentity location: location - tags: tagsByResource['Microsoft.ManagedIdentity/userAssignedIdentities'] + tags: tagsByResource['${identifier.userAssignedIdentities}'] } // Assign Contributor role in subscription scope, we need the permission to get/update resource cross resource group. diff --git a/weblogic-azure-aks/src/main/bicep/modules/_preDeployedAzureResources.bicep b/weblogic-azure-aks/src/main/bicep/modules/_preDeployedAzureResources.bicep index 7f46a87bb..0790d55a1 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_preDeployedAzureResources.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_preDeployedAzureResources.bicep @@ -6,7 +6,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or param acrName string = 'acr-contoso' param acrResourceGroupName string = 'acr-contoso-rg' param createNewAcr bool = false -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param location string diff --git a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicNetworkContributor.bicep b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicNetworkContributor.bicep index 1f8666c37..e2bc8bed0 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicNetworkContributor.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicNetworkContributor.bicep @@ -12,12 +12,12 @@ var name_appGwContributorRoleAssignmentName = guid('${resourceGroup().id}${uniqu // https://docs.microsoft.com/en-us/azure/role-based-access-control/built-in-roles var const_roleDefinitionIdOfVnetContributor = '4d97b98b-1d4f-4787-a291-c67834d212e7' -resource aksCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' existing = { +resource aksCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' existing = { name: aksClusterName scope: resourceGroup(aksClusterRGName) } -resource agicUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { +resource agicUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { name: name_appGwContributorRoleAssignmentName properties: { description: 'Assign Network Contributor role to AGIC Identity ' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicRoleAssignment.bicep b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicRoleAssignment.bicep index 5b8fa06a6..85f56df12 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicRoleAssignment.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_agicRoleAssignment.bicep @@ -12,12 +12,12 @@ var name_appGwContributorRoleAssignmentName = guid('${resourceGroup().id}${uniqu // https://docs.microsoft.com/en-us/azure/role-based-access-control/built-in-roles var const_roleDefinitionIdOfContributor = 'b24988ac-6180-42a0-ab88-20f7382dd24c' -resource aksCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' existing = { +resource aksCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' existing = { name: aksClusterName scope: resourceGroup(aksClusterRGName) } -resource agicUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { +resource agicUamiRoleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { name: name_appGwContributorRoleAssignmentName properties: { description: 'Assign Resource Group Contributor role to User Assigned Managed Identity ' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_aksClusterMioRoleOverDbIdentity.bicep b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_aksClusterMioRoleOverDbIdentity.bicep index 5aaad7ff0..514d47094 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_aksClusterMioRoleOverDbIdentity.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_aksClusterMioRoleOverDbIdentity.bicep @@ -10,17 +10,17 @@ param dbIdentityName string = '' var const_roleDefinitionIdOfManagedIdentityOperator = 'f1a07417-d97a-45cb-824c-7a7467783830' var name_roleAssignmentName = guid('${subscription().id}${clusterIdentityPrincipalId}Role assignment in resource scope') -resource dbIdentityResource 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' existing = { +resource dbIdentityResource 'Microsoft.ManagedIdentity/userAssignedIdentities@${azure.apiVersionForIdentity}' existing = { name: dbIdentityName } // Get role resource id -resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = { +resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@${azure.apiVersionForRoleDefinitions}' existing = { name: const_roleDefinitionIdOfManagedIdentityOperator } // Assign role -resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { +resource roleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { name: name_roleAssignmentName scope: dbIdentityResource properties: { diff --git a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinRgScope.bicep b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinRgScope.bicep index ec44876f3..f5b50c20d 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinRgScope.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinRgScope.bicep @@ -25,12 +25,12 @@ var const_identityAPIVersion = '2022-01-31-PREVIEW' var name_roleAssignmentName = guid('${subscription().id}${_globalResourceNameSuffix}Role assignment in resource group scope') // Get role resource id -resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = { +resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@${azure.apiVersionForRoleDefinitions}' existing = { name: roleDefinitionId } // Assign role -resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { +resource roleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { name: name_roleAssignmentName properties: { description: 'Assign resource group scope role to User Assigned Managed Identity ' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinSubscription.bicep b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinSubscription.bicep index c886338c6..9c27fb507 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinSubscription.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinSubscription.bicep @@ -25,12 +25,12 @@ param principalId string = '' var name_roleAssignmentName = guid('${subscription().id}${principalId}Role assignment in subscription scope') // Get role resource id in subscription -resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = { +resource roleResourceDefinition 'Microsoft.Authorization/roleDefinitions@${azure.apiVersionForRoleDefinitions}' existing = { name: roleDefinitionId } // Assign role -resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = { +resource roleAssignment 'Microsoft.Authorization/roleAssignments@${azure.apiVersionForRoleAssignment}' = { name: name_roleAssignmentName properties: { description: 'Assign subscription scope role to User Assigned Managed Identity ' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_setupDBConnection.bicep b/weblogic-azure-aks/src/main/bicep/modules/_setupDBConnection.bicep index a0c00030a..fb2a44eed 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_setupDBConnection.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_setupDBConnection.bicep @@ -41,7 +41,7 @@ param identity object = {} @description('JNDI Name for JDBC Datasource') param jdbcDataSourceName string = 'jdbc/contoso' param location string -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object @description('UID of WebLogic domain, used in WebLogic Operator.') param wlsDomainUID string = 'sample-domain1' diff --git a/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep b/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep index d40bedcf0..a431ba321 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep @@ -35,7 +35,7 @@ param identity object = {} @description('JNDI Name for JDBC Datasource') param jdbcDataSourceName string = 'jdbc/contoso' param location string -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param utcValue string = utcNow() @description('UID of WebLogic domain, used in WebLogic Operator.') @@ -87,7 +87,7 @@ module dbIdentityVMContributorRoleAssignment '_rolesAssignment/_roleAssignmentin } } -resource existingAKSCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' existing = { +resource existingAKSCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' existing = { name: aksClusterName scope: resourceGroup(aksClusterRGName) } diff --git a/weblogic-azure-aks/src/main/bicep/modules/networking.bicep b/weblogic-azure-aks/src/main/bicep/modules/networking.bicep index 043a6ac06..47374ba3f 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/networking.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/networking.bicep @@ -49,7 +49,7 @@ param location string param lbSvcValues array = [] param newOrExistingVnetForApplicationGateway string param vnetRGNameForApplicationGateway string -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object @description('True to set up internal load balancer service.') param useInternalLB bool = false diff --git a/weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep b/weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep index e5dc6330c..4a91bbfc7 100644 --- a/weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep +++ b/weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep @@ -84,7 +84,7 @@ param ocrSSOUser string param storageAccountName string = 'stg-contoso' param t3ChannelAdminPort int = 7005 param t3ChannelClusterPort int = 8011 -@description('Tags for the resources') +@description('${label.tagsLabel}') param tagsByResource object param userProvidedAcr string = 'null' param userProvidedAcrRgName string = 'null' @@ -149,7 +149,7 @@ module pidSSLStart './_pids/_pid.bicep' = if (enableCustomSSL) { } } -resource existingAKSCluster 'Microsoft.ContainerService/managedClusters@2023-08-01' existing = if (!createAKSCluster) { +resource existingAKSCluster 'Microsoft.ContainerService/managedClusters@${azure.apiVersionForManagedClusters}' existing = if (!createAKSCluster) { name: aksClusterName scope: resourceGroup(aksClusterRGName) } From affa112f1c8447f9995e3494c21f7b13028e8121 Mon Sep 17 00:00:00 2001 From: gnsuryan Date: Wed, 4 Jun 2025 17:33:34 +0000 Subject: [PATCH 4/4] update wls-on-aks-azure-marketplace version for 14.1.2 upgrade --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b6975ec18..70ef52d3b 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ - 1.0.89 + 1.0.90 1.0.31 1.0.56