metrics_server: add extras nodeselector, affinity, tolerations

kubernetes-sigs · Apr 12, 2023 · c9a4ee6 · c9a4ee6
1 parent c38cf5d
commit c9a4ee6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/roles/kubernetes-apps/metrics_server/defaults/main.yml b/roles/kubernetes-apps/metrics_server/defaults/main.yml
@@ -9,3 +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: {}
diff --git a/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2 b/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
@@ -84,12 +84,15 @@ spec:
       volumes:
         - name: tmp
           emptyDir: {}
-{% if not masters_are_not_tainted %}
       tolerations:
+{% if not masters_are_not_tainted %}
         - key: node-role.kubernetes.io/master
           effect: NoSchedule
         - key: node-role.kubernetes.io/control-plane
           effect: NoSchedule
+{% endif %}
+{% if metrics_server_extra_tolerations is defined %}
+        {{ metrics_server_extra_tolerations | list | to_nice_yaml(indent=2) | indent(8) }}
 {% endif %}
       affinity:
         podAntiAffinity:
@@ -105,3 +108,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 %}
+      nodeSelector:
+        {{ metrics_server_nodeselector | to_nice_yaml | indent(width=8) }}
+{% endif %}