From 2907936c8520b603a395bc7784375185cca6e817 Mon Sep 17 00:00:00 2001
From: ChengHao Yang <17496418+tico88612@users.noreply.github.com>
Date: Sat, 26 Apr 2025 13:16:54 +0800
Subject: [PATCH 1/2] Feat: add dns_autoscaler_affinity remove in-place values

Upstream has removed affinity, and fix upgrade failing test.

Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com>
---
 roles/kubernetes-apps/ansible/defaults/main.yml  |  1 +
 .../ansible/templates/dns-autoscaler.yml.j2      | 16 +---------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/roles/kubernetes-apps/ansible/defaults/main.yml b/roles/kubernetes-apps/ansible/defaults/main.yml
index 88cf81e1d..6c7b63816 100644
--- a/roles/kubernetes-apps/ansible/defaults/main.yml
+++ b/roles/kubernetes-apps/ansible/defaults/main.yml
@@ -65,6 +65,7 @@ dns_autoscaler_cpu_requests: 20m
 dns_autoscaler_memory_requests: 10Mi
 dns_autoscaler_deployment_nodeselector: "kubernetes.io/os: linux"
 # dns_autoscaler_extra_tolerations: [{effect: NoSchedule, operator: "Exists"}]
+dns_autoscaler_affinity: {}
 
 # etcd metrics
 # etcd_metrics_service_labels:
diff --git a/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2 b/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
index c10ebf97f..0f8afce7d 100644
--- a/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
@@ -48,21 +48,7 @@ spec:
         {{ dns_autoscaler_extra_tolerations | list | to_nice_yaml(indent=2) | indent(8) }}
 {% endif %}
       affinity:
-        podAntiAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - topologyKey: "kubernetes.io/hostname"
-            labelSelector:
-              matchLabels:
-                k8s-app: dns-autoscaler{{ coredns_ordinal_suffix }}
-        nodeAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
-            preference:
-              matchExpressions:
-              - key: node-role.kubernetes.io/control-plane
-                operator: In
-                values:
-                - ""
+        {{ dns_autoscaler_affinity | to_nice_yaml(indent=2) | indent(8) }}
       containers:
       - name: autoscaler
         image: "{{ dnsautoscaler_image_repo }}:{{ dnsautoscaler_image_tag }}"

From 1374a9778728d5a370c13b98cc7974cc4b81f847 Mon Sep 17 00:00:00 2001
From: ChengHao Yang <17496418+tico88612@users.noreply.github.com>
Date: Sun, 4 May 2025 00:23:05 +0800
Subject: [PATCH 2/2] Test: ubuntu22-calico-all-in-one-upgrade disable dns
 autoscaler

Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com>
---
 tests/files/ubuntu22-calico-all-in-one-upgrade.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/files/ubuntu22-calico-all-in-one-upgrade.yml b/tests/files/ubuntu22-calico-all-in-one-upgrade.yml
index ff157b241..0f8a83d25 100644
--- a/tests/files/ubuntu22-calico-all-in-one-upgrade.yml
+++ b/tests/files/ubuntu22-calico-all-in-one-upgrade.yml
@@ -11,6 +11,9 @@ auto_renew_certificates: true
 kube_proxy_mode: iptables
 enable_nodelocaldns: false
 
+# Single node don't need the DNS autoscaler
+enable_dns_autoscaler: false
+
 containerd_registries_mirrors:
   - prefix: docker.io
     mirrors: