Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/azure-common.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ azure.apiVersionForRoleDefinitions=2022-04-01
# Microsoft.ContainerRegistry/registries
azure.apiVersionForContainerRegistries=2023-07-01
# Microsoft.ContainerService/managedClusters
azure.apiVersionForManagedClusters=2023-08-01
azure.apiVersionForManagedClusters=2023-10-01
# Microsoft.Compute/availabilitySets
azure.apiVersionForAvailabilitySets=2024-11-01
# Microsoft.Compute/virtualMachines
Expand Down
2 changes: 2 additions & 0 deletions weblogic-azure-aks/src/main/bicep/mainTemplate.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,10 @@ param appGatewayCertificateOption string = 'haveCert'
@description('Public IP Name for the Application Gateway')
param appGatewayPublicIPAddressName string = 'gwip'
@description('The one-line, base64 string of the backend SSL root certificate data.')
@secure()
param appGatewaySSLBackendRootCertData string = newGuid()
@description('The one-line, base64 string of the SSL certificate data.')
@secure()
param appGatewaySSLCertData string = newGuid()
@secure()
@description('The value of the password for the SSL Certificate')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ param sslCertificateDeploymentName string
@secure()
param sslCertPswData string
param trustedRootCertificateDeploymentName string
@secure()
param vnetForApplicationGateway object
param vnetRGNameForApplicationGateway string
@description('${label.tagsLabel}')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ param vnetForApplicationGateway object = {
}
@description('${label.tagsLabel}')
param tagsByResource object
param utcValue string = utcNow()

var const_subnetAddressPrefixes = vnetForApplicationGateway.subnets.gatewaySubnet.addressPrefix
var const_vnetAddressPrefixes = vnetForApplicationGateway.addressPrefixes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ param aksClusterRGName string
param aksClusterName string
param aksVersion string = 'default'
param appGatewayCertificateOption string
@secure()
param appGatewaySSLCertData string
@secure()
param appGatewaySSLCertPassword string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ module configDataSource '_deployment-scripts/_ds-datasource-connection.bicep' =
dbConfigurationType: dbConfigurationType
dbGlobalTranPro: dbGlobalTranPro
dbUser: dbUser
dsConnectionURL: format('{0}{4}{1}{5}{2}={3}', const_connectionString, name_jdbcPlugins[databaseType], array_msiClientId[databaseType], reference(items(dbIdentity.userAssignedIdentities)[0].key, const_identityAPIVersion, 'full').properties.clientId, array_urlJoiner[databaseType], array_paramJoiner[databaseType])
dsConnectionURL: uri(uri(const_connectionString, '${array_urlJoiner[databaseType]}${name_jdbcPlugins[databaseType]}'), '${array_paramJoiner[databaseType]}${array_msiClientId[databaseType]}=${reference(items(dbIdentity.userAssignedIdentities)[0].key, const_identityAPIVersion, 'full').properties.clientId}')
enablePswlessConnection: true
identity: identity
jdbcDataSourceName: jdbcDataSourceName
Expand Down