From abb6f24efc3c0bdff28cc974241fe421222ceda0 Mon Sep 17 00:00:00 2001 From: jvoravong Date: Mon, 9 Dec 2024 09:19:08 -0700 Subject: [PATCH 1/6] Make it so the default tolerations used to deploy the agent collector account for k8s distribution --- .../enhance-agent-daemonset-toleration.yaml | 12 ++++++++++++ .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../default/rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 12 +++++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 12 +++++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../rendered_manifests/daemonset.yaml | 9 ++++----- .../templates/daemonset.yaml | 19 +++++++++++++++++-- helm-charts/splunk-otel-collector/values.yaml | 17 +++++++---------- 40 files changed, 190 insertions(+), 197 deletions(-) create mode 100644 .chloggen/enhance-agent-daemonset-toleration.yaml diff --git a/.chloggen/enhance-agent-daemonset-toleration.yaml b/.chloggen/enhance-agent-daemonset-toleration.yaml new file mode 100644 index 0000000000..76ef2bc713 --- /dev/null +++ b/.chloggen/enhance-agent-daemonset-toleration.yaml @@ -0,0 +1,12 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement +# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other) +component: agent +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Make it so the default tolerations used to deploy the agent collector account for k8s distribution +# One or more tracking issues related to the change +issues: [1562] +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: OpenShift infra nodes and Azure system nodes will now be monitored by the agent by default diff --git a/examples/add-filter-processor/rendered_manifests/daemonset.yaml b/examples/add-filter-processor/rendered_manifests/daemonset.yaml index 5187441ca6..7a6a0212bf 100644 --- a/examples/add-filter-processor/rendered_manifests/daemonset.yaml +++ b/examples/add-filter-processor/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml index 0d1e7447fd..197d10c9a3 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml index f9da0ea33e..d554ae6b7f 100644 --- a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml +++ b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/examples/add-sampler/rendered_manifests/daemonset.yaml b/examples/add-sampler/rendered_manifests/daemonset.yaml index 43511b5e3a..f217085c34 100644 --- a/examples/add-sampler/rendered_manifests/daemonset.yaml +++ b/examples/add-sampler/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/examples/autodetect-istio/rendered_manifests/daemonset.yaml b/examples/autodetect-istio/rendered_manifests/daemonset.yaml index 5a549a8749..2a9f2e73d3 100644 --- a/examples/autodetect-istio/rendered_manifests/daemonset.yaml +++ b/examples/autodetect-istio/rendered_manifests/daemonset.yaml @@ -42,11 +42,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/collector-agent-only/rendered_manifests/daemonset.yaml b/examples/collector-agent-only/rendered_manifests/daemonset.yaml index 89dff1db4d..3a5e802751 100644 --- a/examples/collector-agent-only/rendered_manifests/daemonset.yaml +++ b/examples/collector-agent-only/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/examples/collector-all-modes/rendered_manifests/daemonset.yaml b/examples/collector-all-modes/rendered_manifests/daemonset.yaml index e3f922ff10..3bb4f9b4d1 100644 --- a/examples/collector-all-modes/rendered_manifests/daemonset.yaml +++ b/examples/collector-all-modes/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml index 561ebcb841..a8049e22ea 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/examples/crio-logging/rendered_manifests/daemonset.yaml b/examples/crio-logging/rendered_manifests/daemonset.yaml index 89dff1db4d..3a5e802751 100644 --- a/examples/crio-logging/rendered_manifests/daemonset.yaml +++ b/examples/crio-logging/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/examples/default/rendered_manifests/daemonset.yaml b/examples/default/rendered_manifests/daemonset.yaml index 89dff1db4d..3a5e802751 100644 --- a/examples/default/rendered_manifests/daemonset.yaml +++ b/examples/default/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml index 0354692f14..44f91114f1 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/discovery-mode/rendered_manifests/daemonset.yaml b/examples/discovery-mode/rendered_manifests/daemonset.yaml index 329e913d96..70216f2504 100644 --- a/examples/discovery-mode/rendered_manifests/daemonset.yaml +++ b/examples/discovery-mode/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/examples/distribution-aks/rendered_manifests/daemonset.yaml b/examples/distribution-aks/rendered_manifests/daemonset.yaml index 30654d5ac2..abbd8008b6 100644 --- a/examples/distribution-aks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-aks/rendered_manifests/daemonset.yaml @@ -41,11 +41,13 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule + - key: kubernetes.io/system-node + effect: NoSchedule + operator: Exists containers: - name: otel-collector command: diff --git a/examples/distribution-eks/rendered_manifests/daemonset.yaml b/examples/distribution-eks/rendered_manifests/daemonset.yaml index 88a106be9c..79f4cb16c3 100644 --- a/examples/distribution-eks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-eks/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml index 2eaf175419..1ef7e264ea 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/examples/distribution-gke/rendered_manifests/daemonset.yaml b/examples/distribution-gke/rendered_manifests/daemonset.yaml index 5be7b9eddf..7945a7efd4 100644 --- a/examples/distribution-gke/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/examples/distribution-openshift/rendered_manifests/daemonset.yaml b/examples/distribution-openshift/rendered_manifests/daemonset.yaml index e8f8d8539e..cb0f59cd54 100644 --- a/examples/distribution-openshift/rendered_manifests/daemonset.yaml +++ b/examples/distribution-openshift/rendered_manifests/daemonset.yaml @@ -41,11 +41,13 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule + - key: node-role.kubernetes.io/infra + effect: NoSchedule + operator: Exists containers: - name: otel-collector command: diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml index 4bf799d1b3..8857749063 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml index e1102b6f27..2ab8958e1c 100644 --- a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml index 7b48b2d619..986c7230e7 100644 --- a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml index 1617beca9b..5c9462e388 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml index 3c02778fc6..361fdb1902 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml @@ -42,11 +42,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule initContainers: - name: prepare-fluentd-config image: splunk/fluentd-hec:1.3.3 diff --git a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml index c70fb4bea4..94ffa6b6b2 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml @@ -42,11 +42,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule initContainers: - name: prepare-fluentd-config image: splunk/fluentd-hec:1.3.3 diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml index b4f2675786..323a682127 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml @@ -40,11 +40,10 @@ spec: nodeSelector: kubernetes.io/os: windows tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/examples/multi-metrics/rendered_manifests/daemonset.yaml b/examples/multi-metrics/rendered_manifests/daemonset.yaml index 6f5a5ea020..1dc9a58dc3 100644 --- a/examples/multi-metrics/rendered_manifests/daemonset.yaml +++ b/examples/multi-metrics/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml index 1d832d3826..e5e2e923b5 100644 --- a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml @@ -42,11 +42,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule initContainers: - name: prepare-fluentd-config image: splunk/fluentd-hec:1.3.3 diff --git a/examples/only-logs-otel/rendered_manifests/daemonset.yaml b/examples/only-logs-otel/rendered_manifests/daemonset.yaml index 6c1b976c9e..877ae729c3 100644 --- a/examples/only-logs-otel/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-otel/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml index 828c6e9d82..abb3474cfd 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index 52e0c5e07f..9f4fd92471 100644 --- a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/examples/only-metrics/rendered_manifests/daemonset.yaml b/examples/only-metrics/rendered_manifests/daemonset.yaml index 6b21f50e70..f740407079 100644 --- a/examples/only-metrics/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/examples/only-traces/rendered_manifests/daemonset.yaml b/examples/only-traces/rendered_manifests/daemonset.yaml index ccf3c5a83e..6faf701217 100644 --- a/examples/only-traces/rendered_manifests/daemonset.yaml +++ b/examples/only-traces/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml index 44b2117cd9..f596f9700b 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/examples/secret-validation/rendered_manifests/daemonset.yaml b/examples/secret-validation/rendered_manifests/daemonset.yaml index e1b156dc48..23a815442c 100644 --- a/examples/secret-validation/rendered_manifests/daemonset.yaml +++ b/examples/secret-validation/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml index 99a8dced02..57ab6e45ac 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/target-allocator/rendered_manifests/daemonset.yaml b/examples/target-allocator/rendered_manifests/daemonset.yaml index e87af61120..ac2f8e1f12 100644 --- a/examples/target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/target-allocator/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/examples/use-proxy/rendered_manifests/daemonset.yaml b/examples/use-proxy/rendered_manifests/daemonset.yaml index c3da433cad..637ced1114 100644 --- a/examples/use-proxy/rendered_manifests/daemonset.yaml +++ b/examples/use-proxy/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/examples/with-target-allocator/rendered_manifests/daemonset.yaml b/examples/with-target-allocator/rendered_manifests/daemonset.yaml index 6cbe4fe14b..dd5291ef93 100644 --- a/examples/with-target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/with-target-allocator/rendered_manifests/daemonset.yaml @@ -41,11 +41,10 @@ spec: nodeSelector: kubernetes.io/os: linux tolerations: - - - effect: NoSchedule - key: node-role.kubernetes.io/master - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule containers: - name: otel-collector command: diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml index b3daa1633e..5b0d8ea937 100644 --- a/helm-charts/splunk-otel-collector/templates/daemonset.yaml +++ b/helm-charts/splunk-otel-collector/templates/daemonset.yaml @@ -74,9 +74,24 @@ spec: affinity: {{ toYaml . | nindent 8 }} {{- end }} - {{- with .Values.tolerations }} tolerations: - {{ toYaml . | nindent 8 }} + {{- if and (.Values.tolerations) (ne (len .Values.tolerations) 0) }} + {{ toYaml .Values.tolerations | nindent 8 }} + {{- else }} + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule + {{- if eq .Values.distribution "openshift" }} + - key: node-role.kubernetes.io/infra + effect: NoSchedule + operator: Exists + {{- end }} + {{- if eq .Values.distribution "aks" }} + - key: kubernetes.io/system-node + effect: NoSchedule + operator: Exists + {{- end }} {{- end }} {{- if and (eq (include "splunk-otel-collector.logsEnabled" .) "true") (not .Values.isWindows) (not $agent.skipInitContainers) }} initContainers: diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml index c1e4cc70e6..9c89c3f02c 100644 --- a/helm-charts/splunk-otel-collector/values.yaml +++ b/helm-charts/splunk-otel-collector/values.yaml @@ -1009,19 +1009,16 @@ secret: # Specifies whether secret provided by user should be validated. validateSecret: true -# This default tolerations allow the daemonset to be deployed on control-plane -# nodes, so that we can also collect logs and metrics from those nodes. -tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule - - key: node-role.kubernetes.io/control-plane - effect: NoSchedule - -# Defines which nodes should be selected to deploy the o11y collector daemonset. +# The olerations for deploying agent collector daemonset. By default, it targets control-plane, worker, +# and k8s distribution-specific nodes (infrastructure or system) to ensure logs and metrics collection. +# If set, the specified tolerations will override the defaults. +tolerations: [] + +# Defines which nodes should be selected to deploy the agent collector daemonset. nodeSelector: {} terminationGracePeriodSeconds: 600 -# Defines node affinity to restrict deployment of the o11y collector daemonset. +# Defines node affinity to restrict deployment of the agent collector daemonset. affinity: {} # Defines priorityClassName to assign a priority class to pods. From 403b3776173929145cbdd8a2f0919ff8536292f4 Mon Sep 17 00:00:00 2001 From: jvoravong Date: Tue, 10 Dec 2024 08:43:23 -0700 Subject: [PATCH 2/6] For readability add default operator value used in default tolerations for the agent --- examples/add-filter-processor/rendered_manifests/daemonset.yaml | 2 ++ .../add-kafkametrics-receiver/rendered_manifests/daemonset.yaml | 2 ++ examples/add-receiver-creator/rendered_manifests/daemonset.yaml | 2 ++ examples/add-sampler/rendered_manifests/daemonset.yaml | 2 ++ examples/autodetect-istio/rendered_manifests/daemonset.yaml | 2 ++ examples/collector-agent-only/rendered_manifests/daemonset.yaml | 2 ++ examples/collector-all-modes/rendered_manifests/daemonset.yaml | 2 ++ .../rendered_manifests/daemonset.yaml | 2 ++ examples/crio-logging/rendered_manifests/daemonset.yaml | 2 ++ examples/default/rendered_manifests/daemonset.yaml | 2 ++ .../rendered_manifests/daemonset.yaml | 2 ++ examples/discovery-mode/rendered_manifests/daemonset.yaml | 2 ++ examples/distribution-aks/rendered_manifests/daemonset.yaml | 2 ++ examples/distribution-eks/rendered_manifests/daemonset.yaml | 2 ++ .../rendered_manifests/daemonset.yaml | 2 ++ examples/distribution-gke/rendered_manifests/daemonset.yaml | 2 ++ .../distribution-openshift/rendered_manifests/daemonset.yaml | 2 ++ .../rendered_manifests/daemonset.yaml | 2 ++ .../enable-persistence-queue/rendered_manifests/daemonset.yaml | 2 ++ .../enable-trace-sampling/rendered_manifests/daemonset.yaml | 2 ++ .../enabled-pprof-extension/rendered_manifests/daemonset.yaml | 2 ++ .../rendered_manifests/daemonset.yaml | 2 ++ .../fluentd-refresh-interval/rendered_manifests/daemonset.yaml | 2 ++ .../kubernetes-windows-nodes/rendered_manifests/daemonset.yaml | 2 ++ examples/multi-metrics/rendered_manifests/daemonset.yaml | 2 ++ examples/only-logs-fluentd/rendered_manifests/daemonset.yaml | 2 ++ examples/only-logs-otel/rendered_manifests/daemonset.yaml | 2 ++ .../rendered_manifests/daemonset.yaml | 2 ++ .../only-metrics-platform/rendered_manifests/daemonset.yaml | 2 ++ examples/only-metrics/rendered_manifests/daemonset.yaml | 2 ++ examples/only-traces/rendered_manifests/daemonset.yaml | 2 ++ .../rendered_manifests/daemonset.yaml | 2 ++ examples/secret-validation/rendered_manifests/daemonset.yaml | 2 ++ .../rendered_manifests/daemonset.yaml | 2 ++ examples/target-allocator/rendered_manifests/daemonset.yaml | 2 ++ examples/use-proxy/rendered_manifests/daemonset.yaml | 2 ++ .../with-target-allocator/rendered_manifests/daemonset.yaml | 2 ++ helm-charts/splunk-otel-collector/templates/daemonset.yaml | 2 ++ 38 files changed, 76 insertions(+) diff --git a/examples/add-filter-processor/rendered_manifests/daemonset.yaml b/examples/add-filter-processor/rendered_manifests/daemonset.yaml index 7a6a0212bf..389bd8a6c5 100644 --- a/examples/add-filter-processor/rendered_manifests/daemonset.yaml +++ b/examples/add-filter-processor/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml index 197d10c9a3..82cc98afd1 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml index d554ae6b7f..ed1b4527a6 100644 --- a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml +++ b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/examples/add-sampler/rendered_manifests/daemonset.yaml b/examples/add-sampler/rendered_manifests/daemonset.yaml index f217085c34..fb00fe8440 100644 --- a/examples/add-sampler/rendered_manifests/daemonset.yaml +++ b/examples/add-sampler/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/examples/autodetect-istio/rendered_manifests/daemonset.yaml b/examples/autodetect-istio/rendered_manifests/daemonset.yaml index 2a9f2e73d3..72787d49d7 100644 --- a/examples/autodetect-istio/rendered_manifests/daemonset.yaml +++ b/examples/autodetect-istio/rendered_manifests/daemonset.yaml @@ -44,8 +44,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/collector-agent-only/rendered_manifests/daemonset.yaml b/examples/collector-agent-only/rendered_manifests/daemonset.yaml index 3a5e802751..fe57491569 100644 --- a/examples/collector-agent-only/rendered_manifests/daemonset.yaml +++ b/examples/collector-agent-only/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/examples/collector-all-modes/rendered_manifests/daemonset.yaml b/examples/collector-all-modes/rendered_manifests/daemonset.yaml index 3bb4f9b4d1..87ce3af4fc 100644 --- a/examples/collector-all-modes/rendered_manifests/daemonset.yaml +++ b/examples/collector-all-modes/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml index a8049e22ea..20c0d637c2 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/examples/crio-logging/rendered_manifests/daemonset.yaml b/examples/crio-logging/rendered_manifests/daemonset.yaml index 3a5e802751..fe57491569 100644 --- a/examples/crio-logging/rendered_manifests/daemonset.yaml +++ b/examples/crio-logging/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/examples/default/rendered_manifests/daemonset.yaml b/examples/default/rendered_manifests/daemonset.yaml index 3a5e802751..fe57491569 100644 --- a/examples/default/rendered_manifests/daemonset.yaml +++ b/examples/default/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml index 44f91114f1..dc0c5899e0 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/discovery-mode/rendered_manifests/daemonset.yaml b/examples/discovery-mode/rendered_manifests/daemonset.yaml index 70216f2504..ef465a9005 100644 --- a/examples/discovery-mode/rendered_manifests/daemonset.yaml +++ b/examples/discovery-mode/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/examples/distribution-aks/rendered_manifests/daemonset.yaml b/examples/distribution-aks/rendered_manifests/daemonset.yaml index abbd8008b6..81143c1f76 100644 --- a/examples/distribution-aks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-aks/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal - key: kubernetes.io/system-node effect: NoSchedule operator: Exists diff --git a/examples/distribution-eks/rendered_manifests/daemonset.yaml b/examples/distribution-eks/rendered_manifests/daemonset.yaml index 79f4cb16c3..928fe52193 100644 --- a/examples/distribution-eks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-eks/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml index 1ef7e264ea..4b504f5f97 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/examples/distribution-gke/rendered_manifests/daemonset.yaml b/examples/distribution-gke/rendered_manifests/daemonset.yaml index 7945a7efd4..951bfcd968 100644 --- a/examples/distribution-gke/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/examples/distribution-openshift/rendered_manifests/daemonset.yaml b/examples/distribution-openshift/rendered_manifests/daemonset.yaml index cb0f59cd54..ab1d2526bd 100644 --- a/examples/distribution-openshift/rendered_manifests/daemonset.yaml +++ b/examples/distribution-openshift/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/infra effect: NoSchedule operator: Exists diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml index 8857749063..879e3cdb59 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml index 2ab8958e1c..f2b06c663a 100644 --- a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml index 986c7230e7..09937c0713 100644 --- a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml index 5c9462e388..25f52e775e 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml index 361fdb1902..e28585682d 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml @@ -44,8 +44,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal initContainers: - name: prepare-fluentd-config image: splunk/fluentd-hec:1.3.3 diff --git a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml index 94ffa6b6b2..956375cf35 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml @@ -44,8 +44,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal initContainers: - name: prepare-fluentd-config image: splunk/fluentd-hec:1.3.3 diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml index 323a682127..7990abef50 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml @@ -42,8 +42,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/examples/multi-metrics/rendered_manifests/daemonset.yaml b/examples/multi-metrics/rendered_manifests/daemonset.yaml index 1dc9a58dc3..3e137d5cad 100644 --- a/examples/multi-metrics/rendered_manifests/daemonset.yaml +++ b/examples/multi-metrics/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml index e5e2e923b5..4ec62124c5 100644 --- a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml @@ -44,8 +44,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal initContainers: - name: prepare-fluentd-config image: splunk/fluentd-hec:1.3.3 diff --git a/examples/only-logs-otel/rendered_manifests/daemonset.yaml b/examples/only-logs-otel/rendered_manifests/daemonset.yaml index 877ae729c3..bd8ba748ff 100644 --- a/examples/only-logs-otel/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-otel/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml index abb3474cfd..6156d7bf44 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index 9f4fd92471..0fae6e85ec 100644 --- a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/examples/only-metrics/rendered_manifests/daemonset.yaml b/examples/only-metrics/rendered_manifests/daemonset.yaml index f740407079..24eff98890 100644 --- a/examples/only-metrics/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/examples/only-traces/rendered_manifests/daemonset.yaml b/examples/only-traces/rendered_manifests/daemonset.yaml index 6faf701217..62ebc40fe3 100644 --- a/examples/only-traces/rendered_manifests/daemonset.yaml +++ b/examples/only-traces/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml index f596f9700b..f7f265834c 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/examples/secret-validation/rendered_manifests/daemonset.yaml b/examples/secret-validation/rendered_manifests/daemonset.yaml index 23a815442c..6528b3e155 100644 --- a/examples/secret-validation/rendered_manifests/daemonset.yaml +++ b/examples/secret-validation/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml index 57ab6e45ac..385fc0fae2 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/target-allocator/rendered_manifests/daemonset.yaml b/examples/target-allocator/rendered_manifests/daemonset.yaml index ac2f8e1f12..9dbfa89b92 100644 --- a/examples/target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/target-allocator/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/examples/use-proxy/rendered_manifests/daemonset.yaml b/examples/use-proxy/rendered_manifests/daemonset.yaml index 637ced1114..0738fa811f 100644 --- a/examples/use-proxy/rendered_manifests/daemonset.yaml +++ b/examples/use-proxy/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/examples/with-target-allocator/rendered_manifests/daemonset.yaml b/examples/with-target-allocator/rendered_manifests/daemonset.yaml index dd5291ef93..e38de1c9ac 100644 --- a/examples/with-target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/with-target-allocator/rendered_manifests/daemonset.yaml @@ -43,8 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal containers: - name: otel-collector command: diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml index 5b0d8ea937..003d293025 100644 --- a/helm-charts/splunk-otel-collector/templates/daemonset.yaml +++ b/helm-charts/splunk-otel-collector/templates/daemonset.yaml @@ -80,8 +80,10 @@ spec: {{- else }} - key: node-role.kubernetes.io/master effect: NoSchedule + operator: Equal - key: node-role.kubernetes.io/control-plane effect: NoSchedule + operator: Equal {{- if eq .Values.distribution "openshift" }} - key: node-role.kubernetes.io/infra effect: NoSchedule From ae30cec540b35de2adce0834464d799d4c4ee166 Mon Sep 17 00:00:00 2001 From: jvoravong Date: Tue, 10 Dec 2024 08:51:15 -0700 Subject: [PATCH 3/6] Alpha order distribution tolerations --- .../splunk-otel-collector/templates/daemonset.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml index 003d293025..f0a897bce9 100644 --- a/helm-charts/splunk-otel-collector/templates/daemonset.yaml +++ b/helm-charts/splunk-otel-collector/templates/daemonset.yaml @@ -84,13 +84,13 @@ spec: - key: node-role.kubernetes.io/control-plane effect: NoSchedule operator: Equal - {{- if eq .Values.distribution "openshift" }} - - key: node-role.kubernetes.io/infra + {{- if eq .Values.distribution "aks" }} + - key: kubernetes.io/system-node effect: NoSchedule operator: Exists {{- end }} - {{- if eq .Values.distribution "aks" }} - - key: kubernetes.io/system-node + {{- if eq .Values.distribution "openshift" }} + - key: node-role.kubernetes.io/infra effect: NoSchedule operator: Exists {{- end }} From f7e78a1a9467ab0973f77bd3b1bcfe0e78f43fe6 Mon Sep 17 00:00:00 2001 From: jvoravong Date: Tue, 10 Dec 2024 09:43:48 -0700 Subject: [PATCH 4/6] doc updates --- helm-charts/splunk-otel-collector/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml index 9c89c3f02c..b783a06799 100644 --- a/helm-charts/splunk-otel-collector/values.yaml +++ b/helm-charts/splunk-otel-collector/values.yaml @@ -1009,8 +1009,8 @@ secret: # Specifies whether secret provided by user should be validated. validateSecret: true -# The olerations for deploying agent collector daemonset. By default, it targets control-plane, worker, -# and k8s distribution-specific nodes (infrastructure or system) to ensure logs and metrics collection. +# The tolerations for deploying the agent collector daemonset. By default, it targets control-plane, worker, +# and k8s distribution-specific nodes (infrastructure or system) to ensure logs and metrics collection from nodes. # If set, the specified tolerations will override the defaults. tolerations: [] From 0513362a643494fa7ec57253d2eeb4b3da1e2210 Mon Sep 17 00:00:00 2001 From: jvoravong Date: Wed, 11 Dec 2024 08:11:26 -0700 Subject: [PATCH 5/6] Review requested changes --- .../add-filter-processor/rendered_manifests/daemonset.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 4 ++-- .../add-receiver-creator/rendered_manifests/daemonset.yaml | 4 ++-- examples/add-sampler/rendered_manifests/daemonset.yaml | 4 ++-- examples/autodetect-istio/rendered_manifests/daemonset.yaml | 4 ++-- .../collector-agent-only/rendered_manifests/daemonset.yaml | 4 ++-- .../collector-all-modes/rendered_manifests/daemonset.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 4 ++-- examples/crio-logging/rendered_manifests/daemonset.yaml | 4 ++-- examples/default/rendered_manifests/daemonset.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 4 ++-- examples/discovery-mode/rendered_manifests/daemonset.yaml | 4 ++-- examples/distribution-aks/rendered_manifests/daemonset.yaml | 4 ++-- examples/distribution-eks/rendered_manifests/daemonset.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 4 ++-- examples/distribution-gke/rendered_manifests/daemonset.yaml | 4 ++-- .../distribution-openshift/rendered_manifests/daemonset.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 4 ++-- .../enable-trace-sampling/rendered_manifests/daemonset.yaml | 4 ++-- .../enabled-pprof-extension/rendered_manifests/daemonset.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 4 ++-- examples/multi-metrics/rendered_manifests/daemonset.yaml | 4 ++-- examples/only-logs-fluentd/rendered_manifests/daemonset.yaml | 4 ++-- examples/only-logs-otel/rendered_manifests/daemonset.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 4 ++-- .../only-metrics-platform/rendered_manifests/daemonset.yaml | 4 ++-- examples/only-metrics/rendered_manifests/daemonset.yaml | 4 ++-- examples/only-traces/rendered_manifests/daemonset.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 4 ++-- examples/secret-validation/rendered_manifests/daemonset.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 4 ++-- examples/target-allocator/rendered_manifests/daemonset.yaml | 4 ++-- examples/use-proxy/rendered_manifests/daemonset.yaml | 4 ++-- .../with-target-allocator/rendered_manifests/daemonset.yaml | 4 ++-- helm-charts/splunk-otel-collector/templates/daemonset.yaml | 4 ++-- 38 files changed, 76 insertions(+), 76 deletions(-) diff --git a/examples/add-filter-processor/rendered_manifests/daemonset.yaml b/examples/add-filter-processor/rendered_manifests/daemonset.yaml index 389bd8a6c5..7d2719efd3 100644 --- a/examples/add-filter-processor/rendered_manifests/daemonset.yaml +++ b/examples/add-filter-processor/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml index 82cc98afd1..3523385905 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml index ed1b4527a6..296c9b443f 100644 --- a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml +++ b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/examples/add-sampler/rendered_manifests/daemonset.yaml b/examples/add-sampler/rendered_manifests/daemonset.yaml index fb00fe8440..bb29fb183b 100644 --- a/examples/add-sampler/rendered_manifests/daemonset.yaml +++ b/examples/add-sampler/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/examples/autodetect-istio/rendered_manifests/daemonset.yaml b/examples/autodetect-istio/rendered_manifests/daemonset.yaml index 72787d49d7..16c22691eb 100644 --- a/examples/autodetect-istio/rendered_manifests/daemonset.yaml +++ b/examples/autodetect-istio/rendered_manifests/daemonset.yaml @@ -44,10 +44,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/collector-agent-only/rendered_manifests/daemonset.yaml b/examples/collector-agent-only/rendered_manifests/daemonset.yaml index fe57491569..f27eeaea4b 100644 --- a/examples/collector-agent-only/rendered_manifests/daemonset.yaml +++ b/examples/collector-agent-only/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/examples/collector-all-modes/rendered_manifests/daemonset.yaml b/examples/collector-all-modes/rendered_manifests/daemonset.yaml index 87ce3af4fc..fc4efad6e3 100644 --- a/examples/collector-all-modes/rendered_manifests/daemonset.yaml +++ b/examples/collector-all-modes/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml index 20c0d637c2..0b240ba383 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/examples/crio-logging/rendered_manifests/daemonset.yaml b/examples/crio-logging/rendered_manifests/daemonset.yaml index fe57491569..f27eeaea4b 100644 --- a/examples/crio-logging/rendered_manifests/daemonset.yaml +++ b/examples/crio-logging/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/examples/default/rendered_manifests/daemonset.yaml b/examples/default/rendered_manifests/daemonset.yaml index fe57491569..f27eeaea4b 100644 --- a/examples/default/rendered_manifests/daemonset.yaml +++ b/examples/default/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml index dc0c5899e0..ddb5f947e1 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/discovery-mode/rendered_manifests/daemonset.yaml b/examples/discovery-mode/rendered_manifests/daemonset.yaml index ef465a9005..a48e96c319 100644 --- a/examples/discovery-mode/rendered_manifests/daemonset.yaml +++ b/examples/discovery-mode/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/examples/distribution-aks/rendered_manifests/daemonset.yaml b/examples/distribution-aks/rendered_manifests/daemonset.yaml index 81143c1f76..95e3a26830 100644 --- a/examples/distribution-aks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-aks/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists - key: kubernetes.io/system-node effect: NoSchedule operator: Exists diff --git a/examples/distribution-eks/rendered_manifests/daemonset.yaml b/examples/distribution-eks/rendered_manifests/daemonset.yaml index 928fe52193..9cc08ea4b3 100644 --- a/examples/distribution-eks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-eks/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml index 4b504f5f97..851fed6861 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/examples/distribution-gke/rendered_manifests/daemonset.yaml b/examples/distribution-gke/rendered_manifests/daemonset.yaml index 951bfcd968..815f0eeead 100644 --- a/examples/distribution-gke/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/examples/distribution-openshift/rendered_manifests/daemonset.yaml b/examples/distribution-openshift/rendered_manifests/daemonset.yaml index ab1d2526bd..8743873b3b 100644 --- a/examples/distribution-openshift/rendered_manifests/daemonset.yaml +++ b/examples/distribution-openshift/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/infra effect: NoSchedule operator: Exists diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml index 879e3cdb59..baf7af5e47 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml index f2b06c663a..7eef91904a 100644 --- a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml index 09937c0713..5b27d7e423 100644 --- a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml index 25f52e775e..740852d874 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml index e28585682d..cc2252018f 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml @@ -44,10 +44,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists initContainers: - name: prepare-fluentd-config image: splunk/fluentd-hec:1.3.3 diff --git a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml index 956375cf35..cdfa90d9de 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml @@ -44,10 +44,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists initContainers: - name: prepare-fluentd-config image: splunk/fluentd-hec:1.3.3 diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml index 7990abef50..08d71f7b6f 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml @@ -42,10 +42,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/examples/multi-metrics/rendered_manifests/daemonset.yaml b/examples/multi-metrics/rendered_manifests/daemonset.yaml index 3e137d5cad..797f3ce335 100644 --- a/examples/multi-metrics/rendered_manifests/daemonset.yaml +++ b/examples/multi-metrics/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml index 4ec62124c5..f83591fbad 100644 --- a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml @@ -44,10 +44,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists initContainers: - name: prepare-fluentd-config image: splunk/fluentd-hec:1.3.3 diff --git a/examples/only-logs-otel/rendered_manifests/daemonset.yaml b/examples/only-logs-otel/rendered_manifests/daemonset.yaml index bd8ba748ff..856355d108 100644 --- a/examples/only-logs-otel/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-otel/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml index 6156d7bf44..68c1ae7b05 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index 0fae6e85ec..288d9b7589 100644 --- a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/examples/only-metrics/rendered_manifests/daemonset.yaml b/examples/only-metrics/rendered_manifests/daemonset.yaml index 24eff98890..89814715ec 100644 --- a/examples/only-metrics/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/examples/only-traces/rendered_manifests/daemonset.yaml b/examples/only-traces/rendered_manifests/daemonset.yaml index 62ebc40fe3..c5b9d954f9 100644 --- a/examples/only-traces/rendered_manifests/daemonset.yaml +++ b/examples/only-traces/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml index f7f265834c..0c9cd15849 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/examples/secret-validation/rendered_manifests/daemonset.yaml b/examples/secret-validation/rendered_manifests/daemonset.yaml index 6528b3e155..0545406453 100644 --- a/examples/secret-validation/rendered_manifests/daemonset.yaml +++ b/examples/secret-validation/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml index 385fc0fae2..77eea0aab4 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.113.0 diff --git a/examples/target-allocator/rendered_manifests/daemonset.yaml b/examples/target-allocator/rendered_manifests/daemonset.yaml index 9dbfa89b92..bb6ffb0bb3 100644 --- a/examples/target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/target-allocator/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/examples/use-proxy/rendered_manifests/daemonset.yaml b/examples/use-proxy/rendered_manifests/daemonset.yaml index 0738fa811f..d5a935eba0 100644 --- a/examples/use-proxy/rendered_manifests/daemonset.yaml +++ b/examples/use-proxy/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/examples/with-target-allocator/rendered_manifests/daemonset.yaml b/examples/with-target-allocator/rendered_manifests/daemonset.yaml index e38de1c9ac..af6d0b9af1 100644 --- a/examples/with-target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/with-target-allocator/rendered_manifests/daemonset.yaml @@ -43,10 +43,10 @@ spec: tolerations: - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists containers: - name: otel-collector command: diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml index f0a897bce9..5109d0b9c8 100644 --- a/helm-charts/splunk-otel-collector/templates/daemonset.yaml +++ b/helm-charts/splunk-otel-collector/templates/daemonset.yaml @@ -80,10 +80,10 @@ spec: {{- else }} - key: node-role.kubernetes.io/master effect: NoSchedule - operator: Equal + operator: Exists - key: node-role.kubernetes.io/control-plane effect: NoSchedule - operator: Equal + operator: Exists {{- if eq .Values.distribution "aks" }} - key: kubernetes.io/system-node effect: NoSchedule From 0a4093e6abe7188260bc2936fab84c2061632400 Mon Sep 17 00:00:00 2001 From: jvoravong Date: Wed, 11 Dec 2024 08:14:25 -0700 Subject: [PATCH 6/6] changelog improvement --- .chloggen/enhance-agent-daemonset-toleration.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.chloggen/enhance-agent-daemonset-toleration.yaml b/.chloggen/enhance-agent-daemonset-toleration.yaml index 76ef2bc713..3362b470f7 100644 --- a/.chloggen/enhance-agent-daemonset-toleration.yaml +++ b/.chloggen/enhance-agent-daemonset-toleration.yaml @@ -9,4 +9,4 @@ issues: [1562] # (Optional) One or more lines of additional information to render under the primary note. # These lines will be padded with 2 spaces and then inserted directly into the document. # Use pipe (|) for multiline entries. -subtext: OpenShift infra nodes and Azure system nodes will now be monitored by the agent by default +subtext: OpenShift infra nodes and AKS system nodes will now be monitored by the agent by default