LocalDNS - Add more Live Test Cases

src/aks-preview/HISTORY.rst

@@ -19,6 +19,7 @@ Pending
 * 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/_helpers.py

@@ -448,3 +448,19 @@ def get_extension_in_allow_list(result):
     if _check_if_extension_type_is_in_allow_list(result.extension_type.lower()):
         return result
     return None
+
+
+def process_dns_overrides(overrides_dict, target_dict, build_override_func):
+    """Helper function to safely process DNS overrides with null checks.
+
+    Processes DNS override dictionaries from LocalDNS configuration,
+    filtering out null values and applying the build function to valid entries.
+
+    :param overrides_dict: Dictionary containing DNS overrides (can be None)
+    :param target_dict: Target dictionary to populate with processed overrides
+    :param build_override_func: Function to build override objects from dict values
+    """
+    if overrides_dict is not None:
+        for key, value in overrides_dict.items():
+            if value is not None:
+                target_dict[key] = build_override_func(value)

src/aks-preview/azext_aks_preview/agentpool_decorator.py

@@ -50,6 +50,7 @@
 from azext_aks_preview._helpers import (
     get_nodepool_snapshot_by_snapshot_id,
     filter_hard_taints,
+    process_dns_overrides,
 )
 
 logger = get_logger(__name__)
@@ -1477,13 +1478,16 @@ def build_override(override_dict):
                 return self.models.LocalDNSOverride(**filtered)
 
             # 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)
-
-            vnet_overrides = localdns_profile.get("vnetDNSOverrides")
-            for key, value in vnet_overrides.items():
-                vnet_dns_overrides[key] = build_override(value)
+            process_dns_overrides(
+                localdns_profile.get("kubeDNSOverrides"),
+                kube_dns_overrides,
+                build_override
+            )
+            process_dns_overrides(
+                localdns_profile.get("vnetDNSOverrides"),
+                vnet_dns_overrides,
+                build_override
+            )
 
             agentpool.local_dns_profile = self.models.LocalDNSProfile(
                 mode=localdns_profile.get("mode"),
@@ -1816,13 +1820,16 @@ def build_override(override_dict):
                 return self.models.LocalDNSOverride(**filtered)
 
             # 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)
-
-            vnet_overrides = localdns_profile.get("vnetDNSOverrides")
-            for key, value in vnet_overrides.items():
-                vnet_dns_overrides[key] = build_override(value)
+            process_dns_overrides(
+                localdns_profile.get("kubeDNSOverrides"),
+                kube_dns_overrides,
+                build_override
+            )
+            process_dns_overrides(
+                localdns_profile.get("vnetDNSOverrides"),
+                vnet_dns_overrides,
+                build_override
+            )
 
             agentpool.local_dns_profile = self.models.LocalDNSProfile(
                 mode=localdns_profile.get("mode"),

src/aks-preview/azext_aks_preview/tests/latest/data/localdnsconfig/defaulted_overrides_config.json

@@ -0,0 +1,46 @@
+{
+   "kubeDNSOverrides": {
+      ".": {
+         "cacheDurationInSeconds": 3600,
+         "forwardDestination": "ClusterCoreDNS",
+         "forwardPolicy": "Sequential",
+         "maxConcurrent": 1000,
+         "protocol": "PreferUDP",
+         "queryLogging": "Error",
+         "serveStale": "Immediate",
+         "serveStaleDurationInSeconds": 3600
+      },
+      "cluster.local": {
+         "cacheDurationInSeconds": 3600,
+         "forwardDestination": "ClusterCoreDNS",
+         "forwardPolicy": "Sequential",
+         "maxConcurrent": 1000,
+         "protocol": "ForceTCP",
+         "queryLogging": "Error",
+         "serveStale": "Immediate",
+         "serveStaleDurationInSeconds": 3600
+      }
+   },
+   "vnetDNSOverrides": {
+      ".": {
+         "cacheDurationInSeconds": 3600,
+         "forwardDestination": "VnetDNS",
+         "forwardPolicy": "Sequential",
+         "maxConcurrent": 1000,
+         "protocol": "PreferUDP",
+         "queryLogging": "Error",
+         "serveStale": "Immediate",
+         "serveStaleDurationInSeconds": 3600
+      },
+      "cluster.local": {
+         "cacheDurationInSeconds": 3600,
+         "forwardDestination": "ClusterCoreDNS",
+         "forwardPolicy": "Sequential",
+         "maxConcurrent": 1000,
+         "protocol": "ForceTCP",
+         "queryLogging": "Error",
+         "serveStale": "Immediate",
+         "serveStaleDurationInSeconds": 3600
+      }
+   }
+}

src/aks-preview/azext_aks_preview/tests/latest/data/localdnsconfig/disabled_mode_only.json

@@ -0,0 +1,3 @@
+{
+  "mode": "Disabled"
+}

src/aks-preview/azext_aks_preview/tests/latest/data/localdnsconfig/empty.json

@@ -0,0 +1 @@
+{}

src/aks-preview/azext_aks_preview/tests/latest/data/localdnsconfig/empty_mode.json

@@ -0,0 +1,3 @@
+{
+  "mode": ""
+}

src/aks-preview/azext_aks_preview/tests/latest/data/localdnsconfig/invalid_mode.json

@@ -0,0 +1,3 @@
+{
+  "mode": "InvalidMode"
+}

src/aks-preview/azext_aks_preview/tests/latest/data/localdnsconfig.json → src/aks-preview/azext_aks_preview/tests/latest/data/localdnsconfig/localdnsconfig.json

@@ -44,4 +44,4 @@
       "serveStaleDurationInSeconds": 3600
     }
   }
-}
+}

src/aks-preview/azext_aks_preview/tests/latest/data/localdnsconfig/missing_mode.json

@@ -0,0 +1,26 @@
+{
+  "kubeDnsOverrides": {
+    ".": {
+      "cacheDurationInSeconds": 3600,
+      "forwardDestination": "ClusterCoreDNS",
+      "forwardPolicy": "Sequential",
+      "maxConcurrent": 1000,
+      "protocol": "PreferUDP",
+      "queryLogging": "Error",
+      "serveStale": "Verify",
+      "serveStaleDurationInSeconds": 3600
+    }
+  },
+  "vnetDnsOverrides": {
+    ".": {
+      "cacheDurationInSeconds": 3600,
+      "forwardDestination": "VnetDNS",
+      "forwardPolicy": "Sequential",
+      "maxConcurrent": 1000,
+      "protocol": "PreferUDP",
+      "queryLogging": "Error",
+      "serveStale": "Verify",
+      "serveStaleDurationInSeconds": 3600
+    }
+  }
+}

src/aks-preview/azext_aks_preview/tests/latest/data/localdnsconfig/null_mode.json

@@ -0,0 +1,3 @@
+{
+  "mode": null
+}

src/aks-preview/azext_aks_preview/tests/latest/data/localdnsconfig/required_mode_empty_overrides.json

@@ -0,0 +1,5 @@
+{
+  "mode": "Required",
+  "kubeDnsOverrides": {},
+  "vnetDnsOverrides": {}
+}

src/aks-preview/azext_aks_preview/tests/latest/data/localdnsconfig/required_mode_extra_property.json

@@ -0,0 +1,16 @@
+{
+  "mode": "Required",
+  "extraProperty": "unexpected",
+  "kubeDnsOverrides": {
+    ".": {
+      "cacheDurationInSeconds": 3600,
+      "forwardDestination": "ClusterCoreDNS",
+      "forwardPolicy": "Sequential",
+      "maxConcurrent": 1000,
+      "protocol": "PreferUDP",
+      "queryLogging": "Error",
+      "serveStale": "Verify",
+      "serveStaleDurationInSeconds": 3600
+    }
+  }
+}

src/aks-preview/azext_aks_preview/tests/latest/data/localdnsconfig/required_mode_invalid_kubedns.json

@@ -0,0 +1,8 @@
+{
+  "mode": "Required",
+  "kubeDnsOverrides": {
+    ".": {
+      "invalidField": 123
+    }
+  }
+}

src/aks-preview/azext_aks_preview/tests/latest/data/localdnsconfig/required_mode_invalid_vnetdns.json

@@ -0,0 +1,8 @@
+{
+  "mode": "Required",
+  "vnetDnsOverrides": {
+    ".": {
+      "invalidField": 456
+    }
+  }
+}

src/aks-preview/azext_aks_preview/tests/latest/data/localdnsconfig/required_mode_only.json

@@ -0,0 +1,3 @@
+{
+  "mode": "Required"
+}

src/aks-preview/azext_aks_preview/tests/latest/data/localdnsconfig/required_mode_partial_invalid.json

@@ -0,0 +1,18 @@
+{
+  "mode": "Required",
+  "kubeDnsOverrides": {
+    ".": {
+      "cacheDurationInSeconds": 3600,
+      "forwardDestination": "ClusterCoreDNS",
+      "forwardPolicy": "Sequential",
+      "maxConcurrent": 1000,
+      "protocol": "PreferUDP",
+      "queryLogging": "Error",
+      "serveStale": "Verify",
+      "serveStaleDurationInSeconds": 3600
+    }
+  },
+  "vnetDnsOverrides": {
+    ".": "invalid"
+  }
+}

src/aks-preview/azext_aks_preview/tests/latest/data/localdnsconfig/required_mode_with_valid_kubedns.json

@@ -0,0 +1,25 @@
+{
+  "mode": "Required",
+  "kubeDnsOverrides": {
+    ".": {
+      "cacheDurationInSeconds": 3600,
+      "forwardDestination": "ClusterCoreDNS",
+      "forwardPolicy": "Sequential",
+      "maxConcurrent": 1000,
+      "protocol": "PreferUDP",
+      "queryLogging": "Error",
+      "serveStale": "Verify",
+      "serveStaleDurationInSeconds": 3600
+    },
+    "cluster.local": {
+      "cacheDurationInSeconds": 3600,
+      "forwardDestination": "ClusterCoreDNS",
+      "forwardPolicy": "Sequential",
+      "maxConcurrent": 1000,
+      "protocol": "ForceTCP",
+      "queryLogging": "Error",
+      "serveStale": "Immediate",
+      "serveStaleDurationInSeconds": 3600
+    }
+  }
+}

src/aks-preview/azext_aks_preview/tests/latest/data/localdnsconfig/required_mode_with_valid_vnetdns.json

@@ -0,0 +1,25 @@
+{
+  "mode": "Required",
+  "vnetDnsOverrides": {
+    ".": {
+      "cacheDurationInSeconds": 3600,
+      "forwardDestination": "VnetDNS",
+      "forwardPolicy": "Sequential",
+      "maxConcurrent": 1000,
+      "protocol": "PreferUDP",
+      "queryLogging": "Error",
+      "serveStale": "Verify",
+      "serveStaleDurationInSeconds": 3600
+    },
+    "cluster.local": {
+      "cacheDurationInSeconds": 3600,
+      "forwardDestination": "ClusterCoreDNS",
+      "forwardPolicy": "Sequential",
+      "maxConcurrent": 1000,
+      "protocol": "ForceTCP",
+      "queryLogging": "Error",
+      "serveStale": "Immediate",
+      "serveStaleDurationInSeconds": 3600
+    }
+  }
+}