Skip to content

Commit 19c6404

Browse files
author
juanbe
committed
refactor to process dns overrides func
1 parent c044f0e commit 19c6404

File tree

1 file changed

+27
-22
lines changed

1 file changed

+27
-22
lines changed

src/aks-preview/azext_aks_preview/agentpool_decorator.py

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1448,6 +1448,13 @@ def set_up_managed_system_mode(self, agentpool: AgentPool) -> AgentPool:
14481448

14491449
return agentpool
14501450

1451+
def _process_dns_overrides(self, overrides_dict, target_dict, build_override_func):
1452+
"""Helper method to safely process DNS overrides with null checks."""
1453+
if overrides_dict is not None:
1454+
for key, value in overrides_dict.items():
1455+
if value is not None:
1456+
target_dict[key] = build_override_func(value)
1457+
14511458
def set_up_localdns_profile(self, agentpool: AgentPool) -> AgentPool:
14521459
"""Set up local DNS profile for the AgentPool object if provided via --localdns-config."""
14531460
self._ensure_agentpool(agentpool)
@@ -1477,17 +1484,16 @@ def build_override(override_dict):
14771484
return self.models.LocalDNSOverride(**filtered)
14781485

14791486
# Build kubeDNSOverrides and vnetDNSOverrides from the localdns_profile
1480-
kube_overrides = localdns_profile.get("kubeDNSOverrides")
1481-
if kube_overrides is not None:
1482-
for key, value in kube_overrides.items():
1483-
if value is not None:
1484-
kube_dns_overrides[key] = build_override(value)
1485-
1486-
vnet_overrides = localdns_profile.get("vnetDNSOverrides")
1487-
if vnet_overrides is not None:
1488-
for key, value in vnet_overrides.items():
1489-
if value is not None:
1490-
vnet_dns_overrides[key] = build_override(value)
1487+
self._process_dns_overrides(
1488+
localdns_profile.get("kubeDNSOverrides"),
1489+
kube_dns_overrides,
1490+
build_override
1491+
)
1492+
self._process_dns_overrides(
1493+
localdns_profile.get("vnetDNSOverrides"),
1494+
vnet_dns_overrides,
1495+
build_override
1496+
)
14911497

14921498
agentpool.local_dns_profile = self.models.LocalDNSProfile(
14931499
mode=localdns_profile.get("mode"),
@@ -1820,17 +1826,16 @@ def build_override(override_dict):
18201826
return self.models.LocalDNSOverride(**filtered)
18211827

18221828
# Build kubeDNSOverrides and vnetDNSOverrides from the localdns_profile
1823-
kube_overrides = localdns_profile.get("kubeDNSOverrides")
1824-
if kube_overrides is not None:
1825-
for key, value in kube_overrides.items():
1826-
if value is not None:
1827-
kube_dns_overrides[key] = build_override(value)
1828-
1829-
vnet_overrides = localdns_profile.get("vnetDNSOverrides")
1830-
if vnet_overrides is not None:
1831-
for key, value in vnet_overrides.items():
1832-
if value is not None:
1833-
vnet_dns_overrides[key] = build_override(value)
1829+
self._process_dns_overrides(
1830+
localdns_profile.get("kubeDNSOverrides"),
1831+
kube_dns_overrides,
1832+
build_override
1833+
)
1834+
self._process_dns_overrides(
1835+
localdns_profile.get("vnetDNSOverrides"),
1836+
vnet_dns_overrides,
1837+
build_override
1838+
)
18341839

18351840
agentpool.local_dns_profile = self.models.LocalDNSProfile(
18361841
mode=localdns_profile.get("mode"),

0 commit comments

Comments
 (0)