Add resource group configuration option to BYO CNI cluster script

Co-authored-by: vipul-21 <[email protected]>

Author: Copilot

hack/aks/README-byocni.md

@@ -58,6 +58,7 @@ cd /path/to/azure-container-networking
 |-----------|-------------|---------|
 | `--cluster` | Name of the AKS cluster | `byocni-cluster` |
 | `--subscription` | Azure subscription ID | *Required* |
+| `--resource-group` | Resource group name | Same as cluster name |
 | `--azcli` | Azure CLI command | `az` |
 | `--kubernetes-version` | Kubernetes version for the cluster | `1.33` |
 | `--networking-mode` | Networking mode (overlay, swift, nodesubnet, dualstack-overlay, vnetscale-swift) | `overlay` |
@@ -126,7 +127,16 @@ cd /path/to/azure-container-networking
     --cilium-dir 1.16
 ```
 
-### Example 4: Cluster with kube-proxy enabled
+### Example 4: Custom cluster and resource group
+```bash
+cd /path/to/azure-container-networking
+./hack/aks/create-byocni-cluster.sh \
+    --cluster my-aks-cluster \
+    --resource-group my-resource-group \
+    --subscription 9b8218f9-902a-4d20-a65c-e98acec5362f
+```
+
+### Example 5: Cluster with kube-proxy enabled
 ```bash
 cd /path/to/azure-container-networking
 ./hack/aks/create-byocni-cluster.sh \
@@ -135,7 +145,7 @@ cd /path/to/azure-container-networking
     --with-kube-proxy
 ```
 
-### Example 5: Dualstack cluster with Cilium
+### Example 6: Dualstack cluster with Cilium
 ```bash
 cd /path/to/azure-container-networking
 ./hack/aks/create-byocni-cluster.sh \
@@ -145,7 +155,7 @@ cd /path/to/azure-container-networking
     --cilium-version-tag v1.17.0
 ```
 
-### Example 6: Cluster with specific Kubernetes version
+### Example 7: Cluster with specific Kubernetes version
 ```bash
 cd /path/to/azure-container-networking
 ./hack/aks/create-byocni-cluster.sh \
@@ -155,15 +165,15 @@ cd /path/to/azure-container-networking
     --cni-plugin cilium
 ```
 
-### Example 7: Only cluster and CNS, no CNI plugin
+### Example 8: Only cluster and CNS, no CNI plugin
 ```bash
 cd /path/to/azure-container-networking
 ./hack/aks/create-byocni-cluster.sh \
     --subscription 9b8218f9-902a-4d20-a65c-e98acec5362f \
     --cni-plugin none
 ```
 
-### Example 8: Using different image registry
+### Example 9: Using different image registry
 ```bash
 cd /path/to/azure-container-networking
 ./hack/aks/create-byocni-cluster.sh \

hack/aks/create-byocni-cluster.sh

@@ -9,6 +9,7 @@ set -euo pipefail
 # Default configuration
 DEFAULT_CLUSTER_NAME="byocni-cluster"
 DEFAULT_SUB=""
+DEFAULT_RESOURCE_GROUP=""
 DEFAULT_NETWORKING_MODE="overlay"
 DEFAULT_NO_KUBE_PROXY="true"
 DEFAULT_CNI_PLUGIN="cilium"
@@ -39,6 +40,7 @@ Creates a BYO CNI cluster with the following steps:
 OPTIONS:
     -c, --cluster CLUSTER_NAME      Name of the AKS cluster (default: ${DEFAULT_CLUSTER_NAME})
     -s, --subscription SUB_ID       Azure subscription ID (required)
+    -g, --resource-group GROUP      Resource group name (default: same as cluster name)
     -z, --azcli AZCLI_COMMAND      Azure CLI command (default: ${DEFAULT_AZCLI})
     -k, --kubernetes-version VER    Kubernetes version for the cluster (default: ${DEFAULT_KUBERNETES_VERSION})
     -n, --networking-mode MODE      Networking mode: overlay, swift, nodesubnet, dualstack-overlay, vnetscale-swift (default: ${DEFAULT_NETWORKING_MODE})
@@ -80,6 +82,9 @@ EXAMPLES:
     # Custom cluster name and CNS version
     $0 --cluster my-cluster --subscription 9b8218f9-902a-4d20-a65c-e98acec5362f --cns-version v1.6.0
 
+    # Custom cluster name and resource group
+    $0 --cluster my-cluster --resource-group my-rg --subscription 9b8218f9-902a-4d20-a65c-e98acec5362f
+
     # Cluster with kube-proxy enabled
     $0 --subscription 9b8218f9-902a-4d20-a65c-e98acec5362f --with-kube-proxy
 
@@ -319,7 +324,12 @@ create_cluster() {
         log "Kubernetes version ${KUBERNETES_VERSION} is >= 1.31, setting LTS=false"
     fi
 
-    local make_cmd="AZCLI=${AZCLI} CLUSTER=${CLUSTER_NAME} SUB=${SUBSCRIPTION} K8S_VER=${KUBERNETES_VERSION} LTS=${lts_setting} make ${make_target}"
+    # Build make command with optional GROUP parameter
+    local make_cmd="AZCLI=${AZCLI} CLUSTER=${CLUSTER_NAME} SUB=${SUBSCRIPTION} K8S_VER=${KUBERNETES_VERSION} LTS=${lts_setting}"
+    if [[ -n "${RESOURCE_GROUP}" ]]; then
+        make_cmd="${make_cmd} GROUP=${RESOURCE_GROUP}"
+    fi
+    make_cmd="${make_cmd} make ${make_target}"
 
     log "Using make target: ${make_target}"
     execute "cd '${SCRIPT_DIR}' && ${make_cmd}"
@@ -480,6 +490,7 @@ show_completion_message() {
 # Parse command line arguments
 CLUSTER_NAME="${DEFAULT_CLUSTER_NAME}"
 SUBSCRIPTION="${DEFAULT_SUB}"
+RESOURCE_GROUP="${DEFAULT_RESOURCE_GROUP}"
 NETWORKING_MODE="${DEFAULT_NETWORKING_MODE}"
 NO_KUBE_PROXY="${DEFAULT_NO_KUBE_PROXY}"
 CNI_PLUGIN="${DEFAULT_CNI_PLUGIN}"
@@ -504,6 +515,10 @@ while [[ $# -gt 0 ]]; do
             SUBSCRIPTION="$2"
             shift 2
             ;;
+        -g|--resource-group)
+            RESOURCE_GROUP="$2"
+            shift 2
+            ;;
         -z|--azcli)
             AZCLI="$2"
             shift 2
@@ -585,6 +600,7 @@ main() {
     log "Configuration:"
     log "  Cluster Name: ${CLUSTER_NAME}"
     log "  Subscription: ${SUBSCRIPTION}"
+    log "  Resource Group: ${RESOURCE_GROUP:-${CLUSTER_NAME}}"
     log "  Azure CLI: ${AZCLI}"
     log "  Kubernetes Version: ${KUBERNETES_VERSION}"
     log "  Networking Mode: ${NETWORKING_MODE}"