Edburns/em 6908 accommodate aks nodepool naming changes (#346)

* Update node pool name to 'nodepool1' and adjust related parameters in Bicep templates

* Update version.wls-on-aks-azure-marketplace to 1.0.88 in pom.xml

* Fix string comparison in build_docker_image function for AKS node pool name

* fix utility.sh: line 109: [: 1: unary operator expected

* fix utility.sh: line 109: [: 1: unary operator expected

---------

Co-authored-by: haiche_microsoft <[email protected]>

Author: edburns

pom.xml

@@ -40,7 +40,7 @@
     <properties>    
         <!--  versions  start -->
         <!--  weblogic azure aks versions  -->
-        <version.wls-on-aks-azure-marketplace>1.0.87</version.wls-on-aks-azure-marketplace>
+        <version.wls-on-aks-azure-marketplace>1.0.88</version.wls-on-aks-azure-marketplace>
         <!--  weblogic azure vm versions  -->
         <version.arm-oraclelinux-wls>1.0.31</version.arm-oraclelinux-wls>
         <version.arm-oraclelinux-wls-admin>1.0.56</version.arm-oraclelinux-wls-admin>

weblogic-azure-aks/src/main/arm/scripts/createVMAndBuildImage.sh

@@ -106,7 +106,7 @@ function build_docker_image() {
     # query AKS vm size
     # use the same VM size to create the Ubuntu machine, make sure the architecture is matched.
     local vmSize=$(az aks show --name ${AKS_CLUSTER_NAME} --resource-group ${AKS_CLUSTER_RESOURCEGROUP_NAME} \
-        | jq '.agentPoolProfiles[] | select(.name=="agentpool") | .vmSize' \
+        | jq '.agentPoolProfiles[] | select(.name=="'${AKS_NODE_POOL_NAME}'") | .vmSize' \
         | tr -d "\"")
 
     # if vmSize is empty or null, exit

weblogic-azure-aks/src/main/arm/scripts/validateApplications.sh

@@ -20,10 +20,11 @@ function validate_app() {
 export script="${BASH_SOURCE[0]}"
 export scriptDir="$(cd "$(dirname "${script}")" && pwd)"
 
+source ${scriptDir}/common.sh
 source ${scriptDir}/utility.sh
 
 install_kubectl
 
 connect_aks $AKS_NAME $AKS_RESOURCE_GROUP_NAME
 
-validate_app
+validate_app

weblogic-azure-aks/src/main/bicep/mainTemplate.bicep

@@ -33,7 +33,7 @@ param acrResourceGroupName string = 'acr-contoso-rg'
 @maxLength(12)
 @minLength(1)
 @description('The name for this node pool. Node pool must contain only lowercase letters and numbers. For Linux node pools the name cannot be longer than 12 characters.')
-param aksAgentPoolName string = 'agentpool'
+param aksAgentPoolName string = 'nodepool1'
 @maxValue(10000)
 @minValue(1)
 @description('Set the minimum node count for the cluster.')

weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_aks.bicep

@@ -11,7 +11,7 @@ param agentAvailabilityZones array = []
 @maxLength(12)
 @minLength(1)
 @description('The name for this node pool. Node pool must contain only lowercase letters and numbers. For Linux node pools the name cannot be longer than 12 characters.')
-param aksAgentPoolName string = 'agentpool'
+param aksAgentPoolName string = 'nodepool1'
 @maxValue(10000)
 @minValue(1)
 @description('The number of nodes that should be created along with the cluster. You will be able to resize the cluster later.')

weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep

@@ -6,6 +6,7 @@ param _artifactsLocation string = deployment().properties.templateLink.uri
 param _artifactsLocationSasToken string = ''
 param _globalResourceNameSuffix string
 
+param aksAgentPoolName string = ''
 param aksClusterRGName string = ''
 param aksClusterName string = ''
 param acrName string = ''
@@ -103,6 +104,14 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers
         name: 'AKS_CLUSTER_NAME'
         value: aksClusterName
       }
+      {
+        name: 'AKS_NODE_POOL_NAME'
+        value: aksAgentPoolName
+      }
+      {
+        name: 'AKS_CLUSTER_LOCATION'
+        value: location
+      }
       {
         name: 'AKS_CLUSTER_RESOURCEGROUP_NAME'
         value: aksClusterRGName

weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep

@@ -24,6 +24,7 @@ var const_pyCheckAppStatusScript = 'checkApplicationStatus.py'
 var const_scriptLocation = uri(_artifactsLocation, 'scripts/')
 var const_validateAppScript= 'validateApplications.sh'
 var const_utilityScript= 'utility.sh'
+var const_commonScript= 'common.sh'
 
 
 resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = {
@@ -58,6 +59,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers
     ]
     primaryScriptUri: uri(const_scriptLocation, '${const_validateAppScript}${_artifactsLocationSasToken}')
     supportingScriptUris: [
+      uri(const_scriptLocation, '${const_commonScript}${_artifactsLocationSasToken}')
       uri(const_scriptLocation, '${const_utilityScript}${_artifactsLocationSasToken}')
       uri(const_scriptLocation, '${const_pyCheckAppStatusScript}${_artifactsLocationSasToken}')
     ]

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

@@ -34,7 +34,7 @@ param aksAgentAvailabilityZones array = []
 @maxLength(12)
 @minLength(1)
 @description('The name for this node pool. Node pool must contain only lowercase letters and numbers. For Linux node pools the name cannot be longer than 12 characters.')
-param aksAgentPoolName string = 'agentpool'
+param aksAgentPoolName string = 'nodepool1'
 @maxValue(10000)
 @minValue(1)
 @description('Set the minimum node count for the cluster..')
@@ -202,6 +202,7 @@ module wlsDomainDeployment './_deployment-scripts/_ds-create-wls-cluster.bicep'
     _artifactsLocation: _artifactsLocation
     _artifactsLocationSasToken: _artifactsLocationSasToken
     _globalResourceNameSuffix: _globalResourceNameSuffix
+    aksAgentPoolName: aksAgentPoolName
     aksClusterRGName: createAKSCluster ? resourceGroup().name : aksClusterRGName
     aksClusterName: aksClusterName
     acrName: useOracleImage ? acrName : userProvidedAcr