Merge pull request #5385 from nawazkh/updating_tiltfile

Clean aks-as-mgmt.sh and Tiltfile

Author: k8s-ci-robot

Tiltfile

@@ -23,8 +23,8 @@ settings = {
     "capi_version": "v1.8.8",
     "caaph_version": "v0.2.5",
     "cert_manager_version": "v1.16.1",
-    "kubernetes_version": "v1.28.15",
-    "aks_kubernetes_version": "v1.28.15",
+    "kubernetes_version": "v1.30.2",
+    "aks_kubernetes_version": "v1.30.2",
     "flatcar_version": "3374.2.1",
     "azure_location": "eastus",
     "control_plane_machine_count": "1",
@@ -541,7 +541,7 @@ def clear_aks_vnet_peerings():
     # List all peering names and store them in an array
     delete_peering_cmd += '''
     PEERING_NAMES=$(az network vnet peering list --resource-group ${AKS_RESOURCE_GROUP} --vnet-name ${AKS_MGMT_VNET_NAME} --query \"[].name\" --output tsv);
-    for PEERING_NAME in ${PEERING_NAMES[@]}; do echo \"Deleting peering: ${PEERING_NAME}\"; az network vnet peering delete --name ${PEERING_NAME} --resource-group ${AKS_RESOURCE_GROUP} --vnet-name ${AKS_MGMT_VNET_NAME}; done;
+    for PEERING_NAME in ${PEERING_NAMES}; do echo \"Deleting peering: ${PEERING_NAME}\"; az network vnet peering delete --name ${PEERING_NAME} --resource-group ${AKS_RESOURCE_GROUP} --vnet-name ${AKS_MGMT_VNET_NAME}; done;
     echo \"All VNETs Peerings deleted in ${AKS_MGMT_VNET_NAME}\"; '''
 
     return delete_peering_cmd

scripts/aks-as-mgmt.sh

@@ -23,24 +23,15 @@ source "${REPO_ROOT}/hack/ensure-azcli.sh" # install az cli and login using WI
 # shellcheck source=hack/ensure-tags.sh
 source "${REPO_ROOT}/hack/ensure-tags.sh" # set the right timestamp and job name
 
-KUBECTL="${REPO_ROOT}/hack/tools/bin/kubectl"
-AZWI="${REPO_ROOT}/hack/tools/bin/azwi"
-make --directory="${REPO_ROOT}" "${KUBECTL##*/}" "${AZWI##*/}"
-
 export MGMT_CLUSTER_NAME="${MGMT_CLUSTER_NAME:-aks-mgmt-capz-${RANDOM_SUFFIX}}" # management cluster name
 export AKS_RESOURCE_GROUP="${AKS_RESOURCE_GROUP:-aks-mgmt-capz-${RANDOM_SUFFIX}}" # resource group name
 export AKS_NODE_RESOURCE_GROUP="node-${AKS_RESOURCE_GROUP}"
 export AKS_MGMT_KUBERNETES_VERSION="${AKS_MGMT_KUBERNETES_VERSION:-v1.30.2}"
 export AZURE_LOCATION="${AZURE_LOCATION:-westus2}"
 export AKS_NODE_VM_SIZE="${AKS_NODE_VM_SIZE:-"Standard_B2s"}"
 export AKS_NODE_COUNT="${AKS_NODE_COUNT:-2}"
-export AZURE_NODE_MACHINE_TYPE="${AZURE_NODE_MACHINE_TYPE:-"Standard_B2s"}"
 export MGMT_CLUSTER_KUBECONFIG="${MGMT_CLUSTER_KUBECONFIG:-$REPO_ROOT/aks-mgmt.config}"
 export AZURE_IDENTITY_ID_FILEPATH="${AZURE_IDENTITY_ID_FILEPATH:-$REPO_ROOT/azure_identity_id}"
-export AZWI_STORAGE_ACCOUNT="capzcioidcissuer${RANDOM_SUFFIX}"
-export AZWI_STORAGE_CONTAINER="\$web"
-export SERVICE_ACCOUNT_SIGNING_PUB_FILEPATH="${SERVICE_ACCOUNT_SIGNING_PUB_FILEPATH:-}"
-export SERVICE_ACCOUNT_SIGNING_KEY_FILEPATH="${SERVICE_ACCOUNT_SIGNING_KEY_FILEPATH:-}"
 export REGISTRY="${REGISTRY:-}"
 export AKS_MGMT_VNET_NAME="${AKS_MGMT_VNET_NAME:-"aks-mgmt-vnet-${RANDOM_SUFFIX}"}"
 export AKS_MGMT_VNET_CIDR="${AKS_MGMT_VNET_CIDR:-"20.255.0.0/16"}"
@@ -73,16 +64,10 @@ main() {
   echo "AKS_MGMT_KUBERNETES_VERSION:          $AKS_MGMT_KUBERNETES_VERSION"
   echo "AZURE_LOCATION:                       $AZURE_LOCATION"
   echo "AKS_NODE_VM_SIZE:                     $AKS_NODE_VM_SIZE"
-  echo "AZURE_NODE_MACHINE_TYPE:              $AZURE_NODE_MACHINE_TYPE"
   echo "AKS_NODE_COUNT:                       $AKS_NODE_COUNT"
   echo "MGMT_CLUSTER_KUBECONFIG:              $MGMT_CLUSTER_KUBECONFIG"
   echo "AZURE_IDENTITY_ID_FILEPATH:           $AZURE_IDENTITY_ID_FILEPATH"
-  echo "AZWI_STORAGE_ACCOUNT:                 $AZWI_STORAGE_ACCOUNT"
-  echo "AZWI_STORAGE_CONTAINER:               $AZWI_STORAGE_CONTAINER"
-  echo "SERVICE_ACCOUNT_SIGNING_PUB_FILEPATH: $SERVICE_ACCOUNT_SIGNING_PUB_FILEPATH"
-  echo "SERVICE_ACCOUNT_SIGNING_KEY_FILEPATH: $SERVICE_ACCOUNT_SIGNING_KEY_FILEPATH"
   echo "REGISTRY:                             $REGISTRY"
-  echo "APISERVER_LB_DNS_SUFFIX:              $APISERVER_LB_DNS_SUFFIX"
   echo "AKS_MGMT_VNET_NAME:                   $AKS_MGMT_VNET_NAME"
   echo "AKS_MGMT_VNET_CIDR:                   $AKS_MGMT_VNET_CIDR"
   echo "AKS_MGMT_SERVICE_CIDR:                $AKS_MGMT_SERVICE_CIDR"
@@ -93,6 +78,14 @@ main() {
   echo "AZURE_SUBSCRIPTION_ID:                $AZURE_SUBSCRIPTION_ID"
   echo "AZURE_CLIENT_ID:                      $AZURE_CLIENT_ID"
   echo "AZURE_TENANT_ID:                      $AZURE_TENANT_ID"
+  echo "APISERVER_LB_DNS_SUFFIX:              $APISERVER_LB_DNS_SUFFIX"
+  echo "AKS_MI_CLIENT_ID:                     $AKS_MI_CLIENT_ID"
+  echo "AKS_MI_OBJECT_ID:                     $AKS_MI_OBJECT_ID"
+  echo "AKS_MI_RESOURCE_ID:                   $AKS_MI_RESOURCE_ID"
+  echo "MANAGED_IDENTITY_NAME:                $MANAGED_IDENTITY_NAME"
+  echo "MANAGED_IDENTITY_RG:                  $MANAGED_IDENTITY_RG"
+  echo "ASO_CREDENTIAL_SECRET_MODE:           $ASO_CREDENTIAL_SECRET_MODE"
+  echo "SKIP_AKS_CREATE:                      $SKIP_AKS_CREATE"
   echo "--------------------------------"
 
   # if using SKIP_AKS_CREATE=true, skip creating the AKS cluster