Add VM SKU parameter, Azure CNI support, and improved image registry documentation

Co-authored-by: tamilmani1989 <[email protected]>

Author: Copilot

hack/aks/Makefile

@@ -442,26 +442,35 @@ byocni-cluster-up: ## Create complete BYO CNI cluster with CNS and CNI (default:
 	@echo "Creating BYO CNI cluster with CNS and $(CNI_TYPE)..."
 	@echo "Variables: CLUSTER=$(CLUSTER), CNS_VERSION=$(CNS_VERSION), CNI_TYPE=$(CNI_TYPE)"
 	@$(MAKE) validate-cni-type
+ifeq ($(CNI_TYPE),azurecni)
+	@$(MAKE) overlay-up
+else
 	@$(MAKE) overlay-byocni-nokubeproxy-up
+endif
 	@echo "Cluster created successfully. Deploying CNS..."
 	@$(MAKE) deploy-cns
 	@echo "CNS deployed successfully. Deploying $(CNI_TYPE)..."
 ifeq ($(CNI_TYPE),cilium)
 	@$(MAKE) deploy-cilium
+else ifeq ($(CNI_TYPE),azurecni)
+	@echo "Azure CNI is already configured in the cluster. No additional CNI deployment needed."
 else
-	@echo "Warning: CNI_TYPE=$(CNI_TYPE) not supported yet. Only cilium is currently supported."
-	@echo "Available CNI types: cilium"
+	@echo "Warning: CNI_TYPE=$(CNI_TYPE) not supported yet."
+	@echo "Available CNI types: cilium, azurecni"
 	@exit 1
 endif
 	@echo "BYO CNI cluster setup completed successfully!"
 
 validate-cni-type: ## Validate the CNI type
 ifeq ($(CNI_TYPE),cilium)
 	@echo "✓ CNI type validation passed: $(CNI_TYPE)"
+else ifeq ($(CNI_TYPE),azurecni)
+	@echo "✓ CNI type validation passed: $(CNI_TYPE)"
 else
 	@echo "✗ Error: CNI_TYPE=$(CNI_TYPE) is not supported."
-	@echo "Available CNI types: cilium"
+	@echo "Available CNI types: cilium, azurecni"
 	@echo "Example: make byocni-cluster-up CNI_TYPE=cilium"
+	@echo "Example: make byocni-cluster-up CNI_TYPE=azurecni"
 	@exit 1
 endif
 
@@ -504,14 +513,15 @@ byocni-cluster-vars: ## Show variables for BYO CNI cluster setup
 	@echo "  REGION=$(REGION)"
 	@echo "  SUB=$(SUB)"
 	@echo "  VNET=$(VNET)"
+	@echo "  VM_SIZE=$(VM_SIZE)"
 	@echo ""
 	@echo "CNI configuration:"
 	@echo "  CNI_TYPE=$(CNI_TYPE)"
 	@echo ""
 	@echo "CNS configuration:"
 	@echo "  CNS_VERSION=$(CNS_VERSION)"
 	@echo "  AZURE_IPAM_VERSION=$(AZURE_IPAM_VERSION)"
-	@echo "  CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)"
+	@echo "  CNS_IMAGE_REPO=$(CNS_IMAGE_REPO) (MCR/ACR - affects CNS image paths)"
 	@echo ""
 	@echo "Cilium configuration:"
 	@echo "  CILIUM_DIR=$(CILIUM_DIR)"
@@ -520,9 +530,15 @@ byocni-cluster-vars: ## Show variables for BYO CNI cluster setup
 	@echo "  IPV6_HP_BPF_VERSION=$(IPV6_HP_BPF_VERSION)"
 	@echo "  DUALSTACK=$(DUALSTACK)"
 	@echo ""
+	@echo "Image registry options:"
+	@echo "  - MCR: mcr.microsoft.com/containernetworking"
+	@echo "  - ACR: acnpublic.azurecr.io (default for Cilium)"
+	@echo "  - Custom: your-registry.azurecr.io/path"
+	@echo ""
 	@echo "Repository root:"
 	@echo "  REPO_ROOT=$(REPO_ROOT)"
 	@echo ""
 	@echo "Example usage:"
 	@echo "  make byocni-cluster-up CLUSTER=my-cluster SUB=<subscription-id>"
+	@echo "  make byocni-cluster-up CLUSTER=my-cluster SUB=<subscription-id> CNI_TYPE=azurecni"  
 	@echo "  make byocni-cluster-up CLUSTER=my-cluster SUB=<subscription-id> CNS_VERSION=v1.6.0 CILIUM_DIR=1.16 CILIUM_VERSION_TAG=v1.16.5"

hack/aks/README.md

@@ -65,28 +65,56 @@ Create a BYO CNI cluster with Cilium (default):
 make byocni-cluster-up CLUSTER=my-cluster SUB=<subscription-id>
 ```
 
+Create a BYO CNI cluster with Azure CNI:
+```bash
+make byocni-cluster-up CLUSTER=my-cluster SUB=<subscription-id> CNI_TYPE=azurecni
+```
+
 ### Customization
 
 All parameters are configurable:
 ```bash
 make byocni-cluster-up \
     CLUSTER=my-cilium-cluster \
     SUB=<subscription-id> \
+    VM_SIZE=Standard_D2s_v3 \
     CNS_VERSION=v1.6.0 \
     CILIUM_DIR=1.16 \
     CILIUM_VERSION_TAG=v1.16.5 \
     CILIUM_IMAGE_REGISTRY=mcr.microsoft.com/containernetworking
 ```
 
+Using different image repositories:
+```bash
+# Using MCR for both CNS and Cilium
+make byocni-cluster-up \
+    CLUSTER=my-cluster \
+    SUB=<subscription-id> \
+    CNS_IMAGE_REPO=MCR \
+    CILIUM_IMAGE_REGISTRY=mcr.microsoft.com/containernetworking
+
+# Using ACR for CNS and custom registry for Cilium  
+make byocni-cluster-up \
+    CLUSTER=my-cluster \
+    SUB=<subscription-id> \
+    CNS_IMAGE_REPO=ACR \
+    CILIUM_IMAGE_REGISTRY=my-registry.azurecr.io/cilium
+```
+
 ### Available Configuration
 
-- `CNI_TYPE`: cilium (default) - Future CNI types can be added
+- `CNI_TYPE`: cilium, azurecni (default: cilium)
+- `VM_SIZE`: Node VM size (default: Standard_B2s)
 - `CNS_VERSION`: CNS version to deploy (default: v1.5.38)
 - `AZURE_IPAM_VERSION`: Azure IPAM version (default: v0.3.0)
 - `CNS_IMAGE_REPO`: CNS image repository - MCR or ACR (default: MCR)
+  - MCR: Uses Microsoft Container Registry paths
+  - ACR: Uses Azure Container Registry paths  
 - `CILIUM_DIR`: Cilium version directory - 1.12, 1.13, 1.14, 1.16, 1.17 (default: 1.14)
 - `CILIUM_VERSION_TAG`: Cilium image tag (default: v1.14.8)
 - `CILIUM_IMAGE_REGISTRY`: Cilium image registry (default: acnpublic.azurecr.io)
+  - Can be set to mcr.microsoft.com/containernetworking for MCR
+  - Or custom registry URL
 - `IPV6_HP_BPF_VERSION`: IPv6 HP BPF version for dual stack (default: v0.0.3)
 - `DUALSTACK`: Enable dual-stack configuration (default: false)
 
@@ -97,12 +125,18 @@ make byocni-cluster-vars
 
 ### Workflow
 
-The `byocni-cluster-up` target orchestrates three main steps:
+The `byocni-cluster-up` target orchestrates the complete setup workflow:
 
-1. **Cluster Creation**: Uses `overlay-byocni-nokubeproxy-up` to create AKS cluster
+**For Cilium CNI (default):**
+1. **Cluster Creation**: Uses `overlay-byocni-nokubeproxy-up` to create AKS cluster without CNI
 2. **CNS Deployment**: Uses root makefile `test-load` target with CNS-specific parameters  
 3. **CNI Deployment**: Deploys Cilium using manifests from `test/integration/manifests/cilium/`
 
+**For Azure CNI:**
+1. **Cluster Creation**: Uses `overlay-up` to create AKS cluster with Azure CNI pre-configured
+2. **CNS Deployment**: Uses root makefile `test-load` target with CNS-specific parameters
+3. **CNI Configuration**: Azure CNI is already configured - no additional deployment needed
+
 Individual steps can also be run separately:
 ```bash
 make deploy-cns