From eec197c8c00d14a95f2a02e13f4092c664480e7e Mon Sep 17 00:00:00 2001 From: Jina Jain Date: Fri, 16 Jun 2023 14:15:13 -0700 Subject: [PATCH] Update toleration for k8s control-plane nodes (#814) * Update toleration for k8s control-plane nodes * update changelog --- CHANGELOG.md | 4 ++++ .../add-receiver-creator/rendered_manifests/daemonset.yaml | 2 ++ examples/add-sampler/rendered_manifests/daemonset.yaml | 2 ++ .../collector-agent-only/rendered_manifests/daemonset.yaml | 2 ++ .../collector-all-modes/rendered_manifests/daemonset.yaml | 2 ++ examples/crio-logging/rendered_manifests/daemonset.yaml | 2 ++ examples/default/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 ++ .../rendered_manifests/daemonset.yaml | 2 ++ .../rendered_manifests/daemonset.yaml | 2 ++ .../enable-trace-sampling/rendered_manifests/daemonset.yaml | 2 ++ .../rendered_manifests/daemonset.yaml | 2 ++ .../rendered_manifests/daemonset.yaml | 2 ++ .../rendered_manifests/daemonset.yaml | 2 ++ .../rendered_manifests/daemonset.yaml | 2 ++ .../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 ++ .../rendered_manifests/daemonset.yaml | 2 ++ examples/use-proxy/rendered_manifests/daemonset.yaml | 2 ++ helm-charts/splunk-otel-collector/values.yaml | 6 ++++-- 28 files changed, 60 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b04657b3d..2d2cc14380 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased +### Added + +- Adopt new control-plane node toleration [#814](https://github.com/signalfx/splunk-otel-collector-chart/pull/814) + ## [0.78.0] - 2023-06-07 This Splunk OpenTelemetry Collector for Kubernetes release adopts the [Splunk OpenTelemetry Collector v0.78.1](https://github.com/signalfx/splunk-otel-collector/releases/tag/v0.78.1). diff --git a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml index 48876580c6..4466434ce0 100644 --- a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml +++ b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml @@ -41,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane containers: - name: otel-collector command: diff --git a/examples/add-sampler/rendered_manifests/daemonset.yaml b/examples/add-sampler/rendered_manifests/daemonset.yaml index 719190797b..a5da087164 100644 --- a/examples/add-sampler/rendered_manifests/daemonset.yaml +++ b/examples/add-sampler/rendered_manifests/daemonset.yaml @@ -41,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane containers: - name: otel-collector command: diff --git a/examples/collector-agent-only/rendered_manifests/daemonset.yaml b/examples/collector-agent-only/rendered_manifests/daemonset.yaml index 3849c1b7a6..643478e7bc 100644 --- a/examples/collector-agent-only/rendered_manifests/daemonset.yaml +++ b/examples/collector-agent-only/rendered_manifests/daemonset.yaml @@ -41,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane 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 429a931fb1..4c26c86508 100644 --- a/examples/collector-all-modes/rendered_manifests/daemonset.yaml +++ b/examples/collector-all-modes/rendered_manifests/daemonset.yaml @@ -41,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane containers: - name: otel-collector command: diff --git a/examples/crio-logging/rendered_manifests/daemonset.yaml b/examples/crio-logging/rendered_manifests/daemonset.yaml index 3849c1b7a6..643478e7bc 100644 --- a/examples/crio-logging/rendered_manifests/daemonset.yaml +++ b/examples/crio-logging/rendered_manifests/daemonset.yaml @@ -41,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane containers: - name: otel-collector command: diff --git a/examples/default/rendered_manifests/daemonset.yaml b/examples/default/rendered_manifests/daemonset.yaml index 3849c1b7a6..643478e7bc 100644 --- a/examples/default/rendered_manifests/daemonset.yaml +++ b/examples/default/rendered_manifests/daemonset.yaml @@ -41,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane containers: - name: otel-collector command: diff --git a/examples/distribution-aks/rendered_manifests/daemonset.yaml b/examples/distribution-aks/rendered_manifests/daemonset.yaml index cb6cc84350..347f964e2c 100644 --- a/examples/distribution-aks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-aks/rendered_manifests/daemonset.yaml @@ -41,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane containers: - name: otel-collector command: diff --git a/examples/distribution-eks/rendered_manifests/daemonset.yaml b/examples/distribution-eks/rendered_manifests/daemonset.yaml index 7e0d1b24a1..bfd962e852 100644 --- a/examples/distribution-eks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-eks/rendered_manifests/daemonset.yaml @@ -41,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane 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 7f5d223a52..811d329ca2 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml @@ -41,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane containers: - name: otel-collector command: diff --git a/examples/distribution-gke/rendered_manifests/daemonset.yaml b/examples/distribution-gke/rendered_manifests/daemonset.yaml index e62aa196f7..6057d77289 100644 --- a/examples/distribution-gke/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke/rendered_manifests/daemonset.yaml @@ -41,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane containers: - name: otel-collector command: diff --git a/examples/distribution-openshift/rendered_manifests/daemonset.yaml b/examples/distribution-openshift/rendered_manifests/daemonset.yaml index daf5ad60ec..749b41a442 100644 --- a/examples/distribution-openshift/rendered_manifests/daemonset.yaml +++ b/examples/distribution-openshift/rendered_manifests/daemonset.yaml @@ -41,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane 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 7dcc3d86e0..f502a1b07b 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml @@ -42,6 +42,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane initContainers: - name: prepare-fluentd-config image: splunk/fluentd-hec:1.2.8 diff --git a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml index 0d88077356..42bfee2d41 100644 --- a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml @@ -41,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane 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 0431f1f282..92b61339bc 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml @@ -41,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane containers: - name: otel-collector command: diff --git a/examples/filter-container-metrics/rendered_manifests/daemonset.yaml b/examples/filter-container-metrics/rendered_manifests/daemonset.yaml index 0864552681..4a72986dba 100644 --- a/examples/filter-container-metrics/rendered_manifests/daemonset.yaml +++ b/examples/filter-container-metrics/rendered_manifests/daemonset.yaml @@ -41,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane 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 b17b5e4d2e..9269090925 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,6 +42,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane initContainers: - name: prepare-fluentd-config image: splunk/fluentd-hec:1.2.8 diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml index 17a1ab9472..c80247cabf 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml @@ -41,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane containers: - name: fluentd image: splunk/fluentd-hec:1.2.8 diff --git a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml index 1460b02e9b..d077ec26a8 100644 --- a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml @@ -42,6 +42,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane initContainers: - name: prepare-fluentd-config image: splunk/fluentd-hec:1.2.8 diff --git a/examples/only-logs-otel/rendered_manifests/daemonset.yaml b/examples/only-logs-otel/rendered_manifests/daemonset.yaml index e5a43c14ae..29b3f6ee4a 100644 --- a/examples/only-logs-otel/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-otel/rendered_manifests/daemonset.yaml @@ -41,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.78.1 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 8c0323a96e..221a1eb141 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,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane initContainers: - name: migrate-checkpoint image: quay.io/signalfx/splunk-otel-collector:0.78.1 diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index c5cd369c08..dd582c1d4a 100644 --- a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml @@ -41,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane containers: - name: otel-collector command: diff --git a/examples/only-metrics/rendered_manifests/daemonset.yaml b/examples/only-metrics/rendered_manifests/daemonset.yaml index e6673f547b..1b2fc4d204 100644 --- a/examples/only-metrics/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics/rendered_manifests/daemonset.yaml @@ -41,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane containers: - name: otel-collector command: diff --git a/examples/only-traces/rendered_manifests/daemonset.yaml b/examples/only-traces/rendered_manifests/daemonset.yaml index 60e3821f15..19424fe86d 100644 --- a/examples/only-traces/rendered_manifests/daemonset.yaml +++ b/examples/only-traces/rendered_manifests/daemonset.yaml @@ -41,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane 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 a1ca088ad7..80b1670a0f 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,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane containers: - name: otel-collector command: diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml index 5d7ca13228..895a636276 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml @@ -42,6 +42,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane initContainers: - name: prepare-fluentd-config image: splunk/fluentd-hec:1.2.8 diff --git a/examples/use-proxy/rendered_manifests/daemonset.yaml b/examples/use-proxy/rendered_manifests/daemonset.yaml index e5223d7821..b59c76ca42 100644 --- a/examples/use-proxy/rendered_manifests/daemonset.yaml +++ b/examples/use-proxy/rendered_manifests/daemonset.yaml @@ -41,6 +41,8 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane containers: - name: otel-collector command: diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml index 1c7f44c0c9..d40c2870fe 100644 --- a/helm-charts/splunk-otel-collector/values.yaml +++ b/helm-charts/splunk-otel-collector/values.yaml @@ -954,11 +954,13 @@ secret: # Specifies whether secret provided by user should be validated. validateSecret: true -# This default tolerations allow the daemonset to be deployed on master nodes, -# so that we can also collect logs and metrics from those nodes. +# 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. nodeSelector: {}