Merge pull request #3209 from consideRatio/pr/fix-node-exporter-taints

support chart, node-exporter: tolerate 2i2c.org/community tainted nodes
2i2c-org · Oct 2, 2023 · 6223891 · 6223891
2 parents 9390d7b + c02ea84
commit 6223891
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 23 deletions.
diff --git a/docs/howto/features/dedicated-nodepool.md b/docs/howto/features/dedicated-nodepool.md
@@ -54,14 +54,14 @@ Some hubs on shared clusters require dedicated nodepools, for a few reasons:
 
    ```yaml
    jupyterhub:
-      singleuser:
-         nodeSelector:
-            2i2c.org/community: <community-name>
-         extraTolerations:
-            - key: "2i2c.org/community"
-              operator: "Equal"
-              value: "<community-name>"
-              effect: "NoSchedule"
+     singleuser:
+       nodeSelector:
+         2i2c.org/community: <community-name>
+       extraTolerations:
+         - key: 2i2c.org/community
+           operator: Equal
+           value: <community-name>
+           effect: NoSchedule
    ```
 
    ```{note}

diff --git a/helm-charts/support/values.yaml b/helm-charts/support/values.yaml
@@ -85,21 +85,6 @@ prometheus:
   # values ref: https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus-node-exporter/values.yaml
   #
   prometheus-node-exporter:
-    tolerations:
-      # Tolerate tainted jupyterhub user nodes
-      - key: hub.jupyter.org_dedicated
-        value: user
-        effect: NoSchedule
-      - key: hub.jupyter.org/dedicated
-        value: user
-        effect: NoSchedule
-      # Tolerate tainted dask worker nodes
-      - key: k8s.dask.org_dedicated
-        value: worker
-        effect: NoSchedule
-      - key: k8s.dask.org/dedicated
-        value: worker
-        effect: NoSchedule
     # resources for the node-exporter was set after inspecting cpu and memory
     # use via prometheus and grafana.
     #