Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/aks-preview/azext_aks_preview/_loadbalancer.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ def configure_load_balancer_profile(
if managed_outbound_ip_count is not None:
profile.managed_outbound_i_ps.count = managed_outbound_ip_count
if managed_outbound_ipv6_count is not None:
profile.managed_outbound_i_ps.count_ipv6 = managed_outbound_ipv6_count
profile.managed_outbound_i_ps.count_i_pv6 = managed_outbound_ipv6_count
else:
profile.managed_outbound_i_ps = None

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ interactions:
- AZURECLI/2.53.0 azsdk-python-azure-mgmt-containerservice/28.0.0b Python/3.8.10
(Linux-5.15.0-1051-azure-x86_64-with-glibc2.29)
method: POST
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedclusters/cliakstest000002/abort?api-version=2025-10-02-preview
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002/abort?api-version=2025-10-02-preview
response:
body:
string: "{\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000002\",\n
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

1,863 changes: 977 additions & 886 deletions ...w/tests/latest/recordings/test_aks_nodepool_delete_with_ignore_pod_disruption_budget.yaml
100755 → 100644

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
CONST_NODEPOOL_MODE_SYSTEM,
CONST_NODEPOOL_MODE_USER,
CONST_SCALE_DOWN_MODE_DELETE,
CONST_SCALE_SET_PRIORITY_REGULAR,
CONST_VIRTUAL_MACHINE_SCALE_SETS,
AgentPoolDecoratorMode,
DecoratorMode,
Expand Down Expand Up @@ -1245,6 +1246,7 @@ def test_construct_agentpool_profile_preview(self):
enable_ultra_ssd=False,
enable_fips=False,
mode=CONST_NODEPOOL_MODE_SYSTEM,
scale_set_priority=CONST_SCALE_SET_PRIORITY_REGULAR,
workload_runtime=CONST_WORKLOAD_RUNTIME_OCI_CONTAINER,
network_profile=self.models.AgentPoolNetworkProfile(),
security_profile=ground_truth_security_profile,
Expand Down Expand Up @@ -2012,6 +2014,7 @@ def test_construct_agentpool_profile_preview(self):
enable_fips=False,
mode=CONST_NODEPOOL_MODE_USER,
scale_down_mode=CONST_SCALE_DOWN_MODE_DELETE,
scale_set_priority=CONST_SCALE_SET_PRIORITY_REGULAR,
workload_runtime=CONST_WORKLOAD_RUNTIME_OCI_CONTAINER,
network_profile=self.models.AgentPoolNetworkProfile(),
security_profile=ground_truth_security_profile,
Expand Down Expand Up @@ -2145,6 +2148,7 @@ def test_construct_agentpool_profile_preview(self):
enable_ultra_ssd=False,
enable_fips=False,
mode=CONST_NODEPOOL_MODE_SYSTEM,
scale_set_priority=CONST_SCALE_SET_PRIORITY_REGULAR,
workload_runtime=CONST_WORKLOAD_RUNTIME_OCI_CONTAINER,
network_profile=self.models.AgentPoolNetworkProfile(),
security_profile=ground_truth_security_profile,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10074,7 +10074,7 @@ def test_aks_create_and_update_ipv6_count(
),
self.check("networkProfile.ipFamilies", ["IPv4", "IPv6"]),
self.check(
"networkProfile.loadBalancerProfile.managedOutboundIPs.countIpv6", 2
"networkProfile.loadBalancerProfile.managedOutboundIPs.countIPv6", 2
),
self.check(
"networkProfile.loadBalancerProfile.managedOutboundIPs.count", 1
Expand Down Expand Up @@ -10103,7 +10103,7 @@ def test_aks_create_and_update_ipv6_count(
),
self.check("networkProfile.ipFamilies", ["IPv4", "IPv6"]),
self.check(
"networkProfile.loadBalancerProfile.managedOutboundIPs.countIpv6", 4
"networkProfile.loadBalancerProfile.managedOutboundIPs.countIPv6", 4
),
self.check(
"networkProfile.loadBalancerProfile.managedOutboundIPs.count", 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def test_configure_load_balancer_profile(self):
)

self.assertEqual(p.managed_outbound_i_ps.count, 5)
self.assertEqual(p.managed_outbound_i_ps.count_ipv6, 3)
self.assertEqual(p.managed_outbound_i_ps.count_i_pv6, 3)
self.assertEqual(p.outbound_i_ps, None)
self.assertEqual(p.outbound_ip_prefixes, None)
self.assertEqual(p.allocated_outbound_ports, 80)
Expand All @@ -95,7 +95,7 @@ def test_configure_load_balancer_profile(self):
)

self.assertEqual(p.managed_outbound_i_ps.count, 0)
self.assertEqual(p.managed_outbound_i_ps.count_ipv6, 3)
self.assertEqual(p.managed_outbound_i_ps.count_i_pv6, 3)
self.assertEqual(p.outbound_i_ps, None)
self.assertEqual(p.outbound_ip_prefixes, None)
self.assertEqual(p.allocated_outbound_ports, 80)
Expand Down Expand Up @@ -152,7 +152,7 @@ def test_configure_load_balancer_profile_error(self):
self.load_balancer_models,
)
self.assertEqual(p.managed_outbound_i_ps.count, 5)
self.assertEqual(p.managed_outbound_i_ps.count_ipv6, 3)
self.assertEqual(p.managed_outbound_i_ps.count_i_pv6, 3)
self.assertEqual(
p.outbound_i_ps.public_i_ps,
[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
CONST_PRIVATE_DNS_ZONE_NONE,
CONST_PRIVATE_DNS_ZONE_SYSTEM,
CONST_ROTATION_POLL_INTERVAL,
CONST_SCALE_SET_PRIORITY_REGULAR,
CONST_SECRET_ROTATION_ENABLED,
CONST_VIRTUAL_MACHINE_SCALE_SETS,
CONST_AVAILABILITY_SET,
Expand Down Expand Up @@ -507,7 +508,7 @@ def test_get_load_balancer_managed_outbound_ip_count(self):
)
load_balancer_profile_2 = self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
count=10, count_ipv6=20
count=10, count_i_pv6=20
),
outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileOutboundIPs(
public_i_ps=[
Expand Down Expand Up @@ -548,7 +549,7 @@ def test_get_load_balancer_managed_outbound_ipv6_count(self):
self.assertEqual(ctx_1.get_load_balancer_managed_outbound_ipv6_count(), None)
load_balancer_profile = self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
count_ipv6=10
count_i_pv6=10
)
)
network_profile = self.models.ContainerServiceNetworkProfile(
Expand Down Expand Up @@ -586,7 +587,7 @@ def test_get_load_balancer_managed_outbound_ipv6_count(self):
)
load_balancer_profile_3 = self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
count=10, count_ipv6=20
count=10, count_i_pv6=20
),
outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileOutboundIPs(
public_i_ps=[
Expand Down Expand Up @@ -4678,6 +4679,7 @@ def test_set_up_agentpool_profile(self):
gpu_instance_profile="test_gpu_instance_profile",
workload_runtime=CONST_WORKLOAD_RUNTIME_OCI_CONTAINER,
network_profile=self.models.AgentPoolNetworkProfile(),
scale_set_priority=CONST_SCALE_SET_PRIORITY_REGULAR,
)
ground_truth_mc_1 = self.models.ManagedCluster(location="test_location")
ground_truth_mc_1.agent_pool_profiles = [ground_truth_agentpool_profile_1]
Expand Down Expand Up @@ -4733,7 +4735,7 @@ def test_set_up_network_profile_preview(self):

load_balancer_profile_1 = self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
count_ipv6=3,
count_i_pv6=3,
),
backend_pool_type=CONST_LOAD_BALANCER_BACKEND_POOL_TYPE_NODE_IP,
)
Expand Down Expand Up @@ -6123,6 +6125,7 @@ def test_construct_mc_profile_preview(self):
workload_runtime=CONST_WORKLOAD_RUNTIME_OCI_CONTAINER,
network_profile=self.models.AgentPoolNetworkProfile(),
security_profile=ground_truth_security_profile,
scale_set_priority=CONST_SCALE_SET_PRIORITY_REGULAR,
)
ssh_config_1 = self.models.ContainerServiceSshConfiguration(
public_keys=[self.models.ContainerServiceSshPublicKey(key_data=public_key)]
Expand Down Expand Up @@ -7079,7 +7082,7 @@ def test_update_load_balancer_profile(self):
network_profile=self.models.ContainerServiceNetworkProfile(
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
count=10, count_ipv6=20
count=10, count_i_pv6=20
),
)
),
Expand All @@ -7093,15 +7096,15 @@ def test_update_load_balancer_profile(self):
self.models.ContainerServiceNetworkProfile(
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
count=5, count_ipv6=20
count=5, count_i_pv6=20
),
)
)
),
)
self.assertEqual(dec_mc_4, ground_truth_mc_4)

# custom value - managed outbound ip, count_ipv6 only
# custom value - managed outbound ip, count_i_pv6 only
dec_5 = AKSPreviewManagedClusterUpdateDecorator(
self.cmd,
self.client,
Expand All @@ -7119,7 +7122,7 @@ def test_update_load_balancer_profile(self):
network_profile=self.models.ContainerServiceNetworkProfile(
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
count=10, count_ipv6=20
count=10, count_i_pv6=20
),
)
),
Expand All @@ -7133,7 +7136,7 @@ def test_update_load_balancer_profile(self):
self.models.ContainerServiceNetworkProfile(
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
count=10, count_ipv6=5
count=10, count_i_pv6=5
),
)
)
Expand All @@ -7159,7 +7162,7 @@ def test_update_load_balancer_profile(self):
network_profile=self.models.ContainerServiceNetworkProfile(
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
count=10, count_ipv6=20
count=10, count_i_pv6=20
),
)
),
Expand All @@ -7173,7 +7176,7 @@ def test_update_load_balancer_profile(self):
self.models.ContainerServiceNetworkProfile(
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
count=25, count_ipv6=5
count=25, count_i_pv6=5
),
)
)
Expand All @@ -7198,7 +7201,7 @@ def test_update_load_balancer_profile(self):
network_profile=self.models.ContainerServiceNetworkProfile(
load_balancer_profile=self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
count=3, count_ipv6=2
count=3, count_i_pv6=2
)
)
),
Expand Down Expand Up @@ -7260,7 +7263,7 @@ def test_update_load_balancer_profile(self):

ground_truth_load_balancer_profile_8 = self.models.load_balancer_models.ManagedClusterLoadBalancerProfile(
managed_outbound_i_ps=self.models.load_balancer_models.ManagedClusterLoadBalancerProfileManagedOutboundIPs(
count=10, count_ipv6=5
count=10, count_i_pv6=5
),
)
ground_truth_network_profile_8 = self.models.ContainerServiceNetworkProfile(
Expand Down
Loading
Loading