Merge pull request #11568 from VannTen/cleanup/dont_rely_on_kube_node_existing

Only require minimum structure in inventory, part II

roles/kubernetes-apps/metrics_server/defaults/main.yml

@@ -9,6 +9,6 @@ metrics_server_requests_cpu: 100m
 metrics_server_requests_memory: 200Mi
 metrics_server_host_network: false
 metrics_server_replicas: 1
-# metrics_server_extra_tolerations: []
-# metrics_server_extra_affinity: {}
-# metrics_server_nodeselector: {}
+metrics_server_extra_tolerations: []
+metrics_server_extra_affinity: {}
+metrics_server_nodeselector: {}

roles/kubernetes-apps/metrics_server/tasks/main.yml

@@ -1,9 +1,4 @@
 ---
-# If all control plane nodes have the node role, there are no tainted control plane nodes and toleration should not be specified.
-- name: Check all control plane nodes are node or not
-  set_fact:
-    control_plane_nodes_are_not_tainted: "{{ groups['kube_node'] | intersect(groups['kube_control_plane']) == groups['kube_control_plane'] }}"
-
 - name: Metrics Server | Delete addon dir
   file:
     path: "{{ kube_config_dir }}/addons/metrics_server"

roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2

@@ -85,16 +85,12 @@ spec:
       volumes:
         - name: tmp
           emptyDir: {}
-{% if not control_plane_nodes_are_not_tainted or metrics_server_extra_tolerations is defined %}
       tolerations:
-{% if not control_plane_nodes_are_not_tainted %}
         - key: node-role.kubernetes.io/control-plane
           effect: NoSchedule
-{% endif %}
-{% if metrics_server_extra_tolerations is defined %}
+{% if metrics_server_extra_tolerations %}
         {{ metrics_server_extra_tolerations | list | to_nice_yaml(indent=2) | indent(8) }}
-{% endif %}
-{% endif %}
+{%- endif %}
       affinity:
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
@@ -109,10 +105,10 @@ spec:
               topologyKey: kubernetes.io/hostname
               namespaces:
               - kube-system
-{% if metrics_server_extra_affinity is defined %}
-        {{ metrics_server_extra_affinity | to_nice_yaml | indent(width=8) }}
-{% endif %}
-{% if metrics_server_nodeselector is defined %}
+{% if metrics_server_extra_affinity  %}
+        {{ metrics_server_extra_affinity | to_nice_yaml(indent=2) | indent(8) }}
+{%- endif %}
+{% if metrics_server_nodeselector %}
       nodeSelector:
-        {{ metrics_server_nodeselector | to_nice_yaml | indent(width=8) }}
-{% endif %}
+        {{ metrics_server_nodeselector | to_nice_yaml(indent=2) | indent(8) }}
+{%- endif %}