(dev-v2.6-archive) Add NoExecute + NoSchedule toleration to PushProx

This commit adds NoExecute / NoSchedule tolerations by default to all of the
PushProx exporters since the default expectation when deploying these exporters
is that they are deployed on the expected nodes based on nodeSelector labels
regardless of any taints added to those nodes.

Users can always choose to override these settings if necessary.

(partially cherry picked from commit 215cf10a68)

packages/rancher-monitoring/rancher-monitoring.patch

@@ -1317,7 +1317,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem
 diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/values.yaml packages/rancher-monitoring/charts/values.yaml
 --- packages/rancher-monitoring/charts-original/values.yaml
 +++ packages/rancher-monitoring/charts/values.yaml
-@@ -2,13 +2,180 @@
+@@ -2,13 +2,207 @@
  # This is a YAML-formatted file.
  # Declare variables to be passed into your templates.
  
@@ -1345,6 +1345,8 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
 +    nodeSelector:
 +      node-role.kubernetes.io/controlplane: "true"
 +    tolerations:
++    - effect: "NoExecute"
++      operator: "Exists"
 +    - effect: "NoSchedule"
 +      operator: "Exists"
 +
@@ -1357,6 +1359,8 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
 +    nodeSelector:
 +      node-role.kubernetes.io/controlplane: "true"
 +    tolerations:
++    - effect: "NoExecute"
++      operator: "Exists"
 +    - effect: "NoSchedule"
 +      operator: "Exists"
 +
@@ -1368,6 +1372,8 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
 +    port: 10013
 +    useLocalhost: true
 +    tolerations:
++    - effect: "NoExecute"
++      operator: "Exists"
 +    - effect: "NoSchedule"
 +      operator: "Exists"
 +
@@ -1388,6 +1394,8 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
 +    tolerations:
 +    - effect: "NoExecute"
 +      operator: "Exists"
++    - effect: "NoSchedule"
++      operator: "Exists"
 +
 +## k3s PushProx Monitoring
 +## ref: https://github.com/rancher/charts/tree/master/packages/rancher-pushprox
@@ -1400,6 +1408,11 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
 +    port: 10011
 +    nodeSelector:
 +      node-role.kubernetes.io/master: "true"
++    tolerations:
++    - effect: "NoExecute"
++      operator: "Exists"
++    - effect: "NoSchedule"
++      operator: "Exists"
 +
 +k3sScheduler:
 +  enabled: false
@@ -1409,6 +1422,11 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
 +    port: 10012
 +    nodeSelector:
 +      node-role.kubernetes.io/master: "true"
++    tolerations:
++    - effect: "NoExecute"
++      operator: "Exists"
++    - effect: "NoSchedule"
++      operator: "Exists"
 +
 +k3sProxy:
 +  enabled: false
@@ -1417,6 +1435,11 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
 +  clients:
 +    port: 10013
 +    useLocalhost: true
++    tolerations:
++    - effect: "NoExecute"
++      operator: "Exists"
++    - effect: "NoSchedule"
++      operator: "Exists"
 +
 +## KubeADM PushProx Monitoring
 +## ref: https://github.com/rancher/charts/tree/master/packages/rancher-pushprox
@@ -1435,8 +1458,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
 +    nodeSelector:
 +      node-role.kubernetes.io/master: ""
 +    tolerations:
++    - effect: "NoExecute"
++      operator: "Exists"
 +    - effect: "NoSchedule"
-+      key: node-role.kubernetes.io/master
 +      operator: "Exists"
 +
 +kubeAdmScheduler:
@@ -1453,9 +1477,10 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
 +    nodeSelector:
 +      node-role.kubernetes.io/master: ""
 +    tolerations:
++    - effect: "NoExecute"
++      operator: "Exists"
 +    - effect: "NoSchedule"
-+      key: node-role.kubernetes.io/master
-+      operator: "Equal"
++      operator: "Exists"
 +
 +kubeAdmProxy:
 +  enabled: false
@@ -1465,9 +1490,10 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
 +    port: 10013
 +    useLocalhost: true
 +    tolerations:
++    - effect: "NoExecute"
++      operator: "Exists"
 +    - effect: "NoSchedule"
-+      key: node-role.kubernetes.io/master
-+      operator: "Equal"
++      operator: "Exists"
 +
 +kubeAdmEtcd:
 +  enabled: false
@@ -1479,9 +1505,10 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
 +    nodeSelector:
 +      node-role.kubernetes.io/master: ""
 +    tolerations:
++    - effect: "NoExecute"
++      operator: "Exists"
 +    - effect: "NoSchedule"
-+      key: node-role.kubernetes.io/master
-+      operator: "Equal"
++      operator: "Exists"
 +
 +
 +# Prometheus Operator Configuration
@@ -1500,7 +1527,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
  
  ## Provide a k8s version to auto dashboard import script example: kubeTargetVersionOverride: 1.16.6
  ##
-@@ -77,7 +244,16 @@
+@@ -77,7 +271,16 @@
  ##
  global:
    rbac:
@@ -1517,7 +1544,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
      pspEnabled: true
      pspAnnotations: {}
        ## Specify pod annotations
-@@ -102,7 +278,7 @@
+@@ -102,7 +305,7 @@
  
    ## Deploy alertmanager
    ##
@@ -1526,7 +1553,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
  
    ## Api that prometheus will use to communicate with alertmanager. Possible values are v1, v2
    ##
-@@ -409,9 +585,13 @@
+@@ -409,9 +612,13 @@
      ## Define resources requests and limits for single Pods.
      ## ref: https://kubernetes.io/docs/user-guide/compute-resources/
      ##
@@ -1543,7 +1570,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
  
      ## Pod anti-affinity can prevent the scheduler from placing Prometheus replicas on the same node.
      ## The default value "soft" means that the scheduler should *prefer* to not schedule two replica pods onto the same node but no guarantee is provided.
-@@ -529,6 +709,7 @@
+@@ -529,6 +736,7 @@
      dashboards:
        enabled: true
        label: grafana_dashboard
@@ -1551,7 +1578,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
  
        ## Annotations for Grafana dashboard configmaps
        ##
-@@ -547,6 +728,7 @@
+@@ -547,6 +755,7 @@
        ## ref: https://git.io/fjaBS
        createPrometheusReplicasDatasources: false
        label: grafana_datasource
@@ -1559,7 +1586,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
  
    extraConfigmapMounts: []
    # - name: certs-configmap
-@@ -574,6 +756,19 @@
+@@ -574,6 +783,19 @@
    ##
    service:
      portName: service
@@ -1579,7 +1606,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
  
    ## If true, create a serviceMonitor for grafana
    ##
-@@ -599,6 +794,14 @@
+@@ -599,6 +821,14 @@
      #   targetLabel: nodename
      #   replacement: $1
      #   action: replace
@@ -1594,7 +1621,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
  
  ## Component scraping the kube api server
  ##
-@@ -755,7 +958,7 @@
+@@ -755,7 +985,7 @@
  ## Component scraping the kube controller manager
  ##
  kubeControllerManager:
@@ -1603,7 +1630,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
  
    ## If your kube controller manager is not deployed as a pod, specify IPs it can be found on
    ##
-@@ -888,7 +1091,7 @@
+@@ -888,7 +1118,7 @@
  ## Component scraping etcd
  ##
  kubeEtcd:
@@ -1612,7 +1639,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
  
    ## If your etcd is not deployed as a pod, specify IPs it can be found on
    ##
-@@ -948,7 +1151,7 @@
+@@ -948,7 +1178,7 @@
  ## Component scraping kube scheduler
  ##
  kubeScheduler:
@@ -1621,7 +1648,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
  
    ## If your kube scheduler is not deployed as a pod, specify IPs it can be found on
    ##
-@@ -1001,7 +1204,7 @@
+@@ -1001,7 +1231,7 @@
  ## Component scraping kube proxy
  ##
  kubeProxy:
@@ -1630,7 +1657,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
  
    ## If your kube proxy is not deployed as a pod, specify IPs it can be found on
    ##
-@@ -1075,6 +1278,13 @@
+@@ -1075,6 +1305,13 @@
      create: true
    podSecurityPolicy:
      enabled: true
@@ -1644,7 +1671,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
  
  ## Deploy node exporter as a daemonset to all nodes
  ##
-@@ -1124,6 +1334,16 @@
+@@ -1124,6 +1361,16 @@
    extraArgs:
      - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+)($|/)
      - --collector.filesystem.ignored-fs-types=^(autofs|binfmt_misc|cgroup|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|mqueue|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|sysfs|tracefs)$
@@ -1661,7 +1688,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
  
  ## Manages Prometheus and Alertmanager components
  ##
-@@ -1280,13 +1500,13 @@
+@@ -1280,13 +1527,13 @@
  
    ## Resource limits & requests
    ##
@@ -1682,7 +1709,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
  
    # Required for use in managed kubernetes clusters (such as AWS EKS) with custom CNI (such as calico),
    # because control-plane managed by AWS cannot communicate with pods' IP CIDR and admission webhooks are not working
-@@ -1628,6 +1848,11 @@
+@@ -1628,6 +1875,11 @@
      ##
      externalUrl: ""
  
@@ -1694,7 +1721,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
      ## Define which Nodes the Pods are scheduled on.
      ## ref: https://kubernetes.io/docs/user-guide/node-selection/
      ##
-@@ -1802,9 +2027,13 @@
+@@ -1802,9 +2054,13 @@
  
      ## Resource limits & requests
      ##