Skip none overrides on localdns profile

src/aks-preview/HISTORY.rst

@@ -11,10 +11,14 @@ To release a new version, please select a new version number (usually plus 1 to
 
 Pending
 +++++++
+
+18.0.0b39
++++++++
 * Add machine command `az aks machine add` to add a machine to an existing machine pool.
 * Add blue-green upgrade strategy support for AKS node pools:
   - `az aks nodepool add/update/upgrade`: Add `--upgrade-strategy` parameter to switch between rolling and blue-green nodepool upgrades. 
   - `az aks nodepool add/update/upgrade`: Add `--drain-batch-size`, `--drain-timeout-bg`, `--batch-soak-duration`, `--final-soak-duration` parameters to configure blue-green upgrade settings.
+* Fix `--localdns-config` parameter to handle null values in JSON configuration files gracefully, preventing crashes when DNS override sections are null.
 
 18.0.0b38
 +++++++

src/aks-preview/azext_aks_preview/agentpool_decorator.py

@@ -1478,12 +1478,16 @@ def build_override(override_dict):
 
             # Build kubeDNSOverrides and vnetDNSOverrides from the localdns_profile
             kube_overrides = localdns_profile.get("kubeDNSOverrides")
-            for key, value in kube_overrides.items():
-                kube_dns_overrides[key] = build_override(value)
+            if kube_overrides is not None:
+                for key, value in kube_overrides.items():
+                    if value is not None:
+                        kube_dns_overrides[key] = build_override(value)
 
             vnet_overrides = localdns_profile.get("vnetDNSOverrides")
-            for key, value in vnet_overrides.items():
-                vnet_dns_overrides[key] = build_override(value)
+            if vnet_overrides is not None:
+                for key, value in vnet_overrides.items():
+                    if value is not None:
+                        vnet_dns_overrides[key] = build_override(value)
 
             agentpool.local_dns_profile = self.models.LocalDNSProfile(
                 mode=localdns_profile.get("mode"),
@@ -1817,12 +1821,16 @@ def build_override(override_dict):
 
             # Build kubeDNSOverrides and vnetDNSOverrides from the localdns_profile
             kube_overrides = localdns_profile.get("kubeDNSOverrides")
-            for key, value in kube_overrides.items():
-                kube_dns_overrides[key] = build_override(value)
+            if kube_overrides is not None:
+                for key, value in kube_overrides.items():
+                    if value is not None:
+                        kube_dns_overrides[key] = build_override(value)
 
             vnet_overrides = localdns_profile.get("vnetDNSOverrides")
-            for key, value in vnet_overrides.items():
-                vnet_dns_overrides[key] = build_override(value)
+            if vnet_overrides is not None:
+                for key, value in vnet_overrides.items():
+                    if value is not None:
+                        vnet_dns_overrides[key] = build_override(value)
 
             agentpool.local_dns_profile = self.models.LocalDNSProfile(
                 mode=localdns_profile.get("mode"),

src/aks-preview/setup.py

@@ -9,7 +9,7 @@
 
 from setuptools import find_packages, setup
 
-VERSION = "18.0.0b38"
+VERSION = "18.0.0b39"
 
 CLASSIFIERS = [
     "Development Status :: 4 - Beta",