Merge pull request #92 from WASdev/apiVersion_91

Update apiVersions
WASdev · Oct 27, 2023 · f38b7f8 · f38b7f8
2 parents d04ea2f + c897da1
commit f38b7f8
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 26 deletions.
diff --git a/pom.xml b/pom.xml
@@ -21,14 +21,14 @@
 
     <groupId>com.ibm.websphere.azure</groupId>
     <artifactId>azure.liberty.aks</artifactId>
-    <version>1.0.36</version>
+    <version>1.0.37</version>
 
     <!-- mvn -Pbicep -Passembly clean install -Ptemplate-validation-tests -->
 
     <parent>
         <groupId>com.microsoft.azure.iaas</groupId>
         <artifactId>azure-javaee-iaas-parent</artifactId>
-        <version>1.0.18</version>
+        <version>1.0.19</version>
         <relativePath></relativePath>
     </parent>
 

diff --git a/src/main/bicep/mainTemplate.bicep b/src/main/bicep/mainTemplate.bicep
@@ -263,7 +263,7 @@ module preflightDsDeployment 'modules/_deployment-scripts/_ds-preflight.bicep' =
   ]
 }
 
-resource acrDeployment 'Microsoft.ContainerRegistry/registries@2021-09-01' = if (createACR) {
+resource acrDeployment 'Microsoft.ContainerRegistry/registries@2022-12-01' = if (createACR) {
   name: name_acrName
   location: location
   sku: {
@@ -278,13 +278,13 @@ resource acrDeployment 'Microsoft.ContainerRegistry/registries@2021-09-01' = if
 }
 
 // Get existing VNET
-resource existingVnet 'Microsoft.Network/virtualNetworks@2021-08-01' existing = if (enableAppGWIngress && !const_newVnet) {
+resource existingVnet 'Microsoft.Network/virtualNetworks@2023-04-01' existing = if (enableAppGWIngress && !const_newVnet) {
   name: name_vnet
   scope: resourceGroup(vnetForApplicationGateway.resourceGroup)
 }
 
 // Get existing subnet
-resource existingSubnet 'Microsoft.Network/virtualNetworks/subnets@2021-08-01' existing = if (enableAppGWIngress && !const_newVnet) {
+resource existingSubnet 'Microsoft.Network/virtualNetworks/subnets@2023-04-01' existing = if (enableAppGWIngress && !const_newVnet) {
   name: name_subnet
   parent: existingVnet
 }
@@ -304,7 +304,7 @@ module vnetForAppgatewayDeployment 'modules/_azure-resoruces/_vnetAppGateway.bic
   ]
 }
 
-resource clusterDeployment 'Microsoft.ContainerService/managedClusters@2022-09-01' = if (createCluster) {
+resource clusterDeployment 'Microsoft.ContainerService/managedClusters@2023-07-01' = if (createCluster) {
   name: name_clusterName
   location: location
   properties: {
@@ -379,7 +379,7 @@ module appgwSecretDeployment 'modules/_azure-resoruces/_keyvaultForGateway.bicep
 }
 
 // get key vault object in a resource group
-resource existingKeyvault 'Microsoft.KeyVault/vaults@2021-10-01' existing = if (enableAppGWIngress) {
+resource existingKeyvault 'Microsoft.KeyVault/vaults@2022-07-01' existing = if (enableAppGWIngress) {
   name: (!enableAppGWIngress || appGatewayCertificateOption == const_appGatewaySSLCertOptionHaveKeyVault) ? keyVaultName : appgwSecretDeployment.outputs.keyVaultName
   scope: resourceGroup(appGatewayCertificateOption == const_appGatewaySSLCertOptionHaveKeyVault ? keyVaultResourceGroup : resourceGroup().name)
 }

diff --git a/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep b/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep
@@ -71,7 +71,7 @@ var obj_frontendIPConfigurations2 = [
   }
 ]
 
-resource gatewayPublicIP 'Microsoft.Network/publicIPAddresses@2022-07-01' = {
+resource gatewayPublicIP 'Microsoft.Network/publicIPAddresses@2023-04-01' = {
   name: gatewayPublicIPAddressName
   sku: {
     name: 'Standard'
@@ -85,7 +85,7 @@ resource gatewayPublicIP 'Microsoft.Network/publicIPAddresses@2022-07-01' = {
   }
 }
 
-resource wafv2AppGateway 'Microsoft.Network/applicationGateways@2022-07-01' = {
+resource wafv2AppGateway 'Microsoft.Network/applicationGateways@2023-04-01' = {
   name: name_appGateway
   location: location
   tags: {

diff --git a/src/main/bicep/modules/_azure-resoruces/_keyvault/_keyvaultWithExistingCert.bicep b/src/main/bicep/modules/_azure-resoruces/_keyvault/_keyvaultWithExistingCert.bicep
@@ -42,7 +42,7 @@ param sku string = 'Standard'
 
 param utcValue string = utcNow()
 
-resource keyvault 'Microsoft.KeyVault/vaults@2021-10-01' = {
+resource keyvault 'Microsoft.KeyVault/vaults@2022-07-01' = {
   name: keyVaultName
   location: location
   properties: {
@@ -59,7 +59,7 @@ resource keyvault 'Microsoft.KeyVault/vaults@2021-10-01' = {
   }
 }
 
-resource secretForCertificate 'Microsoft.KeyVault/vaults/secrets@2021-10-01' = {
+resource secretForCertificate 'Microsoft.KeyVault/vaults/secrets@2022-07-01' = {
   name: format('{0}/{1}', keyVaultName, certificateDataName)
   properties: {
     value: certificateDataValue
@@ -69,7 +69,7 @@ resource secretForCertificate 'Microsoft.KeyVault/vaults/secrets@2021-10-01' = {
   ]
 }
 
-resource secretForCertPassword 'Microsoft.KeyVault/vaults/secrets@2021-10-01' = {
+resource secretForCertPassword 'Microsoft.KeyVault/vaults/secrets@2022-07-01' = {
   name: format('{0}/{1}', keyVaultName, certificatePswSecretName)
   properties: {
     value: certificatePasswordValue

diff --git a/src/main/bicep/modules/_azure-resoruces/_keyvault/_keyvaultWithNewCert.bicep b/src/main/bicep/modules/_azure-resoruces/_keyvault/_keyvaultWithNewCert.bicep
@@ -45,7 +45,7 @@ param utcValue string = utcNow()
 
 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@2021-10-01' = {
+resource keyvault 'Microsoft.KeyVault/vaults@2022-07-01' = {
   name: keyVaultName
   location: location
   properties: {
@@ -57,7 +57,7 @@ resource keyvault 'Microsoft.KeyVault/vaults@2021-10-01' = {
     accessPolicies: [
       {
         // Must specify API version of identity.
-        objectId: reference(const_identityId, '2018-11-30').principalId
+        objectId: reference(const_identityId, '2023-01-31').principalId
         tenantId: subscription().tenantId
         permissions: permission
       }
@@ -72,7 +72,7 @@ resource keyvault 'Microsoft.KeyVault/vaults@2021-10-01' = {
   }
 }
 
-resource createAddCertificate 'Microsoft.Resources/deploymentScripts@2020-10-01' = {
+resource createAddCertificate 'Microsoft.Resources/deploymentScripts@2023-08-01' = {
   name: 'ds-create-add-appgw-certificate'
   location: location
   identity: identity

diff --git a/src/main/bicep/modules/_azure-resoruces/_vnetAppGateway.bicep b/src/main/bicep/modules/_azure-resoruces/_vnetAppGateway.bicep
@@ -46,7 +46,7 @@ var name_subnet = vnetForApplicationGateway.subnets.gatewaySubnet.name
 var name_vnet = vnetForApplicationGateway.name
 
 // Create new network security group.
-resource nsg 'Microsoft.Network/networkSecurityGroups@2021-08-01' = if (const_newVnet) {
+resource nsg 'Microsoft.Network/networkSecurityGroups@2023-04-01' = if (const_newVnet) {
   name: name_nsg
   location: location
   properties: {
@@ -85,7 +85,7 @@ resource nsg 'Microsoft.Network/networkSecurityGroups@2021-08-01' = if (const_ne
 }
 
 // Create new VNET and subnet.
-resource newVnet 'Microsoft.Network/virtualNetworks@2021-08-01' = if (const_newVnet) {
+resource newVnet 'Microsoft.Network/virtualNetworks@2023-04-01' = if (const_newVnet) {
   name: name_vnet
   location: location
   properties: {

diff --git a/src/main/bicep/modules/_deployment-scripts/_ds-networking.bicep b/src/main/bicep/modules/_deployment-scripts/_ds-networking.bicep
@@ -45,7 +45,7 @@ param utcValue string = utcNow()
 
 var const_scriptLocation = uri(_artifactsLocation, 'scripts/')
 
-resource deploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' = {
+resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = {
   name: 'ds-networking-deployment'
   location: location
   kind: 'AzureCLI'

diff --git a/src/main/bicep/modules/_deployment-scripts/_ds-preflight.bicep b/src/main/bicep/modules/_deployment-scripts/_ds-preflight.bicep
@@ -40,7 +40,7 @@ param utcValue string = utcNow()
 
 var const_scriptLocation = uri(_artifactsLocation, 'scripts/')
 
-resource deploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' = {
+resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = {
   name: name
   location: location
   kind: 'AzureCLI'

diff --git a/src/main/bicep/modules/_deployment-scripts/_ds-primary.bicep b/src/main/bicep/modules/_deployment-scripts/_ds-primary.bicep
@@ -36,7 +36,7 @@ param utcValue string = utcNow()
 
 var const_scriptLocation = uri(_artifactsLocation, 'scripts/')
 
-resource deploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' = {
+resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = {
   name: name
   location: location
   kind: 'AzureCLI'

diff --git a/src/main/bicep/modules/_deployment-scripts/_ds_enable_agic.bicep b/src/main/bicep/modules/_deployment-scripts/_ds_enable_agic.bicep
@@ -27,7 +27,7 @@ param utcValue string = utcNow()
 
 var const_scriptLocation = uri(_artifactsLocation, 'scripts/')
 
-resource deploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' = {
+resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = {
   name: 'ds-enable-agic'
   location: location
   kind: 'AzureCLI'

diff --git a/src/main/bicep/modules/_deployment-scripts/_ds_query_available_private_ip_from_subnet.bicep b/src/main/bicep/modules/_deployment-scripts/_ds_query_available_private_ip_from_subnet.bicep
@@ -30,7 +30,7 @@ var const_azcliVersion='2.15.0'
 var const_deploymentName='ds-query-private-ip'
 var const_scriptLocation = uri(_artifactsLocation, 'scripts/')
 
-resource deploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' = {
+resource deploymentScript 'Microsoft.Resources/deploymentScripts@2023-08-01' = {
   name: const_deploymentName
   location: location
   kind: 'AzureCLI'

diff --git a/src/main/bicep/modules/_rolesAssignment/_acrPullRoleAssignment.bicep b/src/main/bicep/modules/_rolesAssignment/_acrPullRoleAssignment.bicep
@@ -24,12 +24,12 @@ var const_APIVersion = '2020-12-01'
 // https://docs.microsoft.com/en-us/azure/role-based-access-control/built-in-roles
 var const_roleDefinitionIdOfAcrPull = '7f951dda-4ed3-4680-a7ca-43fe172d538d'
 
-resource aksCluster 'Microsoft.ContainerService/managedClusters@2021-02-01' existing = {
+resource aksCluster 'Microsoft.ContainerService/managedClusters@2023-07-01' existing = {
   name: aksClusterName
   scope: resourceGroup(aksClusterRGName)
 }
 
-resource acr 'Microsoft.ContainerRegistry/registries@2021-09-01' existing = {
+resource acr 'Microsoft.ContainerRegistry/registries@2022-12-01' existing = {
   name: acrName
   scope: resourceGroup(acrRGName)
 }

diff --git a/src/main/bicep/modules/_rolesAssignment/_agicRoleAssignment.bicep b/src/main/bicep/modules/_rolesAssignment/_agicRoleAssignment.bicep
@@ -24,7 +24,7 @@ var name_appGwContributorRoleAssignmentName = guid('${resourceGroup().id}${utcVa
 // 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@2021-02-01' existing = {
+resource aksCluster 'Microsoft.ContainerService/managedClusters@2023-07-01' existing = {
   name: aksClusterName
   scope: resourceGroup(aksClusterRGName)
 }

diff --git a/src/main/bicep/modules/_uamiAndRoles.bicep b/src/main/bicep/modules/_uamiAndRoles.bicep
@@ -23,7 +23,7 @@ var name_deploymentScriptUserDefinedManagedIdentity = 'ol-aks-deployment-script-
 var name_deploymentScriptContributorRoleAssignmentName = guid('${resourceGroup().id}${name_deploymentScriptUserDefinedManagedIdentity}Deployment Script')
 
 // UAMI for deployment script
-resource uamiForDeploymentScript 'Microsoft.ManagedIdentity/userAssignedIdentities@2021-09-30-preview' = {
+resource uamiForDeploymentScript 'Microsoft.ManagedIdentity/userAssignedIdentities@2022-01-31-preview' = {
   name: name_deploymentScriptUserDefinedManagedIdentity
   location: location
 }