On branch wls-autoscaling-0131 Changes supplemental to comment below.

modified:   pom.xml

- Increment version

modified:   weblogic-azure-aks/src/main/arm/scripts/inline-scripts/enableHpa.sh
modified:   weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_hpa.bicep

- Correct typo.

modified:   weblogic-azure-aks/src/main/arm/scripts/inline-scripts/enablePrometheusMetrics.sh

- I'm worried about the idempotency. Guard against that by ensuring these extension add/removes don't cause a failure.

modified:   weblogic-azure-aks/src/main/arm/scripts/updateApplications.sh

- Best practice. See https://dev.azure.com/edburns-msft/Open%20Standard%20Enterprise%20Java%20(Java%20EE)%20on%20Azure/_wiki/wikis/Open-Standard-Enterprise-Java-(Java-EE)-on-Azure.wiki/2/Team-FAQ?anchor=shell-script-best-practices .

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

- Correct typo.

modified:   weblogic-azure-aks/src/main/resources/weblogic_tooling_family.json

- Add note to maintainer.

Comment: https://github.com/oracle/weblogic-azure/pull/297/files#r1595939825
Signed-off-by: Ed Burns <[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.74</version.wls-on-aks-azure-marketplace>
+        <version.wls-on-aks-azure-marketplace>1.0.75</version.wls-on-aks-azure-marketplace>
         <!--  weblogic azure vm versions  -->
         <version.arm-oraclelinux-wls>1.0.27</version.arm-oraclelinux-wls>
         <version.arm-oraclelinux-wls-admin>1.0.50</version.arm-oraclelinux-wls-admin>

weblogic-azure-aks/src/main/arm/scripts/inline-scripts/enableHpa.sh

@@ -16,7 +16,7 @@ function get_cluster_uid(){
 
 function scaling_basedon_cpu(){
     kubectl autoscale cluster ${WLS_CLUSTER_UID} \
-        --cpu-percent=${UTILIZATION_PERSENTAGE} \
+        --cpu-percent=${UTILIZATION_PERCENTAGE} \
         --min=1 \
         --max=${WLS_CLUSTER_SIZE} \
         -n ${WLS_NAMESPACE}
@@ -42,7 +42,7 @@ spec:
     resource:
       name: memory
       target:
-        averageUtilization: ${UTILIZATION_PERSENTAGE}
+        averageUtilization: ${UTILIZATION_PERCENTAGE}
         type: Utilization
 EOF
 
@@ -72,4 +72,4 @@ if [ "$HPA_SCALE_TYPE" == "cpu" ]; then
   scaling_basedon_cpu
 elif [ "$HPA_SCALE_TYPE" == "memory" ]; then
   scaling_basedon_memory
-fi
+fi

weblogic-azure-aks/src/main/arm/scripts/inline-scripts/enablePrometheusMetrics.sh

@@ -11,7 +11,7 @@ function connect_aks(){
 
 function enable_promethues_metrics(){
     # See https://learn.microsoft.com/en-us/azure/azure-monitor/containers/kubernetes-monitoring-enable?tabs=cli#enable-prometheus-and-grafana
-    az extension add --name k8s-extension
+    az extension add --name k8s-extension && true
 
     ### Use existing Azure Monitor workspace
     az aks update --enable-azure-monitor-metrics \
@@ -22,8 +22,8 @@ function enable_promethues_metrics(){
 
     utility_validate_status "Enable Promethues Metrics."
 
-    az extension add --name aks-preview
-    az extension remove --name k8s-extension
+    az extension add --name aks-preview && true
+    az extension remove --name k8s-extension && true
 
     #Verify that the DaemonSet was deployed properly on the Linux node pools
     #https://learn.microsoft.com/en-us/azure/azure-monitor/containers/kubernetes-monitoring-enable?tabs=cli#managed-prometheus

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

@@ -284,6 +284,9 @@ export ENABLE_CUSTOM_SSL=${constFalse}
 export WLS_CLUSTER_SIZE=5
 export URL_3RD_DATASOURCE=$(echo "[]" | base64)
 
+# Main script
+set -Eo pipefail
+
 validate_input
 
 install_kubectl

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

@@ -36,7 +36,7 @@ param acrResourceGroupName string = 'acr-contoso-rg'
 param aksAgentPoolName string = 'agentpool'
 @maxValue(10000)
 @minValue(1)
-@description('Set the minimum node count for the cluster..')
+@description('Set the minimum node count for the cluster.')
 param aksAgentPoolNodeCount int = 3
 @maxValue(1000)
 @minValue(3)

weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_hpa.bicep

@@ -48,7 +48,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers
         value: hpaScaleType
       }
       {
-        name: 'UTILIZATION_PERSENTAGE'
+        name: 'UTILIZATION_PERCENTAGE'
         value: utilizationPercentage
       }
       {

weblogic-azure-aks/src/main/resources/weblogic_tooling_family.json

@@ -24,7 +24,7 @@
         },
         {
             "key": "WME",
-            "description": "Oracle Weblogic Monitoring Exporter",
+            "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"