From e972c5b2793e57a31f8faf8685f026a370f0bfd6 Mon Sep 17 00:00:00 2001 From: Akshay Gupta Date: Tue, 21 Jan 2025 11:58:11 +0530 Subject: [PATCH 1/2] fix the cni to azure in agic addon --- .../azext_aks_preview/tests/latest/test_aks_commands.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py index f52a1c68584..f1fc40e49ba 100644 --- a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py +++ b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py @@ -744,6 +744,7 @@ def test_aks_create_with_ingress_appgw_addon( create_cmd = ( "aks create --resource-group={resource_group} --name={name} --enable-managed-identity " "-a ingress-appgw --appgw-subnet-cidr 10.232.0.0/16 " + "--network-plugin azure " "--ssh-key-value={ssh_key_value} -o json" ) self.cmd( @@ -782,6 +783,7 @@ def test_aks_byo_subnet_with_ingress_appgw_addon( # create virtual network create_vnet = ( "network vnet create --resource-group={resource_group} --name={vnet_name} " + "--network-plugin azure " "--address-prefix 11.0.0.0/16 --subnet-name aks-subnet --subnet-prefix 11.0.0.0/24 -o json" ) vnet = self.cmd( @@ -857,6 +859,7 @@ def test_aks_byo_appgw_with_ingress_appgw_addon( # create virtual network create_vnet = ( "network vnet create --resource-group={resource_group} --name={vnet_name} " + "--network-plugin azure " "--address-prefix 11.0.0.0/16 --subnet-name aks-subnet --subnet-prefix 11.0.0.0/24 -o json" ) vnet = self.cmd( From 8f55fadb4bbff52e8664181a6f17d6a8facee701 Mon Sep 17 00:00:00 2001 From: Akshay Gupta Date: Tue, 21 Jan 2025 16:12:12 +0530 Subject: [PATCH 2/2] move to aks create --- .../azext_aks_preview/tests/latest/test_aks_commands.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py index f1fc40e49ba..336e2177ca2 100644 --- a/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py +++ b/src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py @@ -783,7 +783,6 @@ def test_aks_byo_subnet_with_ingress_appgw_addon( # create virtual network create_vnet = ( "network vnet create --resource-group={resource_group} --name={vnet_name} " - "--network-plugin azure " "--address-prefix 11.0.0.0/16 --subnet-name aks-subnet --subnet-prefix 11.0.0.0/24 -o json" ) vnet = self.cmd( @@ -807,6 +806,7 @@ def test_aks_byo_subnet_with_ingress_appgw_addon( # create aks cluster create_cmd = ( "aks create --resource-group={resource_group} --name={aks_name} --enable-managed-identity " + "--network-plugin azure " "--vnet-subnet-id {vnet_id}/subnets/aks-subnet -a ingress-appgw " "--appgw-name gateway --appgw-subnet-id {vnet_id}/subnets/appgw-subnet " "--yes --ssh-key-value={ssh_key_value} -o json" @@ -859,7 +859,6 @@ def test_aks_byo_appgw_with_ingress_appgw_addon( # create virtual network create_vnet = ( "network vnet create --resource-group={resource_group} --name={vnet_name} " - "--network-plugin azure " "--address-prefix 11.0.0.0/16 --subnet-name aks-subnet --subnet-prefix 11.0.0.0/24 -o json" ) vnet = self.cmd( @@ -928,6 +927,7 @@ def test_aks_byo_appgw_with_ingress_appgw_addon( # create aks cluster create_cmd = ( "aks create -n {aks_name} -g {resource_group} --enable-managed-identity " + "--network-plugin azure " "--vnet-subnet-id {vnet_id}/subnets/aks-subnet " "-a ingress-appgw --appgw-id {appgw_id} --yes " "--ssh-key-value={ssh_key_value} -o json"