From bbf5e28eeda229c9962a6605c8e09609efc63750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Fern=C3=A1ndez?= Date: Mon, 28 Oct 2024 15:07:50 -0300 Subject: [PATCH] Adding subnet-id retrieval from Cluster. --- hack/deploy/configure-values.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hack/deploy/configure-values.sh b/hack/deploy/configure-values.sh index 37d50fab9..a92ca2f39 100755 --- a/hack/deploy/configure-values.sh +++ b/hack/deploy/configure-values.sh @@ -31,12 +31,17 @@ BOOTSTRAP_TOKEN=$TOKEN_ID.$TOKEN_SECRET SSH_PUBLIC_KEY="$(cat ~/.ssh/id_rsa.pub) azureuser" if [[ ! -v VNET_SUBNET_ID ]]; then - # first subnet of first VNet found - VNET_JSON=$(az network vnet list --resource-group "$AZURE_RESOURCE_GROUP_MC" | jq -r ".[0]") - VNET_SUBNET_ID=$(jq -r ".subnets[0].id" <<< "$VNET_JSON") + # Getting the subnet id from the first AgentPoolProfile in the cluster (Managed network) + VNET_SUBNET_ID=$(jq -r ".agentPoolProfiles[0].vnetSubnetId" <<< "$AKS_JSON") + + if [[ ! -z VNET_SUBNET_ID ]]; then + # If is still empty, look for the first subnet of first VNet found (self-managed network) + VNET_JSON=$(az network vnet list --resource-group "$AZURE_RESOURCE_GROUP_MC" -o json | jq -r ".[0]") + VNET_SUBNET_ID=$(jq -r ".subnets[0].id" <<< "$VNET_JSON") + fi fi -# The // empty ensures that if the files is 'null' or not prsent jq will output nothing +# The // empty ensures that if the files is 'null' or not present jq will output nothing # If the value returned is none, its from jq and not the aks api in this case we return "" NETWORK_PLUGIN=$(jq -r ".networkProfile.networkPlugin // empty | if . == \"none\" then \"\" else . end" <<< "$AKS_JSON") NETWORK_PLUGIN_MODE=$(jq -r ".networkProfile.networkPluginMode // empty | if . == \"none\" then \"\" else . end" <<< "$AKS_JSON")