From 4dc8ac280d94d4d3271045d0469a481cad7f167c Mon Sep 17 00:00:00 2001 From: Arvind Iyengar Date: Mon, 24 May 2021 09:34:37 -0700 Subject: [PATCH] (dev-v2.6-archive) Merge pull request #1224 from aiyengar2/fix_rke_2_etcd_default_2_6 [2.6] Add NoExecute toleration to rke2Etcd and remove key (partially cherry picked from commit 9c5c1c5ef3dd54f55fbb86e1b2dd3a3d9fa95053) --- .../generated-changes/patch/values.yaml.patch | 73 ++++++++++--------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/packages/rancher-monitoring/generated-changes/patch/values.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/values.yaml.patch index 1bc32dd5d..d5964fc41 100644 --- a/packages/rancher-monitoring/generated-changes/patch/values.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/values.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/values.yaml +++ charts/values.yaml -@@ -2,13 +2,278 @@ +@@ -2,13 +2,279 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. @@ -225,9 +225,10 @@ + nodeSelector: + node-role.kubernetes.io/etcd: "true" + tolerations: ++ - effect: "NoExecute" ++ operator: "Exists" + - effect: "NoSchedule" -+ key: node-role.kubernetes.io/master -+ operator: "Equal" ++ operator: "Exists" + +## Component scraping nginx-ingress-controller +## @@ -281,7 +282,7 @@ ## Provide a k8s version to auto dashboard import script example: kubeTargetVersionOverride: 1.16.6 ## -@@ -89,8 +354,32 @@ +@@ -89,8 +355,32 @@ ## global: @@ -314,7 +315,7 @@ pspEnabled: true pspAnnotations: {} ## Specify pod annotations -@@ -143,6 +432,22 @@ +@@ -143,6 +433,22 @@ ## ref: https://prometheus.io/docs/alerting/configuration/#configuration-file ## https://prometheus.io/webtools/alerting/routing-tree-editor/ ## @@ -337,7 +338,7 @@ config: global: resolve_timeout: 5m -@@ -179,25 +484,76 @@ +@@ -179,25 +485,76 @@ ## ref: https://prometheus.io/docs/alerting/notifications/ ## https://prometheus.io/docs/alerting/notification_examples/ ## @@ -433,7 +434,7 @@ ingress: enabled: false -@@ -235,6 +591,25 @@ +@@ -235,6 +592,25 @@ ## Configuration for Alertmanager secret ## secret: @@ -459,7 +460,7 @@ annotations: {} ## Configuration for creating an Ingress that will map to each Alertmanager replica service -@@ -352,7 +727,7 @@ +@@ -352,7 +728,7 @@ ## Of type: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#tlsconfig tlsConfig: {} @@ -468,7 +469,7 @@ ## metric relabel configs to apply to samples before ingestion. ## -@@ -383,7 +758,7 @@ +@@ -383,7 +759,7 @@ ## Image of Alertmanager ## image: @@ -477,7 +478,7 @@ tag: v0.21.0 sha: "" -@@ -495,9 +870,13 @@ +@@ -495,9 +871,13 @@ ## Define resources requests and limits for single Pods. ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ ## @@ -494,7 +495,7 @@ ## 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. -@@ -601,10 +980,46 @@ +@@ -601,10 +981,46 @@ enabled: true namespaceOverride: "" @@ -541,7 +542,7 @@ adminPassword: prom-operator ingress: -@@ -644,6 +1059,7 @@ +@@ -644,6 +1060,7 @@ dashboards: enabled: true label: grafana_dashboard @@ -549,7 +550,7 @@ ## Annotations for Grafana dashboard configmaps ## -@@ -692,7 +1108,60 @@ +@@ -692,7 +1109,60 @@ ## Passed to grafana subchart and used by servicemonitor below ## service: @@ -611,7 +612,7 @@ ## If true, create a serviceMonitor for grafana ## -@@ -722,6 +1191,14 @@ +@@ -722,6 +1192,14 @@ # targetLabel: nodename # replacement: $1 # action: replace @@ -626,7 +627,7 @@ ## Component scraping the kube api server ## -@@ -879,7 +1356,7 @@ +@@ -879,7 +1357,7 @@ ## Component scraping the kube controller manager ## kubeControllerManager: @@ -635,7 +636,7 @@ ## If your kube controller manager is not deployed as a pod, specify IPs it can be found on ## -@@ -1014,7 +1491,7 @@ +@@ -1014,7 +1492,7 @@ ## Component scraping etcd ## kubeEtcd: @@ -644,7 +645,7 @@ ## If your etcd is not deployed as a pod, specify IPs it can be found on ## -@@ -1076,7 +1553,7 @@ +@@ -1076,7 +1554,7 @@ ## Component scraping kube scheduler ## kubeScheduler: @@ -653,7 +654,7 @@ ## If your kube scheduler is not deployed as a pod, specify IPs it can be found on ## -@@ -1131,7 +1608,7 @@ +@@ -1131,7 +1609,7 @@ ## Component scraping kube proxy ## kubeProxy: @@ -662,7 +663,7 @@ ## If your kube proxy is not deployed as a pod, specify IPs it can be found on ## -@@ -1210,6 +1687,13 @@ +@@ -1210,6 +1688,13 @@ create: true podSecurityPolicy: enabled: true @@ -676,7 +677,7 @@ ## Deploy node exporter as a daemonset to all nodes ## -@@ -1259,6 +1743,16 @@ +@@ -1259,6 +1744,16 @@ extraArgs: - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/.+)($|/) - --collector.filesystem.ignored-fs-types=^(autofs|binfmt_misc|bpf|cgroup2?|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|iso9660|mqueue|nsfs|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|selinuxfs|squashfs|sysfs|tracefs)$ @@ -693,7 +694,7 @@ ## Manages Prometheus and Alertmanager components ## -@@ -1271,8 +1765,8 @@ +@@ -1271,8 +1766,8 @@ enabled: true # Value must match version names from https://golang.org/pkg/crypto/tls/#pkg-constants tlsMinVersion: VersionTLS13 @@ -704,7 +705,7 @@ ## Admission webhook support for PrometheusRules resources added in Prometheus Operator 0.30 can be enabled to prevent incorrectly formatted ## rules from making their way into prometheus and potentially preventing the container from starting -@@ -1289,7 +1783,7 @@ +@@ -1289,7 +1784,7 @@ patch: enabled: true image: @@ -713,7 +714,7 @@ tag: v1.5.0 sha: "" pullPolicy: IfNotPresent -@@ -1428,13 +1922,13 @@ +@@ -1428,13 +1923,13 @@ ## Resource limits & requests ## @@ -734,7 +735,7 @@ # 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 -@@ -1487,7 +1981,7 @@ +@@ -1487,7 +1982,7 @@ ## Prometheus-operator image ## image: @@ -743,7 +744,7 @@ tag: v0.46.0 sha: "" pullPolicy: IfNotPresent -@@ -1503,7 +1997,7 @@ +@@ -1503,7 +1998,7 @@ ## Prometheus-config-reloader image to use for config and rule reloading ## prometheusConfigReloaderImage: @@ -752,7 +753,7 @@ tag: v0.46.0 sha: "" -@@ -1558,6 +2052,14 @@ +@@ -1558,6 +2053,14 @@ ## nodePort: 30901 @@ -767,7 +768,7 @@ ## Configuration for Prometheus service ## service: -@@ -1570,7 +2072,7 @@ +@@ -1570,7 +2073,7 @@ port: 9090 ## To be used with a proxy extraContainer port @@ -776,7 +777,7 @@ ## List of IP addresses at which the Prometheus server service is available ## Ref: https://kubernetes.io/docs/user-guide/services/#external-ips -@@ -1822,7 +2324,7 @@ +@@ -1822,7 +2325,7 @@ ## Image of Prometheus. ## image: @@ -785,7 +786,7 @@ tag: v2.24.0 sha: "" -@@ -1885,6 +2387,11 @@ +@@ -1885,6 +2388,11 @@ ## externalUrl: "" @@ -797,7 +798,7 @@ ## Define which Nodes the Pods are scheduled on. ## ref: https://kubernetes.io/docs/user-guide/node-selection/ ## -@@ -1917,7 +2424,7 @@ +@@ -1917,7 +2425,7 @@ ## prometheus resource to be created with selectors based on values in the helm deployment, ## which will also match the PrometheusRule resources created ## @@ -806,7 +807,7 @@ ## PrometheusRules to be selected for target discovery. ## If {}, select all PrometheusRules -@@ -1942,7 +2449,7 @@ +@@ -1942,7 +2450,7 @@ ## prometheus resource to be created with selectors based on values in the helm deployment, ## which will also match the servicemonitors created ## @@ -815,7 +816,7 @@ ## ServiceMonitors to be selected for target discovery. ## If {}, select all ServiceMonitors -@@ -1965,7 +2472,7 @@ +@@ -1965,7 +2473,7 @@ ## prometheus resource to be created with selectors based on values in the helm deployment, ## which will also match the podmonitors created ## @@ -824,7 +825,7 @@ ## PodMonitors to be selected for target discovery. ## If {}, select all PodMonitors -@@ -2092,9 +2599,13 @@ +@@ -2092,9 +2600,13 @@ ## Resource limits & requests ## @@ -841,7 +842,7 @@ ## Prometheus StorageSpec for persistent data ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/user-guides/storage.md -@@ -2117,7 +2628,13 @@ +@@ -2117,7 +2629,13 @@ # medium: Memory # Additional volumes on the output StatefulSet definition. @@ -856,7 +857,7 @@ # Additional VolumeMounts on the output StatefulSet definition. volumeMounts: [] -@@ -2224,9 +2741,34 @@ +@@ -2224,9 +2742,34 @@ ## thanos: {} @@ -892,7 +893,7 @@ ## InitContainers allows injecting additional initContainers. This is meant to allow doing some changes ## (permissions, dir tree) on mounted volumes before starting prometheus -@@ -2234,7 +2776,7 @@ +@@ -2234,7 +2777,7 @@ ## PortName to use for Prometheus. ##