create connect_aks as common function. (#3)

galiacheng · edburns · commit 005fb8da1570 · 2024-05-10T14:53:09.000-04:00
diff --git a/weblogic-azure-aks/src/main/arm/scripts/inline-scripts/enableHpa.sh b/weblogic-azure-aks/src/main/arm/scripts/inline-scripts/enableHpa.sh
@@ -1,13 +1,6 @@
 # Copyright (c) 2024, Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-function connect_aks(){
-    az aks get-credentials \
-        --resource-group ${AKS_CLUSTER_RG_NAME} \
-        --name ${AKS_CLUSTER_NAME} \
-        --overwrite-existing
-}
-
 function get_cluster_uid(){
   local clusterUid=$(kubectl get clusters -n ${WLS_NAMESPACE} -o=jsonpath='{.items[].metadata.name}')
   utility_validate_status "Obtain cluster UID."
@@ -62,7 +55,7 @@ set -Eo pipefail
 
 install_kubectl
 
-connect_aks
+connect_aks $AKS_CLUSTER_NAME $AKS_CLUSTER_RG_NAME
 
 get_cluster_uid
 
diff --git a/weblogic-azure-aks/src/main/arm/scripts/inline-scripts/enablePrometheusMetrics.sh b/weblogic-azure-aks/src/main/arm/scripts/inline-scripts/enablePrometheusMetrics.sh
@@ -1,13 +1,7 @@
 # Copyright (c) 2024, Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-function connect_aks(){
-    az aks get-credentials \
-        -n $AKS_CLUSTER_NAME \
-        -g $AKS_CLUSTER_RG_NAME \
-        --overwrite-existing \
-        --only-show-errors
-}
+#!/bin/bash
 
 function enable_promethues_metrics(){
     # See https://learn.microsoft.com/en-us/azure/azure-monitor/containers/kubernetes-monitoring-enable?tabs=cli#enable-prometheus-and-grafana
@@ -396,7 +390,7 @@ install_kubectl
 
 install_helm
 
-connect_aks
+connect_aks $AKS_CLUSTER_NAME $AKS_CLUSTER_RG_NAME
 
 get_wls_monitoring_exporter_image_url
 
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
@@ -1,4 +1,4 @@
-# Copyright (c) 2021, Oracle Corporation and/or its affiliates.
+# Copyright (c) 2021, 2024 Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 # This script runs on Azure Container Instance with Alpine Linux that Azure Deployment script creates.
 #
@@ -15,10 +15,7 @@ echo "install kubectl"
 az aks install-cli
 
 echo "Connect AKS"
-az aks get-credentials \
-    --resource-group ${AKS_CLUSTER_RESOURCEGROUP_NAME} \
-    --name ${AKS_CLUSTER_NAME} \
-    --overwrite-existing
+connect_aks $AKS_CLUSTER_NAME $AKS_CLUSTER_RESOURCEGROUP_NAME
 
 wlsDomainNS="${WLS_DOMAIN_UID}-ns"
 
diff --git a/weblogic-azure-aks/src/main/arm/scripts/inline-scripts/validateAgic.sh b/weblogic-azure-aks/src/main/arm/scripts/inline-scripts/validateAgic.sh
@@ -2,11 +2,6 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 function wait_for_azure_ingress_ready() {
-    az aks get-credentials \
-        --resource-group ${AKS_CLUSTER_RG_NAME} \
-        --name ${AKS_CLUSTER_NAME} \
-        --overwrite-existing
-
     local ready=false
     local attempt=0
 
@@ -36,4 +31,6 @@ set -Eo pipefail
 
 install_kubectl
 
+connect_aks $AKS_CLUSTER_NAME $AKS_CLUSTER_RG_NAME
+
 wait_for_azure_ingress_ready
diff --git a/weblogic-azure-aks/src/main/arm/scripts/queryStorageAccount.sh b/weblogic-azure-aks/src/main/arm/scripts/queryStorageAccount.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2021, Oracle Corporation and/or its affiliates.
+# Copyright (c) 2021, 2024 Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 # Inputs:
 # AKS_CLUSTER_RESOURCEGROUP_NAME
@@ -8,14 +8,6 @@ echo "Script ${0} starts"
 
 export currentStorageAccount="null"
 
-# Connect to AKS cluster
-function connect_aks_cluster() {
-  az aks get-credentials \
-    --resource-group ${AKS_CLUSTER_RESOURCEGROUP_NAME} \
-    --name ${AKS_CLUSTER_NAME} \
-    --overwrite-existing
-}
-
 function query_storage_account() {
   echo "install kubectl"
   az aks install-cli
@@ -42,7 +34,7 @@ function output_result() {
   echo $result >$AZ_SCRIPTS_OUTPUT_PATH
 }
 
-connect_aks_cluster
+connect_aks $AKS_CLUSTER_NAME $AKS_CLUSTER_RESOURCEGROUP_NAME
 
 query_storage_account
 
diff --git a/weblogic-azure-aks/src/main/arm/scripts/setupDBConnections.sh b/weblogic-azure-aks/src/main/arm/scripts/setupDBConnections.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2021, Oracle Corporation and/or its affiliates.
+# Copyright (c) 2021, 2024 Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 echo "Script ${0} starts"
@@ -80,14 +80,6 @@ function validate_input() {
     fi
 }
 
-# Connect to AKS cluster
-function connect_aks_cluster() {
-    az aks get-credentials \
-        --resource-group ${AKS_RESOURCE_GROUP_NAME} \
-        --name ${AKS_NAME} \
-        --overwrite-existing
-}
-
 function create_datasource_model_configmap_and_secret() {
     echo "get data source secret name"
     jndiLabel=${JDBC_DATASOURCE_NAME//\//\_}
@@ -289,7 +281,7 @@ export wlsDomainNS="${WLS_DOMAIN_UID}-ns"
 
 validate_input
 
-connect_aks_cluster
+connect_aks $AKS_NAME $AKS_RESOURCE_GROUP_NAME
 
 install_kubectl
 
diff --git a/weblogic-azure-aks/src/main/arm/scripts/setupNetworking.sh b/weblogic-azure-aks/src/main/arm/scripts/setupNetworking.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2021, Oracle Corporation and/or its affiliates.
+# Copyright (c) 2021, 2024 Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 echo "Script  ${0} starts"
@@ -114,11 +114,6 @@ function validate_input() {
   fi
 }
 
-# Connect to AKS cluster
-function connect_aks_cluster() {
-  az aks get-credentials --resource-group ${AKS_CLUSTER_RG_NAME} --name ${AKS_CLUSTER_NAME} --overwrite-existing
-}
-
 function create_svc_lb() {
   # No lb svc inputs
   if [[ "${LB_SVC_VALUES}" != "[]" ]]; then
@@ -147,7 +142,7 @@ validate_input
 
 install_utilities
 
-connect_aks_cluster
+connect_aks $AKS_CLUSTER_NAME $AKS_CLUSTER_RG_NAME
 
 create_svc_lb
 
diff --git a/weblogic-azure-aks/src/main/arm/scripts/setupWLSDomain.sh b/weblogic-azure-aks/src/main/arm/scripts/setupWLSDomain.sh
@@ -285,11 +285,6 @@ function install_utilities() {
     validate_status ${ret}
 }
 
-# Connect to AKS cluster
-function connect_aks_cluster() {
-    az aks get-credentials --resource-group ${AKS_CLUSTER_RESOURCEGROUP_NAME} --name ${AKS_CLUSTER_NAME} --overwrite-existing
-}
-
 # remove the operator if it is not running.
 function uninstall_operator() {
     echo "remove operator"
@@ -772,7 +767,7 @@ query_acr_credentials
 
 build_docker_image
 
-connect_aks_cluster
+connect_aks $AKS_CLUSTER_NAME $AKS_CLUSTER_RESOURCEGROUP_NAME
 
 install_wls_operator
 
diff --git a/weblogic-azure-aks/src/main/arm/scripts/updateApplications.sh b/weblogic-azure-aks/src/main/arm/scripts/updateApplications.sh
@@ -98,14 +98,6 @@ function validate_input() {
     fi
 }
 
-# Connect to AKS cluster
-function connect_aks_cluster() {
-    az aks get-credentials \
-        --resource-group ${AKS_CLUSTER_RESOURCEGROUP_NAME} \
-        --name ${AKS_CLUSTER_NAME} \
-        --overwrite-existing
-}
-
 function query_wls_cluster_info(){
     WLS_CLUSTER_SIZE=$(kubectl -n ${wlsDomainNS} get domain ${WLS_DOMAIN_UID} -o json \
         | jq '. | .status.clusters[] | select(.clusterName == "'${constClusterName}'") | .maximumReplicas')
@@ -291,7 +283,7 @@ validate_input
 
 install_kubectl
 
-connect_aks_cluster
+connect_aks $AKS_CLUSTER_NAME $AKS_CLUSTER_RESOURCEGROUP_NAME
 
 query_wls_cluster_info
 
diff --git a/weblogic-azure-aks/src/main/arm/scripts/utility.sh b/weblogic-azure-aks/src/main/arm/scripts/utility.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2021, Oracle Corporation and/or its affiliates.
+# Copyright (c) 2021, 2024 Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 # This script runs on Azure Container Instance with Alpine Linux that Azure Deployment script creates.
 
@@ -27,6 +27,16 @@ function utility_validate_status() {
     fi
 }
 
+function connect_aks(){
+    az aks get-credentials \
+        -n $1 \
+        -g $2 \
+        --overwrite-existing \
+        --only-show-errors
+
+    utility_validate_status "Finished connecting to AKS cluster."
+}
+
 # JAVA_HOME=/usr/lib/jvm/java-11-openjdk
 function install_jdk() {
     local ready=false
diff --git a/weblogic-azure-aks/src/main/arm/scripts/validateApplications.sh b/weblogic-azure-aks/src/main/arm/scripts/validateApplications.sh
@@ -1,15 +1,7 @@
-# Copyright (c) 2021, Oracle Corporation and/or its affiliates.
+# Copyright (c) 2021, 2024 Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 # This script runs on Azure Container Instance with Alpine Linux that Azure Deployment script creates.
 
-# Connect to AKS cluster
-function connect_aks_cluster() {
-    az aks get-credentials \
-        --resource-group ${AKS_RESOURCE_GROUP_NAME} \
-        --name ${AKS_NAME} \
-        --overwrite-existing
-}
-
 function validate_app() {
     # make sure all the application are active, if not, fail the deployment.
     local wlsDomainNS="${WLS_DOMAIN_UID}-ns"
@@ -32,6 +24,6 @@ source ${scriptDir}/utility.sh
 
 install_kubectl
 
-connect_aks_cluster
+connect_aks $AKS_NAME $AKS_RESOURCE_GROUP_NAME
 
 validate_app
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
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, Oracle Corporation and/or its affiliates.
+// Copyright (c) 2021, 2024 Oracle Corporation and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 param aksClusterRGName string = ''
@@ -11,7 +11,9 @@ param wlsClusterName string = 'cluster-1'
 param wlsDomainUID string = 'sample-domain1'
 
 // To mitigate arm-ttk error: Unreferenced variable: $fxv#0
+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}' = {
   name: 'ds-query-wls-configurations'
@@ -38,7 +40,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers
         value: wlsDomainUID
       }
     ]
-    scriptContent: base64ToString(base64_queryDomainConfigurations)
+    scriptContent: format('{0}\r\n\r\n{1}\r\n\r\n{2}',base64ToString(base64_common), base64ToString(base64_utility), base64ToString(base64_queryDomainConfigurations))
     cleanupPreference: 'OnSuccess'
     retentionInterval: 'P1D'
     forceUpdateTag: utcValue
diff --git a/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-query-storage-account.bicep b/weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-query-storage-account.bicep
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, Oracle Corporation and/or its affiliates.
+// Copyright (c) 2021, 2024 Oracle Corporation and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 param aksClusterName string = ''
@@ -10,7 +10,9 @@ param location string
 param utcValue string = utcNow()
 
 // To mitigate arm-ttk error: Unreferenced variable: $fxv#0
+var base64_common = loadFileAsBase64('../../../arm/scripts/common.sh')
 var base64_queryStorageAccount = loadFileAsBase64('../../../arm/scripts/queryStorageAccount.sh')
+var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh')
 var const_deploymentName = 'ds-query-storage-account'
 
 resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = {
@@ -30,7 +32,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVers
         value: aksClusterRGName
       }
     ]
-    scriptContent: base64ToString(base64_queryStorageAccount)
+    scriptContent: format('{0}\r\n\r\n{1}\r\n\r\n{2}',base64ToString(base64_common), base64ToString(base64_utility), base64ToString(base64_queryStorageAccount))
     cleanupPreference: 'OnSuccess'
     retentionInterval: 'P1D'
     forceUpdateTag: utcValue
