From 942483e54a1b66e310f6191ae4cb5c9a5105b9e4 Mon Sep 17 00:00:00 2001 From: Dmitry Anoshin Date: Thu, 21 Nov 2024 17:47:10 -0800 Subject: [PATCH 1/4] Prepare release 0.113.0 --- .chloggen/add-root-path.yaml | 12 ------------ .chloggen/fix-operator-inst-bug.yaml | 12 ------------ CHANGELOG.md | 9 +++++++++ .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../add-sampler/rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../add-sampler/rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../rendered_manifests/configmap-gateway.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/deployment-gateway.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/service.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-gateway.yaml | 4 ++-- .../rendered_manifests/deployment-gateway.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../crio-logging/rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../crio-logging/rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- examples/default/rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../default/rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- examples/default/rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../default/rendered_manifests/secret-splunk.yaml | 4 ++-- .../default/rendered_manifests/service-agent.yaml | 4 ++-- .../default/rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 10 +++++----- .../configmap-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../discovery-mode/rendered_manifests/daemonset.yaml | 8 ++++++-- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- ...gmap-cluster-receiver-node-discoverer-script.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../rendered_manifests/configmap-gateway.yaml | 4 ++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/deployment-gateway.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../securityContextConstraints.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/operator/instrumentation.yaml | 4 ++-- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 10 +++++----- .../configmap-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../rendered_manifests/configmap-fluentd-json.yaml | 4 ++-- .../rendered_manifests/configmap-fluentd.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../rendered_manifests/configmap-fluentd-json.yaml | 4 ++-- .../rendered_manifests/configmap-fluentd.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 8 ++++---- .../configmap-cluster-receiver.yaml | 6 +++--- .../multi-metrics/rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../rendered_manifests/configmap-fluentd-json.yaml | 4 ++-- .../rendered_manifests/configmap-fluentd.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../only-logs-otel/rendered_manifests/daemonset.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 6 +++--- .../configmap-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../only-metrics/rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../only-metrics/rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../only-traces/rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../only-traces/rendered_manifests/daemonset.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 6 +++--- .../secret-splunk-validation-hook.yaml | 2 +- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 6 +++--- .../rendered_manifests/daemonset.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../use-proxy/rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- examples/use-proxy/rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../use-proxy/rendered_manifests/secret-splunk.yaml | 4 ++-- .../use-proxy/rendered_manifests/service-agent.yaml | 4 ++-- .../use-proxy/rendered_manifests/serviceAccount.yaml | 4 ++-- .../rendered_manifests/clusterRole.yaml | 4 ++-- .../rendered_manifests/clusterRoleBinding.yaml | 4 ++-- .../rendered_manifests/configmap-agent.yaml | 4 ++-- .../configmap-cluster-receiver.yaml | 4 ++-- .../rendered_manifests/daemonset.yaml | 8 ++++++-- .../deployment-cluster-receiver.yaml | 6 +++--- .../rendered_manifests/secret-splunk.yaml | 4 ++-- .../rendered_manifests/service-agent.yaml | 4 ++-- .../rendered_manifests/serviceAccount.yaml | 4 ++-- .../targetAllocator-clusterRoleBinding.yaml | 4 ++-- .../targetAllocator-configmap.yaml | 4 ++-- .../targetAllocator-serviceAccount.yaml | 4 ++-- helm-charts/splunk-otel-collector/Chart.yaml | 2 +- 356 files changed, 887 insertions(+), 782 deletions(-) delete mode 100644 .chloggen/add-root-path.yaml delete mode 100644 .chloggen/fix-operator-inst-bug.yaml diff --git a/.chloggen/add-root-path.yaml b/.chloggen/add-root-path.yaml deleted file mode 100644 index 3cf0300c09..0000000000 --- a/.chloggen/add-root-path.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix -# 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: "Fixes hostmetrics receiver to use the correct mount path of the host's filesystem from inside the container" -# One or more tracking issues related to the change -issues: [1547] -# (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: diff --git a/.chloggen/fix-operator-inst-bug.yaml b/.chloggen/fix-operator-inst-bug.yaml deleted file mode 100644 index a312c242b4..0000000000 --- a/.chloggen/fix-operator-inst-bug.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix -# 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: Fix bug where sometimes Instrumentation opentelemetry.io/v1alpha1 can be installed too early -# One or more tracking issues related to the change -issues: [1544] -# (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: diff --git a/CHANGELOG.md b/CHANGELOG.md index b3d0856d86..67fe15dc01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ +## [0.113.0] - 2024-11-21 + +This Splunk OpenTelemetry Collector for Kubernetes release adopts the [Splunk OpenTelemetry Collector v0.113.0](https://github.com/signalfx/splunk-otel-collector/releases/tag/v0.113.0). + +### 🧰 Bug fixes 🧰 + +- `agent`: Fixes hostmetrics receiver to use the correct mount path of the host's filesystem from inside the container ([#1547](https://github.com/signalfx/splunk-otel-collector-chart/pull/1547)) +- `agent`: Fix bug where sometimes Instrumentation opentelemetry.io/v1alpha1 can be installed too early ([#1544](https://github.com/signalfx/splunk-otel-collector-chart/pull/1544)) + ## [0.112.1] - 2024-11-20 This Splunk OpenTelemetry Collector for Kubernetes release adopts the [Splunk OpenTelemetry Collector v0.112.0](https://github.com/signalfx/splunk-otel-collector/releases/tag/v0.112.0). diff --git a/examples/add-filter-processor/rendered_manifests/clusterRole.yaml b/examples/add-filter-processor/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/add-filter-processor/rendered_manifests/clusterRole.yaml +++ b/examples/add-filter-processor/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/add-filter-processor/rendered_manifests/clusterRoleBinding.yaml b/examples/add-filter-processor/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/add-filter-processor/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/add-filter-processor/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml b/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml index 1e8564de6c..328beef8ff 100644 --- a/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml +++ b/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml index 9c403c1dd5..193c4de474 100644 --- a/examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/add-filter-processor/rendered_manifests/daemonset.yaml b/examples/add-filter-processor/rendered_manifests/daemonset.yaml index 44a54db21f..52a8227321 100644 --- a/examples/add-filter-processor/rendered_manifests/daemonset.yaml +++ b/examples/add-filter-processor/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 1e1d35fe52ea86d3b1c5f6912dfdccb373dbeb11d8079785df4d083cdca125fc +======= + checksum/config: 0a17ab2ba914520cad6014cbf1996bda18676468fa24f6738cbe1f6e5226b1f5 +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml index c7fead9182..b264176a7a 100644 --- a/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 0cc99583a1bdb65c971228e819dde6c80d05cfe90de2433c6105794abfd823ec + checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/add-filter-processor/rendered_manifests/secret-splunk.yaml b/examples/add-filter-processor/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/add-filter-processor/rendered_manifests/secret-splunk.yaml +++ b/examples/add-filter-processor/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/add-filter-processor/rendered_manifests/service-agent.yaml b/examples/add-filter-processor/rendered_manifests/service-agent.yaml index 7d2b6a19b9..5f693ffc02 100644 --- a/examples/add-filter-processor/rendered_manifests/service-agent.yaml +++ b/examples/add-filter-processor/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/add-filter-processor/rendered_manifests/serviceAccount.yaml b/examples/add-filter-processor/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/add-filter-processor/rendered_manifests/serviceAccount.yaml +++ b/examples/add-filter-processor/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/clusterRole.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/clusterRole.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/clusterRoleBinding.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml index 329c15f032..f155e64bb1 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml index 9c403c1dd5..193c4de474 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml index a947d2274d..dfbc0827af 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 6fcdb388a1a73d2963e183f75d50e4b986dbbcc7e8b6fc98340a0fd753e61877 +======= + checksum/config: 866ea1337cdea23d82ba3e26f33231884abf9881c50f586a6c79be9465c12942 +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml index c7fead9182..b264176a7a 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 0cc99583a1bdb65c971228e819dde6c80d05cfe90de2433c6105794abfd823ec + checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/secret-splunk.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/secret-splunk.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/service-agent.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/service-agent.yaml index 7d2b6a19b9..5f693ffc02 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/service-agent.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/serviceAccount.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/serviceAccount.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/add-receiver-creator/rendered_manifests/clusterRole.yaml b/examples/add-receiver-creator/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/add-receiver-creator/rendered_manifests/clusterRole.yaml +++ b/examples/add-receiver-creator/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/add-receiver-creator/rendered_manifests/clusterRoleBinding.yaml b/examples/add-receiver-creator/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/add-receiver-creator/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/add-receiver-creator/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml b/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml index 25087fe4da..4f39c54f71 100644 --- a/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml +++ b/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml index 9c403c1dd5..193c4de474 100644 --- a/examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml index 4825fe4063..50376ccd9a 100644 --- a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml +++ b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 9fda779728e6dbd2c7fe3b354c87648c0b1db713d9868a5d5042d28a3da1d2f1 +======= + checksum/config: d5c69cbe34b3cd06d24557568cd16de4c1605140c8be0d0cac078d015c3b4573 +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml index c7fead9182..b264176a7a 100644 --- a/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 0cc99583a1bdb65c971228e819dde6c80d05cfe90de2433c6105794abfd823ec + checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/add-receiver-creator/rendered_manifests/secret-splunk.yaml b/examples/add-receiver-creator/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/add-receiver-creator/rendered_manifests/secret-splunk.yaml +++ b/examples/add-receiver-creator/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/add-receiver-creator/rendered_manifests/service-agent.yaml b/examples/add-receiver-creator/rendered_manifests/service-agent.yaml index 4e91fe2676..95c885c814 100644 --- a/examples/add-receiver-creator/rendered_manifests/service-agent.yaml +++ b/examples/add-receiver-creator/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/add-receiver-creator/rendered_manifests/serviceAccount.yaml b/examples/add-receiver-creator/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/add-receiver-creator/rendered_manifests/serviceAccount.yaml +++ b/examples/add-receiver-creator/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/add-sampler/rendered_manifests/clusterRole.yaml b/examples/add-sampler/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/add-sampler/rendered_manifests/clusterRole.yaml +++ b/examples/add-sampler/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/add-sampler/rendered_manifests/clusterRoleBinding.yaml b/examples/add-sampler/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/add-sampler/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/add-sampler/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/add-sampler/rendered_manifests/configmap-agent.yaml b/examples/add-sampler/rendered_manifests/configmap-agent.yaml index fe9b797afc..58f13995b3 100644 --- a/examples/add-sampler/rendered_manifests/configmap-agent.yaml +++ b/examples/add-sampler/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml index 9c403c1dd5..193c4de474 100644 --- a/examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/add-sampler/rendered_manifests/daemonset.yaml b/examples/add-sampler/rendered_manifests/daemonset.yaml index 78b245ccf4..501312fe76 100644 --- a/examples/add-sampler/rendered_manifests/daemonset.yaml +++ b/examples/add-sampler/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 13a7820b7cb33de19301208985377a91d7c098fbc57c54ee235c4bd4bf1e258f +======= + checksum/config: a145b2516d12f7fc23e8f4789ef24b381f6bc9f437f150249a873e68d86ddc6e +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml index c7fead9182..b264176a7a 100644 --- a/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 0cc99583a1bdb65c971228e819dde6c80d05cfe90de2433c6105794abfd823ec + checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/add-sampler/rendered_manifests/secret-splunk.yaml b/examples/add-sampler/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/add-sampler/rendered_manifests/secret-splunk.yaml +++ b/examples/add-sampler/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/add-sampler/rendered_manifests/service-agent.yaml b/examples/add-sampler/rendered_manifests/service-agent.yaml index 4e91fe2676..95c885c814 100644 --- a/examples/add-sampler/rendered_manifests/service-agent.yaml +++ b/examples/add-sampler/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/add-sampler/rendered_manifests/serviceAccount.yaml b/examples/add-sampler/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/add-sampler/rendered_manifests/serviceAccount.yaml +++ b/examples/add-sampler/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/autodetect-istio/rendered_manifests/clusterRole.yaml b/examples/autodetect-istio/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/autodetect-istio/rendered_manifests/clusterRole.yaml +++ b/examples/autodetect-istio/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/autodetect-istio/rendered_manifests/clusterRoleBinding.yaml b/examples/autodetect-istio/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/autodetect-istio/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/autodetect-istio/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml b/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml index 54f44b2c0e..a85d0920b1 100644 --- a/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml +++ b/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml b/examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml index 9c403c1dd5..193c4de474 100644 --- a/examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/autodetect-istio/rendered_manifests/daemonset.yaml b/examples/autodetect-istio/rendered_manifests/daemonset.yaml index af573570c5..5b1fa4c186 100644 --- a/examples/autodetect-istio/rendered_manifests/daemonset.yaml +++ b/examples/autodetect-istio/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 66b21e5dabb057fd110eebd50a90c0e8e58156b6b26cc4c606645bc772ba91e7 +======= + checksum/config: e503248ce4c1f757af3fdac6c7c27c8d13b0292497134c7fc6884452c60a02df +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector sidecar.istio.io/inject: "false" spec: diff --git a/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml b/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml index b2d5726d19..5125ce82cc 100644 --- a/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 0cc99583a1bdb65c971228e819dde6c80d05cfe90de2433c6105794abfd823ec + checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b sidecar.istio.io/inject: "false" spec: serviceAccountName: default-splunk-otel-collector diff --git a/examples/autodetect-istio/rendered_manifests/secret-splunk.yaml b/examples/autodetect-istio/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/autodetect-istio/rendered_manifests/secret-splunk.yaml +++ b/examples/autodetect-istio/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/autodetect-istio/rendered_manifests/service-agent.yaml b/examples/autodetect-istio/rendered_manifests/service-agent.yaml index 7d2b6a19b9..5f693ffc02 100644 --- a/examples/autodetect-istio/rendered_manifests/service-agent.yaml +++ b/examples/autodetect-istio/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/autodetect-istio/rendered_manifests/serviceAccount.yaml b/examples/autodetect-istio/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/autodetect-istio/rendered_manifests/serviceAccount.yaml +++ b/examples/autodetect-istio/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/collector-agent-only/rendered_manifests/clusterRole.yaml b/examples/collector-agent-only/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/collector-agent-only/rendered_manifests/clusterRole.yaml +++ b/examples/collector-agent-only/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/collector-agent-only/rendered_manifests/clusterRoleBinding.yaml b/examples/collector-agent-only/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/collector-agent-only/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/collector-agent-only/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml b/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml index ece40e3c75..efab869cdf 100644 --- a/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml +++ b/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/collector-agent-only/rendered_manifests/daemonset.yaml b/examples/collector-agent-only/rendered_manifests/daemonset.yaml index 6152ce0374..2b4334c365 100644 --- a/examples/collector-agent-only/rendered_manifests/daemonset.yaml +++ b/examples/collector-agent-only/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 8667589d63d8151b2b21a6c35c531d94a0d63d225225f7a9214b881c8c265a6d +======= + checksum/config: 72bb72446fb2d265082dcd21ac9171737298f47265a30a7aec4d64c03976ce7b +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/collector-agent-only/rendered_manifests/secret-splunk.yaml b/examples/collector-agent-only/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/collector-agent-only/rendered_manifests/secret-splunk.yaml +++ b/examples/collector-agent-only/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/collector-agent-only/rendered_manifests/service-agent.yaml b/examples/collector-agent-only/rendered_manifests/service-agent.yaml index 4e91fe2676..95c885c814 100644 --- a/examples/collector-agent-only/rendered_manifests/service-agent.yaml +++ b/examples/collector-agent-only/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/collector-agent-only/rendered_manifests/serviceAccount.yaml b/examples/collector-agent-only/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/collector-agent-only/rendered_manifests/serviceAccount.yaml +++ b/examples/collector-agent-only/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/collector-all-modes/rendered_manifests/clusterRole.yaml b/examples/collector-all-modes/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/collector-all-modes/rendered_manifests/clusterRole.yaml +++ b/examples/collector-all-modes/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/collector-all-modes/rendered_manifests/clusterRoleBinding.yaml b/examples/collector-all-modes/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/collector-all-modes/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/collector-all-modes/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml b/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml index 933e144b4e..4ee16e3737 100644 --- a/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml +++ b/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml b/examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml index 9c403c1dd5..193c4de474 100644 --- a/examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml b/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml index 83c06d4a13..43f34935a9 100644 --- a/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml +++ b/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/collector-all-modes/rendered_manifests/daemonset.yaml b/examples/collector-all-modes/rendered_manifests/daemonset.yaml index 1f338b8281..d4a35261b6 100644 --- a/examples/collector-all-modes/rendered_manifests/daemonset.yaml +++ b/examples/collector-all-modes/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 314eed3acbc1c301a3749a2c53587f8bf911c91ecad613872f01ad5b2012dca7 +======= + checksum/config: 450a13479fa5f27e7a7fe9d4750387be02031ade0b3e7cd1de0380a4e94019aa +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml b/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml index c7fead9182..b264176a7a 100644 --- a/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 0cc99583a1bdb65c971228e819dde6c80d05cfe90de2433c6105794abfd823ec + checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml b/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml index 76088099db..319a55eb43 100644 --- a/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml +++ b/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector @@ -31,7 +31,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: f89f5e8bcad7f11b219c25ba3ea3b5450662392145d7185d53cf24710e4150d3 + checksum/config: c1ba585335a1664db94d7d2cfe258e3a202873cf1948cb69b70291944faa95da spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/collector-all-modes/rendered_manifests/secret-splunk.yaml b/examples/collector-all-modes/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/collector-all-modes/rendered_manifests/secret-splunk.yaml +++ b/examples/collector-all-modes/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/collector-all-modes/rendered_manifests/service-agent.yaml b/examples/collector-all-modes/rendered_manifests/service-agent.yaml index 4e91fe2676..95c885c814 100644 --- a/examples/collector-all-modes/rendered_manifests/service-agent.yaml +++ b/examples/collector-all-modes/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/collector-all-modes/rendered_manifests/service.yaml b/examples/collector-all-modes/rendered_manifests/service.yaml index 28aee2777a..dc9a8aa727 100644 --- a/examples/collector-all-modes/rendered_manifests/service.yaml +++ b/examples/collector-all-modes/rendered_manifests/service.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector diff --git a/examples/collector-all-modes/rendered_manifests/serviceAccount.yaml b/examples/collector-all-modes/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/collector-all-modes/rendered_manifests/serviceAccount.yaml +++ b/examples/collector-all-modes/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/collector-cluster-receiver-only/rendered_manifests/clusterRole.yaml b/examples/collector-cluster-receiver-only/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/collector-cluster-receiver-only/rendered_manifests/clusterRole.yaml +++ b/examples/collector-cluster-receiver-only/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/collector-cluster-receiver-only/rendered_manifests/clusterRoleBinding.yaml b/examples/collector-cluster-receiver-only/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/collector-cluster-receiver-only/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/collector-cluster-receiver-only/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/collector-cluster-receiver-only/rendered_manifests/configmap-cluster-receiver.yaml b/examples/collector-cluster-receiver-only/rendered_manifests/configmap-cluster-receiver.yaml index 4985598e4b..4d264395bb 100644 --- a/examples/collector-cluster-receiver-only/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/collector-cluster-receiver-only/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml b/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml index 590541ae6c..5287b6168f 100644 --- a/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: c9ed91daa196038bd9df714e679f9472c009405ca19d21f51f4d397b8e2066b4 + checksum/config: b30b3bb56ee1f2c16bfa9aeff8933007d6f4e388850220def3c3da90815b3916 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/collector-cluster-receiver-only/rendered_manifests/secret-splunk.yaml b/examples/collector-cluster-receiver-only/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/collector-cluster-receiver-only/rendered_manifests/secret-splunk.yaml +++ b/examples/collector-cluster-receiver-only/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/collector-cluster-receiver-only/rendered_manifests/serviceAccount.yaml b/examples/collector-cluster-receiver-only/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/collector-cluster-receiver-only/rendered_manifests/serviceAccount.yaml +++ b/examples/collector-cluster-receiver-only/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/collector-gateway-only/rendered_manifests/clusterRole.yaml b/examples/collector-gateway-only/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/collector-gateway-only/rendered_manifests/clusterRole.yaml +++ b/examples/collector-gateway-only/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/collector-gateway-only/rendered_manifests/clusterRoleBinding.yaml b/examples/collector-gateway-only/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/collector-gateway-only/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/collector-gateway-only/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml b/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml index 83c06d4a13..43f34935a9 100644 --- a/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml +++ b/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml b/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml index 1bca66b625..8b6c6f8fe6 100644 --- a/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml +++ b/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector @@ -31,7 +31,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: f89f5e8bcad7f11b219c25ba3ea3b5450662392145d7185d53cf24710e4150d3 + checksum/config: c1ba585335a1664db94d7d2cfe258e3a202873cf1948cb69b70291944faa95da spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/collector-gateway-only/rendered_manifests/secret-splunk.yaml b/examples/collector-gateway-only/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/collector-gateway-only/rendered_manifests/secret-splunk.yaml +++ b/examples/collector-gateway-only/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/collector-gateway-only/rendered_manifests/service.yaml b/examples/collector-gateway-only/rendered_manifests/service.yaml index 28aee2777a..dc9a8aa727 100644 --- a/examples/collector-gateway-only/rendered_manifests/service.yaml +++ b/examples/collector-gateway-only/rendered_manifests/service.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector diff --git a/examples/collector-gateway-only/rendered_manifests/serviceAccount.yaml b/examples/collector-gateway-only/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/collector-gateway-only/rendered_manifests/serviceAccount.yaml +++ b/examples/collector-gateway-only/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/clusterRole.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/clusterRole.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/clusterRoleBinding.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml index f4e7388daa..479214c51f 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-cluster-receiver.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-cluster-receiver.yaml index 9c403c1dd5..193c4de474 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml index 18aa889dba..28f6905c09 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 8613bc77558deeb8d0540993de3b26e528120ce7e6adcfb0f644b33bf9b007fa +======= + checksum/config: d84f38b67a8a23f29c92cd302b138a6e24d2438cddd2e8ac7c56f9ab1d6f516d +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml index c7fead9182..b264176a7a 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 0cc99583a1bdb65c971228e819dde6c80d05cfe90de2433c6105794abfd823ec + checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/secret-splunk.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/secret-splunk.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/service-agent.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/service-agent.yaml index 4e91fe2676..95c885c814 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/service-agent.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/serviceAccount.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/serviceAccount.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/crio-logging/rendered_manifests/clusterRole.yaml b/examples/crio-logging/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/crio-logging/rendered_manifests/clusterRole.yaml +++ b/examples/crio-logging/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/crio-logging/rendered_manifests/clusterRoleBinding.yaml b/examples/crio-logging/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/crio-logging/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/crio-logging/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/crio-logging/rendered_manifests/configmap-agent.yaml b/examples/crio-logging/rendered_manifests/configmap-agent.yaml index ece40e3c75..efab869cdf 100644 --- a/examples/crio-logging/rendered_manifests/configmap-agent.yaml +++ b/examples/crio-logging/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/crio-logging/rendered_manifests/configmap-cluster-receiver.yaml b/examples/crio-logging/rendered_manifests/configmap-cluster-receiver.yaml index 9c403c1dd5..193c4de474 100644 --- a/examples/crio-logging/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/crio-logging/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/crio-logging/rendered_manifests/daemonset.yaml b/examples/crio-logging/rendered_manifests/daemonset.yaml index 6152ce0374..2b4334c365 100644 --- a/examples/crio-logging/rendered_manifests/daemonset.yaml +++ b/examples/crio-logging/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 8667589d63d8151b2b21a6c35c531d94a0d63d225225f7a9214b881c8c265a6d +======= + checksum/config: 72bb72446fb2d265082dcd21ac9171737298f47265a30a7aec4d64c03976ce7b +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml b/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml index c7fead9182..b264176a7a 100644 --- a/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 0cc99583a1bdb65c971228e819dde6c80d05cfe90de2433c6105794abfd823ec + checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/crio-logging/rendered_manifests/secret-splunk.yaml b/examples/crio-logging/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/crio-logging/rendered_manifests/secret-splunk.yaml +++ b/examples/crio-logging/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/crio-logging/rendered_manifests/service-agent.yaml b/examples/crio-logging/rendered_manifests/service-agent.yaml index 4e91fe2676..95c885c814 100644 --- a/examples/crio-logging/rendered_manifests/service-agent.yaml +++ b/examples/crio-logging/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/crio-logging/rendered_manifests/serviceAccount.yaml b/examples/crio-logging/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/crio-logging/rendered_manifests/serviceAccount.yaml +++ b/examples/crio-logging/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/default/rendered_manifests/clusterRole.yaml b/examples/default/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/default/rendered_manifests/clusterRole.yaml +++ b/examples/default/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/default/rendered_manifests/clusterRoleBinding.yaml b/examples/default/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/default/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/default/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/default/rendered_manifests/configmap-agent.yaml b/examples/default/rendered_manifests/configmap-agent.yaml index ece40e3c75..efab869cdf 100644 --- a/examples/default/rendered_manifests/configmap-agent.yaml +++ b/examples/default/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/default/rendered_manifests/configmap-cluster-receiver.yaml b/examples/default/rendered_manifests/configmap-cluster-receiver.yaml index 9c403c1dd5..193c4de474 100644 --- a/examples/default/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/default/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/default/rendered_manifests/daemonset.yaml b/examples/default/rendered_manifests/daemonset.yaml index 6152ce0374..2b4334c365 100644 --- a/examples/default/rendered_manifests/daemonset.yaml +++ b/examples/default/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 8667589d63d8151b2b21a6c35c531d94a0d63d225225f7a9214b881c8c265a6d +======= + checksum/config: 72bb72446fb2d265082dcd21ac9171737298f47265a30a7aec4d64c03976ce7b +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/default/rendered_manifests/deployment-cluster-receiver.yaml b/examples/default/rendered_manifests/deployment-cluster-receiver.yaml index c7fead9182..b264176a7a 100644 --- a/examples/default/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/default/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 0cc99583a1bdb65c971228e819dde6c80d05cfe90de2433c6105794abfd823ec + checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/default/rendered_manifests/secret-splunk.yaml b/examples/default/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/default/rendered_manifests/secret-splunk.yaml +++ b/examples/default/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/default/rendered_manifests/service-agent.yaml b/examples/default/rendered_manifests/service-agent.yaml index 4e91fe2676..95c885c814 100644 --- a/examples/default/rendered_manifests/service-agent.yaml +++ b/examples/default/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/default/rendered_manifests/serviceAccount.yaml b/examples/default/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/default/rendered_manifests/serviceAccount.yaml +++ b/examples/default/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/clusterRole.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/clusterRole.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/clusterRoleBinding.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml index d2ad5532d7..7bd0e8cb9b 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: @@ -42,7 +42,7 @@ data: storage: file_storage/persistent_queue source: kubernetes splunk_app_name: splunk-otel-collector - splunk_app_version: 0.112.1 + splunk_app_version: 0.113.0 timeout: 10s tls: insecure_skip_verify: false @@ -66,7 +66,7 @@ data: storage: file_storage/persistent_queue source: kubernetes splunk_app_name: splunk-otel-collector - splunk_app_version: 0.112.1 + splunk_app_version: 0.113.0 timeout: 10s tls: insecure_skip_verify: false @@ -90,7 +90,7 @@ data: storage: null source: kubernetes splunk_app_name: splunk-otel-collector - splunk_app_version: 0.112.1 + splunk_app_version: 0.113.0 timeout: 10s tls: insecure_skip_verify: false diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml index b14388234c..840b317d9d 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: @@ -36,7 +36,7 @@ data: queue_size: 1000 source: kubernetes splunk_app_name: splunk-otel-collector - splunk_app_version: 0.112.1 + splunk_app_version: 0.113.0 timeout: 10s tls: insecure_skip_verify: false diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml index 1a8e0d19b8..7aa8395d52 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: ef6f7965727ca30cdf440838ca6301d52c9ca24c4d1f1d41a6d2490b64d2f084 +======= + checksum/config: afc411e671e4bc4c73bb03837338d5b5afc46ebb557ff6984de5486428bbff0a +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml index 5dc10150e8..f430e30d8c 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 7021d01637cac35b8e5ae0d9491cc4ce1d944c8544debf07d208dbf4c837427c + checksum/config: 2ebe19c84fd799cfbd9504a0957789f9a289d04bc9a1a08712b09ea6a339c81f spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/secret-splunk.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/secret-splunk.yaml index 8a80028ec4..145b7e0b75 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/secret-splunk.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/service-agent.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/service-agent.yaml index 7d2b6a19b9..5f693ffc02 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/service-agent.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/serviceAccount.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/serviceAccount.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/discovery-mode/rendered_manifests/clusterRole.yaml b/examples/discovery-mode/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/discovery-mode/rendered_manifests/clusterRole.yaml +++ b/examples/discovery-mode/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/discovery-mode/rendered_manifests/clusterRoleBinding.yaml b/examples/discovery-mode/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/discovery-mode/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/discovery-mode/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/discovery-mode/rendered_manifests/configmap-agent.yaml b/examples/discovery-mode/rendered_manifests/configmap-agent.yaml index 5aab1b7985..743b708868 100644 --- a/examples/discovery-mode/rendered_manifests/configmap-agent.yaml +++ b/examples/discovery-mode/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/discovery-mode/rendered_manifests/daemonset.yaml b/examples/discovery-mode/rendered_manifests/daemonset.yaml index 9d561ee03c..8d2db61779 100644 --- a/examples/discovery-mode/rendered_manifests/daemonset.yaml +++ b/examples/discovery-mode/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 3578b34b0cceb9c01afbfc50da9b297906412107c73cc23ae5a9fb9abe74364c +======= + checksum/config: 514df56cb4cf6072b9db71ad6bea20306c3efdf3c380375c5ee46f1dc76ebace +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/discovery-mode/rendered_manifests/secret-splunk.yaml b/examples/discovery-mode/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/discovery-mode/rendered_manifests/secret-splunk.yaml +++ b/examples/discovery-mode/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/discovery-mode/rendered_manifests/service-agent.yaml b/examples/discovery-mode/rendered_manifests/service-agent.yaml index 4e91fe2676..95c885c814 100644 --- a/examples/discovery-mode/rendered_manifests/service-agent.yaml +++ b/examples/discovery-mode/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/discovery-mode/rendered_manifests/serviceAccount.yaml b/examples/discovery-mode/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/discovery-mode/rendered_manifests/serviceAccount.yaml +++ b/examples/discovery-mode/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/distribution-aks/rendered_manifests/clusterRole.yaml b/examples/distribution-aks/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/distribution-aks/rendered_manifests/clusterRole.yaml +++ b/examples/distribution-aks/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/distribution-aks/rendered_manifests/clusterRoleBinding.yaml b/examples/distribution-aks/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/distribution-aks/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/distribution-aks/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/distribution-aks/rendered_manifests/configmap-agent.yaml b/examples/distribution-aks/rendered_manifests/configmap-agent.yaml index e8fce16ffa..39f0615e34 100644 --- a/examples/distribution-aks/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-aks/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/distribution-aks/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-aks/rendered_manifests/configmap-cluster-receiver.yaml index c0ad128221..190404b7d7 100644 --- a/examples/distribution-aks/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-aks/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/distribution-aks/rendered_manifests/daemonset.yaml b/examples/distribution-aks/rendered_manifests/daemonset.yaml index fd86082a7e..c44c515b8f 100644 --- a/examples/distribution-aks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-aks/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 9c0deba254b35108ce13c4c1903b1894cbfbf924b3b285ece073d9b636c29863 +======= + checksum/config: ef88b97ecd29fa5abf626cdb0d4994a9be693aa4d9664a72b9acdd07750eb2d7 +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml index 5abb9b7462..461d874251 100644 --- a/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 1ab5420ea906d1e94ca1874732f764d5e6ec97d7ce2e53a4f51a211cf601d36f + checksum/config: c090a229396be782ca350ada8b83f622afca01a39a4238279b01b6780eaf7c1f spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/distribution-aks/rendered_manifests/secret-splunk.yaml b/examples/distribution-aks/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/distribution-aks/rendered_manifests/secret-splunk.yaml +++ b/examples/distribution-aks/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/distribution-aks/rendered_manifests/service-agent.yaml b/examples/distribution-aks/rendered_manifests/service-agent.yaml index 4e91fe2676..95c885c814 100644 --- a/examples/distribution-aks/rendered_manifests/service-agent.yaml +++ b/examples/distribution-aks/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/distribution-aks/rendered_manifests/serviceAccount.yaml b/examples/distribution-aks/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/distribution-aks/rendered_manifests/serviceAccount.yaml +++ b/examples/distribution-aks/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/distribution-eks-fargate/rendered_manifests/clusterRole.yaml b/examples/distribution-eks-fargate/rendered_manifests/clusterRole.yaml index 06e1ad8ece..6291903355 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/clusterRole.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/distribution-eks-fargate/rendered_manifests/clusterRoleBinding.yaml b/examples/distribution-eks-fargate/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver-node-discoverer-script.yaml b/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver-node-discoverer-script.yaml index 7fb361130a..fba104d0e3 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver-node-discoverer-script.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver-node-discoverer-script.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver.yaml index 1bdffb66a6..762b9f0728 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml b/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml index a04808b0cc..bac529d2b3 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml index 809f2ec7d4..9a9def15dc 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -33,7 +33,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 55b117929be52d3569cde74641e7a76bd1f68bb4b6781b58660369c8c35cf744 + checksum/config: d78e0d008e7296fe1c3fa48154a5840e42560b5d8324d3264b164f9c928e3373 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml b/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml index 2b3882904d..d8e0b3469e 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector @@ -31,7 +31,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: e94e6df7e0345cfe178daa9a5e806f437ce04dcdd8628444b1247efe01625556 + checksum/config: 8798c374ad73a8d5d2707ec1e0a459e6257a8b79a6fc389a21a543a534d63d89 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/distribution-eks-fargate/rendered_manifests/secret-splunk.yaml b/examples/distribution-eks-fargate/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/secret-splunk.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/distribution-eks-fargate/rendered_manifests/service.yaml b/examples/distribution-eks-fargate/rendered_manifests/service.yaml index 28aee2777a..dc9a8aa727 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/service.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/service.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector diff --git a/examples/distribution-eks-fargate/rendered_manifests/serviceAccount.yaml b/examples/distribution-eks-fargate/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/serviceAccount.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/distribution-eks/rendered_manifests/clusterRole.yaml b/examples/distribution-eks/rendered_manifests/clusterRole.yaml index 2f29dc9d40..cd1b8539bf 100644 --- a/examples/distribution-eks/rendered_manifests/clusterRole.yaml +++ b/examples/distribution-eks/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/distribution-eks/rendered_manifests/clusterRoleBinding.yaml b/examples/distribution-eks/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/distribution-eks/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/distribution-eks/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/distribution-eks/rendered_manifests/configmap-agent.yaml b/examples/distribution-eks/rendered_manifests/configmap-agent.yaml index de1e49f450..64861a7202 100644 --- a/examples/distribution-eks/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-eks/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/distribution-eks/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-eks/rendered_manifests/configmap-cluster-receiver.yaml index cc063ce8e2..ea5d20dcdb 100644 --- a/examples/distribution-eks/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-eks/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/distribution-eks/rendered_manifests/daemonset.yaml b/examples/distribution-eks/rendered_manifests/daemonset.yaml index 50dca34b59..7b8e4b69f4 100644 --- a/examples/distribution-eks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-eks/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: e0c7fdcdccb1ee8d8e191c70097f8cebfff33546c0dc2bf2d4ba83f114c22c25 +======= + checksum/config: b8499550bfe707f3362d3ba8101dc753dfacee95e2bb31f50f03402710caadd1 +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml index f345b1e474..ab75614dc6 100644 --- a/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 664eb7502561a77ce494d9e43540a6f09982c31983055ebaa5261cefc630b18c + checksum/config: b0f51497d57f09b27212e1e240b285b46ce5b0ae425a1e2b38a448342b955d19 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/distribution-eks/rendered_manifests/secret-splunk.yaml b/examples/distribution-eks/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/distribution-eks/rendered_manifests/secret-splunk.yaml +++ b/examples/distribution-eks/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/distribution-eks/rendered_manifests/service-agent.yaml b/examples/distribution-eks/rendered_manifests/service-agent.yaml index 4e91fe2676..95c885c814 100644 --- a/examples/distribution-eks/rendered_manifests/service-agent.yaml +++ b/examples/distribution-eks/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/distribution-eks/rendered_manifests/serviceAccount.yaml b/examples/distribution-eks/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/distribution-eks/rendered_manifests/serviceAccount.yaml +++ b/examples/distribution-eks/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/distribution-gke-autopilot/rendered_manifests/clusterRole.yaml b/examples/distribution-gke-autopilot/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/clusterRole.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/distribution-gke-autopilot/rendered_manifests/clusterRoleBinding.yaml b/examples/distribution-gke-autopilot/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml b/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml index f8dfede404..e4d18e3566 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/distribution-gke-autopilot/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-gke-autopilot/rendered_manifests/configmap-cluster-receiver.yaml index 6e251f33a2..b7681e6268 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml index e27ae36501..7bd9267b3d 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 8cbfdd1dee09d8e1ccc6e82ffe4f900dcde02b03c54450790d5493d3ad665cb4 +======= + checksum/config: 778f2eb4bc742fa78ddc4fc49d5f12c8d4e3d02d59bcf402b1d522ee24a6fcd6 +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml index 9db4454ab9..ad2e3799e9 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 25261b3bc83ec62a64103360046b308a1a7c551ddddff250efb55d859243c661 + checksum/config: 09f2176d296fde148259746e522d9c8a9879a710249f7d8c0ac2158f86853290 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/distribution-gke-autopilot/rendered_manifests/secret-splunk.yaml b/examples/distribution-gke-autopilot/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/secret-splunk.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/distribution-gke-autopilot/rendered_manifests/service-agent.yaml b/examples/distribution-gke-autopilot/rendered_manifests/service-agent.yaml index 4e91fe2676..95c885c814 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/service-agent.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/distribution-gke-autopilot/rendered_manifests/serviceAccount.yaml b/examples/distribution-gke-autopilot/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/serviceAccount.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/distribution-gke/rendered_manifests/clusterRole.yaml b/examples/distribution-gke/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/distribution-gke/rendered_manifests/clusterRole.yaml +++ b/examples/distribution-gke/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/distribution-gke/rendered_manifests/clusterRoleBinding.yaml b/examples/distribution-gke/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/distribution-gke/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/distribution-gke/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/distribution-gke/rendered_manifests/configmap-agent.yaml b/examples/distribution-gke/rendered_manifests/configmap-agent.yaml index c63a390590..ac231bd513 100644 --- a/examples/distribution-gke/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-gke/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/distribution-gke/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-gke/rendered_manifests/configmap-cluster-receiver.yaml index 6e251f33a2..b7681e6268 100644 --- a/examples/distribution-gke/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-gke/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/distribution-gke/rendered_manifests/daemonset.yaml b/examples/distribution-gke/rendered_manifests/daemonset.yaml index b1053de2ca..9ec4e39caa 100644 --- a/examples/distribution-gke/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 710a9e155ba1e8a234e56eade0d4feec1bbe5d23b7493ddcfe96110e5805b7d0 +======= + checksum/config: 3312f1d5af6185f73b2562a369de8ad13cbcda1dcc06c07183e95db6194d2a40 +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml index 9db4454ab9..ad2e3799e9 100644 --- a/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 25261b3bc83ec62a64103360046b308a1a7c551ddddff250efb55d859243c661 + checksum/config: 09f2176d296fde148259746e522d9c8a9879a710249f7d8c0ac2158f86853290 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/distribution-gke/rendered_manifests/secret-splunk.yaml b/examples/distribution-gke/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/distribution-gke/rendered_manifests/secret-splunk.yaml +++ b/examples/distribution-gke/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/distribution-gke/rendered_manifests/service-agent.yaml b/examples/distribution-gke/rendered_manifests/service-agent.yaml index 4e91fe2676..95c885c814 100644 --- a/examples/distribution-gke/rendered_manifests/service-agent.yaml +++ b/examples/distribution-gke/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/distribution-gke/rendered_manifests/serviceAccount.yaml b/examples/distribution-gke/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/distribution-gke/rendered_manifests/serviceAccount.yaml +++ b/examples/distribution-gke/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/distribution-openshift/rendered_manifests/clusterRole.yaml b/examples/distribution-openshift/rendered_manifests/clusterRole.yaml index bc85ecf02d..389bf8f0f0 100644 --- a/examples/distribution-openshift/rendered_manifests/clusterRole.yaml +++ b/examples/distribution-openshift/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/distribution-openshift/rendered_manifests/clusterRoleBinding.yaml b/examples/distribution-openshift/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/distribution-openshift/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/distribution-openshift/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml b/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml index f9f0cf4292..58c0c5e825 100644 --- a/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/distribution-openshift/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-openshift/rendered_manifests/configmap-cluster-receiver.yaml index 3f85e584a8..27859c200f 100644 --- a/examples/distribution-openshift/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-openshift/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/distribution-openshift/rendered_manifests/daemonset.yaml b/examples/distribution-openshift/rendered_manifests/daemonset.yaml index fc51e3a289..34420135da 100644 --- a/examples/distribution-openshift/rendered_manifests/daemonset.yaml +++ b/examples/distribution-openshift/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 9343d86abbbf7dd2b6d588124ab613ad241dfd39c8d138297e4ff3bdfe839215 +======= + checksum/config: c235b6b88519ff1d1f6e9b5fdd7e60cbd22cc81bd6165478e891eb24a827277f +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml index 1ade7e30e2..9830433968 100644 --- a/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 1e2372122dbd0b1bc74115f94b7acea1ca4ecf0df75bf57b333b7e795da3f51b + checksum/config: fc1948ab34d8173f04fa0f56f5988af51b3ae3867d0a45cf295a220e85c05676 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/distribution-openshift/rendered_manifests/secret-splunk.yaml b/examples/distribution-openshift/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/distribution-openshift/rendered_manifests/secret-splunk.yaml +++ b/examples/distribution-openshift/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/distribution-openshift/rendered_manifests/securityContextConstraints.yaml b/examples/distribution-openshift/rendered_manifests/securityContextConstraints.yaml index 47733df926..677c26ae98 100644 --- a/examples/distribution-openshift/rendered_manifests/securityContextConstraints.yaml +++ b/examples/distribution-openshift/rendered_manifests/securityContextConstraints.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm users: diff --git a/examples/distribution-openshift/rendered_manifests/service-agent.yaml b/examples/distribution-openshift/rendered_manifests/service-agent.yaml index 4e91fe2676..95c885c814 100644 --- a/examples/distribution-openshift/rendered_manifests/service-agent.yaml +++ b/examples/distribution-openshift/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/distribution-openshift/rendered_manifests/serviceAccount.yaml b/examples/distribution-openshift/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/distribution-openshift/rendered_manifests/serviceAccount.yaml +++ b/examples/distribution-openshift/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/clusterRole.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/clusterRole.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/clusterRoleBinding.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml index 663a5a447b..d555ee3256 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-cluster-receiver.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-cluster-receiver.yaml index 6c3bac31f5..a7d0b506ca 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: 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 c443e88b69..0e85606138 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 32d6799629be439ea0fa354d3b1e1f91091ec8b03bde85870c85838fa4b4b8f1 +======= + checksum/config: a42b2f76f11cea9bd571629d0bfcbd454d255427dec3083819d6b093844dad3d +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml index 29208a416f..45df7144c3 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: fdec9507f71910b4b24cff560029b9d546bdef671377ba0607c0f400b31e64b8 + checksum/config: d53af150853be9b03d554d64c43c83776cd5af4c906b7db6652460557dc27549 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/instrumentation.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/instrumentation.yaml index a9056e6a85..948e923b9d 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/instrumentation.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/instrumentation.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-operator - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-operator diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/secret-splunk.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/secret-splunk.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/service-agent.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/service-agent.yaml index 7d2b6a19b9..5f693ffc02 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/service-agent.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/serviceAccount.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/serviceAccount.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/enable-persistence-queue/rendered_manifests/clusterRole.yaml b/examples/enable-persistence-queue/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/enable-persistence-queue/rendered_manifests/clusterRole.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/enable-persistence-queue/rendered_manifests/clusterRoleBinding.yaml b/examples/enable-persistence-queue/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/enable-persistence-queue/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml b/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml index de3476a93c..cc344d94f8 100644 --- a/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: @@ -42,7 +42,7 @@ data: storage: file_storage/persistent_queue source: kubernetes splunk_app_name: splunk-otel-collector - splunk_app_version: 0.112.1 + splunk_app_version: 0.113.0 timeout: 10s tls: insecure_skip_verify: false @@ -66,7 +66,7 @@ data: storage: file_storage/persistent_queue source: kubernetes splunk_app_name: splunk-otel-collector - splunk_app_version: 0.112.1 + splunk_app_version: 0.113.0 timeout: 10s tls: insecure_skip_verify: false @@ -90,7 +90,7 @@ data: storage: file_storage/persistent_queue source: kubernetes splunk_app_name: splunk-otel-collector - splunk_app_version: 0.112.1 + splunk_app_version: 0.113.0 timeout: 10s tls: insecure_skip_verify: false diff --git a/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml b/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml index b14388234c..840b317d9d 100644 --- a/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: @@ -36,7 +36,7 @@ data: queue_size: 1000 source: kubernetes splunk_app_name: splunk-otel-collector - splunk_app_version: 0.112.1 + splunk_app_version: 0.113.0 timeout: 10s tls: insecure_skip_verify: false diff --git a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml index 8ff07756fc..513774c69e 100644 --- a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 4afcd938e39e7c9ca40fed841694074c4b93ef7ca239e27cb78164f256b79dc0 +======= + checksum/config: 4c3a013efb496c0edd4fa606449b83d7f924be5ba515f132fbbc96f8ff5ec9b8 +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml index 5dc10150e8..f430e30d8c 100644 --- a/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 7021d01637cac35b8e5ae0d9491cc4ce1d944c8544debf07d208dbf4c837427c + checksum/config: 2ebe19c84fd799cfbd9504a0957789f9a289d04bc9a1a08712b09ea6a339c81f spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/enable-persistence-queue/rendered_manifests/secret-splunk.yaml b/examples/enable-persistence-queue/rendered_manifests/secret-splunk.yaml index 8a80028ec4..145b7e0b75 100644 --- a/examples/enable-persistence-queue/rendered_manifests/secret-splunk.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/enable-persistence-queue/rendered_manifests/service-agent.yaml b/examples/enable-persistence-queue/rendered_manifests/service-agent.yaml index 7d2b6a19b9..5f693ffc02 100644 --- a/examples/enable-persistence-queue/rendered_manifests/service-agent.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/enable-persistence-queue/rendered_manifests/serviceAccount.yaml b/examples/enable-persistence-queue/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/enable-persistence-queue/rendered_manifests/serviceAccount.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/enable-trace-sampling/rendered_manifests/clusterRole.yaml b/examples/enable-trace-sampling/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/enable-trace-sampling/rendered_manifests/clusterRole.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/enable-trace-sampling/rendered_manifests/clusterRoleBinding.yaml b/examples/enable-trace-sampling/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/enable-trace-sampling/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/enable-trace-sampling/rendered_manifests/configmap-agent.yaml b/examples/enable-trace-sampling/rendered_manifests/configmap-agent.yaml index d6c098826e..350c59aa05 100644 --- a/examples/enable-trace-sampling/rendered_manifests/configmap-agent.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml index d7e7b39797..7b48b2d619 100644 --- a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: a1c74b18bf03fdc2601bb693e421a1d1c0e2224dce70e41c4f354b22340c4bba + checksum/config: c9751de7681298fa09fa98b0a7f426e9f72c927617625596dc9d7829f73287bd kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/enable-trace-sampling/rendered_manifests/secret-splunk.yaml b/examples/enable-trace-sampling/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/enable-trace-sampling/rendered_manifests/secret-splunk.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/enable-trace-sampling/rendered_manifests/service-agent.yaml b/examples/enable-trace-sampling/rendered_manifests/service-agent.yaml index 921ab5ca66..ba5000eca2 100644 --- a/examples/enable-trace-sampling/rendered_manifests/service-agent.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/enable-trace-sampling/rendered_manifests/serviceAccount.yaml b/examples/enable-trace-sampling/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/enable-trace-sampling/rendered_manifests/serviceAccount.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/enabled-pprof-extension/rendered_manifests/clusterRole.yaml b/examples/enabled-pprof-extension/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/clusterRole.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/enabled-pprof-extension/rendered_manifests/clusterRoleBinding.yaml b/examples/enabled-pprof-extension/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml b/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml index 139d7187bd..4386c1a3e8 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/enabled-pprof-extension/rendered_manifests/configmap-cluster-receiver.yaml b/examples/enabled-pprof-extension/rendered_manifests/configmap-cluster-receiver.yaml index 9c403c1dd5..193c4de474 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml index 46e0b0aede..e59ea8caa8 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 109a34ada5fdbe442a1cea77957cc5bec656a59d506f8497b0f64770a230a09c +======= + checksum/config: 3045ad9dc77eafb989e7a666d1d06bfa77e0352607fa4673971426cc967dce3f +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml index c7fead9182..b264176a7a 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 0cc99583a1bdb65c971228e819dde6c80d05cfe90de2433c6105794abfd823ec + checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/enabled-pprof-extension/rendered_manifests/secret-splunk.yaml b/examples/enabled-pprof-extension/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/secret-splunk.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/enabled-pprof-extension/rendered_manifests/service-agent.yaml b/examples/enabled-pprof-extension/rendered_manifests/service-agent.yaml index 4e91fe2676..95c885c814 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/service-agent.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/enabled-pprof-extension/rendered_manifests/serviceAccount.yaml b/examples/enabled-pprof-extension/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/serviceAccount.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/clusterRole.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/clusterRole.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/clusterRoleBinding.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-agent.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-agent.yaml index 411bc0d40a..d51c94beb4 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-agent.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-cluster-receiver.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-cluster-receiver.yaml index 9c403c1dd5..193c4de474 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-fluentd-json.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-fluentd-json.yaml index 9165ba55b6..0f66420cff 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-fluentd-json.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-fluentd-json.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-fluentd.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-fluentd.yaml index e0648020a7..8f41037c7d 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-fluentd.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-fluentd.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: 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 0597938d68..e9b705e3d8 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 @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm engine: fluentd @@ -33,7 +33,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 2872074fc1f7e6e087a3652dc750fa9ea3561f26fd5d2e98c476e477dd3ca7cc +======= + checksum/config: b8dda031ee76b98853d8d33f90a3d70ee8572f34901b62726cac9b789e6f6151 +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml index c7fead9182..b264176a7a 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 0cc99583a1bdb65c971228e819dde6c80d05cfe90de2433c6105794abfd823ec + checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/secret-splunk.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/secret-splunk.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/service-agent.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/service-agent.yaml index 7d2b6a19b9..5f693ffc02 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/service-agent.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/serviceAccount.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/serviceAccount.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/fluentd-refresh-interval/rendered_manifests/clusterRole.yaml b/examples/fluentd-refresh-interval/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/clusterRole.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/fluentd-refresh-interval/rendered_manifests/clusterRoleBinding.yaml b/examples/fluentd-refresh-interval/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml b/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml index 411bc0d40a..d51c94beb4 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/fluentd-refresh-interval/rendered_manifests/configmap-cluster-receiver.yaml b/examples/fluentd-refresh-interval/rendered_manifests/configmap-cluster-receiver.yaml index 9c403c1dd5..193c4de474 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/fluentd-refresh-interval/rendered_manifests/configmap-fluentd-json.yaml b/examples/fluentd-refresh-interval/rendered_manifests/configmap-fluentd-json.yaml index 9165ba55b6..0f66420cff 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/configmap-fluentd-json.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/configmap-fluentd-json.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/fluentd-refresh-interval/rendered_manifests/configmap-fluentd.yaml b/examples/fluentd-refresh-interval/rendered_manifests/configmap-fluentd.yaml index 5d0e146962..adbcc3e934 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/configmap-fluentd.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/configmap-fluentd.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml index ea1d01a399..ce07138408 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm engine: fluentd @@ -33,7 +33,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: f06168115df4b166185f3b66b518cda0d69835a9a59894db8a72cab8e694f899 +======= + checksum/config: bd30657da5b61553852b6291597cc15649f876a49f52bd64b3987958c387e480 +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/fluentd-refresh-interval/rendered_manifests/deployment-cluster-receiver.yaml b/examples/fluentd-refresh-interval/rendered_manifests/deployment-cluster-receiver.yaml index c7fead9182..b264176a7a 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 0cc99583a1bdb65c971228e819dde6c80d05cfe90de2433c6105794abfd823ec + checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/fluentd-refresh-interval/rendered_manifests/secret-splunk.yaml b/examples/fluentd-refresh-interval/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/secret-splunk.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/fluentd-refresh-interval/rendered_manifests/service-agent.yaml b/examples/fluentd-refresh-interval/rendered_manifests/service-agent.yaml index 7d2b6a19b9..5f693ffc02 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/service-agent.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/fluentd-refresh-interval/rendered_manifests/serviceAccount.yaml b/examples/fluentd-refresh-interval/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/serviceAccount.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/clusterRole.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/clusterRole.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/clusterRoleBinding.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml index 54b5d018f4..7f526a9af2 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/configmap-cluster-receiver.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/configmap-cluster-receiver.yaml index 9c403c1dd5..193c4de474 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml index 3811261d61..a43e25a9e1 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: a5e0912f6068cb152a6e77a3b8c251d48396619dbff5f11dba86e98bdfc20d1d +======= + checksum/config: 804492b0696c8f559adf6e47c7968e900e52ca471e69474314d7ddfa4d6f00c6 +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: dnsPolicy: ClusterFirstWithHostNet diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml index 07d1663272..f2a35b8601 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 0cc99583a1bdb65c971228e819dde6c80d05cfe90de2433c6105794abfd823ec + checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/secret-splunk.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/secret-splunk.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/service-agent.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/service-agent.yaml index 7d2b6a19b9..5f693ffc02 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/service-agent.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/serviceAccount.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/serviceAccount.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/multi-metrics/rendered_manifests/clusterRole.yaml b/examples/multi-metrics/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/multi-metrics/rendered_manifests/clusterRole.yaml +++ b/examples/multi-metrics/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/multi-metrics/rendered_manifests/clusterRoleBinding.yaml b/examples/multi-metrics/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/multi-metrics/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/multi-metrics/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/multi-metrics/rendered_manifests/configmap-agent.yaml b/examples/multi-metrics/rendered_manifests/configmap-agent.yaml index 223a960377..ccb5b2cab3 100644 --- a/examples/multi-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/multi-metrics/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: @@ -41,7 +41,7 @@ data: queue_size: 1000 source: kubernetes splunk_app_name: splunk-otel-collector - splunk_app_version: 0.112.1 + splunk_app_version: 0.113.0 timeout: 10s tls: insecure_skip_verify: false @@ -64,7 +64,7 @@ data: queue_size: 1000 source: kubernetes splunk_app_name: splunk-otel-collector - splunk_app_version: 0.112.1 + splunk_app_version: 0.113.0 timeout: 10s tls: insecure_skip_verify: false diff --git a/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml b/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml index b14388234c..840b317d9d 100644 --- a/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: @@ -36,7 +36,7 @@ data: queue_size: 1000 source: kubernetes splunk_app_name: splunk-otel-collector - splunk_app_version: 0.112.1 + splunk_app_version: 0.113.0 timeout: 10s tls: insecure_skip_verify: false diff --git a/examples/multi-metrics/rendered_manifests/daemonset.yaml b/examples/multi-metrics/rendered_manifests/daemonset.yaml index a5dbbcb90d..d29214c3d4 100644 --- a/examples/multi-metrics/rendered_manifests/daemonset.yaml +++ b/examples/multi-metrics/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 3775265cfa376e304096ba49634c0bc60efa287083d328b475e4c2477bb7afd9 +======= + checksum/config: a1d64cf561a4db277a15087ee8c05c33ff98a2636b158107563bd271e9321baa +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml index 5dc10150e8..f430e30d8c 100644 --- a/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 7021d01637cac35b8e5ae0d9491cc4ce1d944c8544debf07d208dbf4c837427c + checksum/config: 2ebe19c84fd799cfbd9504a0957789f9a289d04bc9a1a08712b09ea6a339c81f spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/multi-metrics/rendered_manifests/secret-splunk.yaml b/examples/multi-metrics/rendered_manifests/secret-splunk.yaml index 8a80028ec4..145b7e0b75 100644 --- a/examples/multi-metrics/rendered_manifests/secret-splunk.yaml +++ b/examples/multi-metrics/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/multi-metrics/rendered_manifests/service-agent.yaml b/examples/multi-metrics/rendered_manifests/service-agent.yaml index a970aac5d4..6aff55b3b6 100644 --- a/examples/multi-metrics/rendered_manifests/service-agent.yaml +++ b/examples/multi-metrics/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/multi-metrics/rendered_manifests/serviceAccount.yaml b/examples/multi-metrics/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/multi-metrics/rendered_manifests/serviceAccount.yaml +++ b/examples/multi-metrics/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/only-logs-fluentd/rendered_manifests/clusterRole.yaml b/examples/only-logs-fluentd/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/only-logs-fluentd/rendered_manifests/clusterRole.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/only-logs-fluentd/rendered_manifests/clusterRoleBinding.yaml b/examples/only-logs-fluentd/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/only-logs-fluentd/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/only-logs-fluentd/rendered_manifests/configmap-agent.yaml b/examples/only-logs-fluentd/rendered_manifests/configmap-agent.yaml index 3411bc1ea7..e3df04fc98 100644 --- a/examples/only-logs-fluentd/rendered_manifests/configmap-agent.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/only-logs-fluentd/rendered_manifests/configmap-fluentd-json.yaml b/examples/only-logs-fluentd/rendered_manifests/configmap-fluentd-json.yaml index 9165ba55b6..0f66420cff 100644 --- a/examples/only-logs-fluentd/rendered_manifests/configmap-fluentd-json.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/configmap-fluentd-json.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/only-logs-fluentd/rendered_manifests/configmap-fluentd.yaml b/examples/only-logs-fluentd/rendered_manifests/configmap-fluentd.yaml index 89728967f8..d5bf56d7f9 100644 --- a/examples/only-logs-fluentd/rendered_manifests/configmap-fluentd.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/configmap-fluentd.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml index dbaae5859e..1d832d3826 100644 --- a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm engine: fluentd @@ -33,7 +33,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: c2204762b2fa840ba8405ac9fa3cc2be49d6e03f6778826390d1f7b58d75cb5f + checksum/config: 85fa1a338deedcff51ed1f26f5d15ba819bf816a046344b0f5a61982eddb9779 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/only-logs-fluentd/rendered_manifests/secret-splunk.yaml b/examples/only-logs-fluentd/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/only-logs-fluentd/rendered_manifests/secret-splunk.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/only-logs-fluentd/rendered_manifests/service-agent.yaml b/examples/only-logs-fluentd/rendered_manifests/service-agent.yaml index 780d7bc077..edad6bf223 100644 --- a/examples/only-logs-fluentd/rendered_manifests/service-agent.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/only-logs-fluentd/rendered_manifests/serviceAccount.yaml b/examples/only-logs-fluentd/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/only-logs-fluentd/rendered_manifests/serviceAccount.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/only-logs-otel/rendered_manifests/clusterRole.yaml b/examples/only-logs-otel/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/only-logs-otel/rendered_manifests/clusterRole.yaml +++ b/examples/only-logs-otel/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/only-logs-otel/rendered_manifests/clusterRoleBinding.yaml b/examples/only-logs-otel/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/only-logs-otel/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/only-logs-otel/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/only-logs-otel/rendered_manifests/configmap-agent.yaml b/examples/only-logs-otel/rendered_manifests/configmap-agent.yaml index 3f5deecd28..d0ddebd563 100644 --- a/examples/only-logs-otel/rendered_manifests/configmap-agent.yaml +++ b/examples/only-logs-otel/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/only-logs-otel/rendered_manifests/daemonset.yaml b/examples/only-logs-otel/rendered_manifests/daemonset.yaml index 69cac44d5a..6c1b976c9e 100644 --- a/examples/only-logs-otel/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-otel/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: ff17ea20b14273362ce74bf9dced8b3934436ec61a0cbf26d1c074744ae7e06b + checksum/config: 435a66dc5f7ca1ee96a30c06460f439de9caa772085c4ed35edac0353a028c3f kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/only-logs-otel/rendered_manifests/secret-splunk.yaml b/examples/only-logs-otel/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/only-logs-otel/rendered_manifests/secret-splunk.yaml +++ b/examples/only-logs-otel/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/only-logs-otel/rendered_manifests/service-agent.yaml b/examples/only-logs-otel/rendered_manifests/service-agent.yaml index 780d7bc077..edad6bf223 100644 --- a/examples/only-logs-otel/rendered_manifests/service-agent.yaml +++ b/examples/only-logs-otel/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/only-logs-otel/rendered_manifests/serviceAccount.yaml b/examples/only-logs-otel/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/only-logs-otel/rendered_manifests/serviceAccount.yaml +++ b/examples/only-logs-otel/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/clusterRole.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/clusterRole.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/clusterRoleBinding.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml index b8997bf4cd..86155a467d 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: 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 18fa0a5179..828c6e9d82 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 @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 2b714b0fb4c1e58e17a726459df634cd436d2842b5dc8a79baec7d6c6ebf8f7c + checksum/config: ad7210c615ee36c07eb8295a088446b0f3775bd3d6cb2bb1209b1d9c2893614c kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/secret-splunk.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/secret-splunk.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/service-agent.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/service-agent.yaml index 780d7bc077..edad6bf223 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/service-agent.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/serviceAccount.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/serviceAccount.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/only-metrics-platform/rendered_manifests/clusterRole.yaml b/examples/only-metrics-platform/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/only-metrics-platform/rendered_manifests/clusterRole.yaml +++ b/examples/only-metrics-platform/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/only-metrics-platform/rendered_manifests/clusterRoleBinding.yaml b/examples/only-metrics-platform/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/only-metrics-platform/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/only-metrics-platform/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml b/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml index 9baf951945..dc6c4fa194 100644 --- a/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml +++ b/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: @@ -40,7 +40,7 @@ data: queue_size: 1000 source: kubernetes splunk_app_name: splunk-otel-collector - splunk_app_version: 0.112.1 + splunk_app_version: 0.113.0 timeout: 10s tls: insecure_skip_verify: false diff --git a/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml b/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml index b14388234c..840b317d9d 100644 --- a/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: @@ -36,7 +36,7 @@ data: queue_size: 1000 source: kubernetes splunk_app_name: splunk-otel-collector - splunk_app_version: 0.112.1 + splunk_app_version: 0.113.0 timeout: 10s tls: insecure_skip_verify: false diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index d6dad32986..37ac546869 100644 --- a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: d50d8169a27518fd76ad489d1cb8ef1b47e6301d9a507b259752268a52b18d06 +======= + checksum/config: d3393adc06b7f2fa9905916078e53f4f55ded69c1a135d8c039aa597730f0449 +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml b/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml index 5dc10150e8..f430e30d8c 100644 --- a/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 7021d01637cac35b8e5ae0d9491cc4ce1d944c8544debf07d208dbf4c837427c + checksum/config: 2ebe19c84fd799cfbd9504a0957789f9a289d04bc9a1a08712b09ea6a339c81f spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/only-metrics-platform/rendered_manifests/secret-splunk.yaml b/examples/only-metrics-platform/rendered_manifests/secret-splunk.yaml index 8a80028ec4..145b7e0b75 100644 --- a/examples/only-metrics-platform/rendered_manifests/secret-splunk.yaml +++ b/examples/only-metrics-platform/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/only-metrics-platform/rendered_manifests/service-agent.yaml b/examples/only-metrics-platform/rendered_manifests/service-agent.yaml index 1c27260b53..03dc55f65f 100644 --- a/examples/only-metrics-platform/rendered_manifests/service-agent.yaml +++ b/examples/only-metrics-platform/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/only-metrics-platform/rendered_manifests/serviceAccount.yaml b/examples/only-metrics-platform/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/only-metrics-platform/rendered_manifests/serviceAccount.yaml +++ b/examples/only-metrics-platform/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/only-metrics/rendered_manifests/clusterRole.yaml b/examples/only-metrics/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/only-metrics/rendered_manifests/clusterRole.yaml +++ b/examples/only-metrics/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/only-metrics/rendered_manifests/clusterRoleBinding.yaml b/examples/only-metrics/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/only-metrics/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/only-metrics/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/only-metrics/rendered_manifests/configmap-agent.yaml b/examples/only-metrics/rendered_manifests/configmap-agent.yaml index 171573e189..f902afd296 100644 --- a/examples/only-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/only-metrics/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/only-metrics/rendered_manifests/configmap-cluster-receiver.yaml b/examples/only-metrics/rendered_manifests/configmap-cluster-receiver.yaml index 9c403c1dd5..193c4de474 100644 --- a/examples/only-metrics/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/only-metrics/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/only-metrics/rendered_manifests/daemonset.yaml b/examples/only-metrics/rendered_manifests/daemonset.yaml index 425487acd0..728692684a 100644 --- a/examples/only-metrics/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: d154e83a90699f1647cd3836c92bcb38e3424188ad3e0eedccae98905a79bd76 +======= + checksum/config: b8403e290defd3dc6e079ca74819f50c2ac3dc9eff5b4a5e1309b1968096999e +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml index c7fead9182..b264176a7a 100644 --- a/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 0cc99583a1bdb65c971228e819dde6c80d05cfe90de2433c6105794abfd823ec + checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/only-metrics/rendered_manifests/secret-splunk.yaml b/examples/only-metrics/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/only-metrics/rendered_manifests/secret-splunk.yaml +++ b/examples/only-metrics/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/only-metrics/rendered_manifests/service-agent.yaml b/examples/only-metrics/rendered_manifests/service-agent.yaml index 1c27260b53..03dc55f65f 100644 --- a/examples/only-metrics/rendered_manifests/service-agent.yaml +++ b/examples/only-metrics/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/only-metrics/rendered_manifests/serviceAccount.yaml b/examples/only-metrics/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/only-metrics/rendered_manifests/serviceAccount.yaml +++ b/examples/only-metrics/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/only-traces/rendered_manifests/clusterRole.yaml b/examples/only-traces/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/only-traces/rendered_manifests/clusterRole.yaml +++ b/examples/only-traces/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/only-traces/rendered_manifests/clusterRoleBinding.yaml b/examples/only-traces/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/only-traces/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/only-traces/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/only-traces/rendered_manifests/configmap-agent.yaml b/examples/only-traces/rendered_manifests/configmap-agent.yaml index 99c8b1e5d3..5fb02f0cb3 100644 --- a/examples/only-traces/rendered_manifests/configmap-agent.yaml +++ b/examples/only-traces/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/only-traces/rendered_manifests/daemonset.yaml b/examples/only-traces/rendered_manifests/daemonset.yaml index a6ea6f180a..ccf3c5a83e 100644 --- a/examples/only-traces/rendered_manifests/daemonset.yaml +++ b/examples/only-traces/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 0e2f07249c84fbe9eaf8fe3b794838e6e9ae02ab4ac9c9ed019e3e21d395d5bc + checksum/config: db301b13e34d9ae14ccdeda3bce410b2dedd0a53cb80f9b6c681cb58b2107943 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/only-traces/rendered_manifests/secret-splunk.yaml b/examples/only-traces/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/only-traces/rendered_manifests/secret-splunk.yaml +++ b/examples/only-traces/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/only-traces/rendered_manifests/service-agent.yaml b/examples/only-traces/rendered_manifests/service-agent.yaml index 921ab5ca66..ba5000eca2 100644 --- a/examples/only-traces/rendered_manifests/service-agent.yaml +++ b/examples/only-traces/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/only-traces/rendered_manifests/serviceAccount.yaml b/examples/only-traces/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/only-traces/rendered_manifests/serviceAccount.yaml +++ b/examples/only-traces/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/clusterRole.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/clusterRole.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/clusterRoleBinding.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml index 86299e68fa..a4630adef9 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-cluster-receiver.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-cluster-receiver.yaml index 92819888ca..182cbf54ce 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: 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 c0f14ae98c..59373b4ee8 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 @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: eb8be293b222b3aaa99cd6324cfed67702ba9685e87d7f8e71d49fe0b2f43502 +======= + checksum/config: 0d2a98565f056f4e136deb781ea314499077d8cad9e0b873a7e08541d7e316ac +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml index e5e7fc8065..62bfb4767d 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 4f393cb2364d7740745c241aaf88f9a323cbfeee393491754d561fcfb409c8fb + checksum/config: ea4abbb36af6031e76cb8af5268707cb8449b3839b957f6206f342e8faa87ba8 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/secret-splunk.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/secret-splunk.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/service-agent.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/service-agent.yaml index 4e91fe2676..95c885c814 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/service-agent.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/serviceAccount.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/serviceAccount.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/secret-validation/rendered_manifests/clusterRole.yaml b/examples/secret-validation/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/secret-validation/rendered_manifests/clusterRole.yaml +++ b/examples/secret-validation/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/secret-validation/rendered_manifests/clusterRoleBinding.yaml b/examples/secret-validation/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/secret-validation/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/secret-validation/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/secret-validation/rendered_manifests/configmap-agent.yaml b/examples/secret-validation/rendered_manifests/configmap-agent.yaml index 9aac7ae7e0..a05f443cbd 100644 --- a/examples/secret-validation/rendered_manifests/configmap-agent.yaml +++ b/examples/secret-validation/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/secret-validation/rendered_manifests/daemonset.yaml b/examples/secret-validation/rendered_manifests/daemonset.yaml index 162d0e602e..e1b156dc48 100644 --- a/examples/secret-validation/rendered_manifests/daemonset.yaml +++ b/examples/secret-validation/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: c05a45154d875a5093b70a10a8e1b1e123f4badaa3370f867bdc9ede2b72bc81 + checksum/config: 578b1d7d7d7d733110ccefa32e1b4f82691184938ae3f0335ed33d7e43066400 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/secret-validation/rendered_manifests/secret-splunk-validation-hook.yaml b/examples/secret-validation/rendered_manifests/secret-splunk-validation-hook.yaml index 8908e441e9..ac23c0199b 100644 --- a/examples/secret-validation/rendered_manifests/secret-splunk-validation-hook.yaml +++ b/examples/secret-validation/rendered_manifests/secret-splunk-validation-hook.yaml @@ -9,7 +9,7 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" diff --git a/examples/secret-validation/rendered_manifests/service-agent.yaml b/examples/secret-validation/rendered_manifests/service-agent.yaml index 780d7bc077..edad6bf223 100644 --- a/examples/secret-validation/rendered_manifests/service-agent.yaml +++ b/examples/secret-validation/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/secret-validation/rendered_manifests/serviceAccount.yaml b/examples/secret-validation/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/secret-validation/rendered_manifests/serviceAccount.yaml +++ b/examples/secret-validation/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/clusterRole.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/clusterRole.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/clusterRoleBinding.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/configmap-agent.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/configmap-agent.yaml index 44f5ef47e3..ed1b78f9d8 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/configmap-agent.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: @@ -41,7 +41,7 @@ data: queue_size: 1000 source: kubernetes splunk_app_name: splunk-otel-collector - splunk_app_version: 0.112.1 + splunk_app_version: 0.113.0 timeout: 10s tls: insecure_skip_verify: false diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml index c43c780e91..99a8dced02 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: d4206a9ee222fe7f09dd4a35e960ccb8367549e54c0fe617f3d416ed81c25f01 + checksum/config: 66e1f37d91e78951760215444772f1fa58b96197824da8a437191e12b8a090f4 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/secret-splunk.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/secret-splunk.yaml index 8a80028ec4..145b7e0b75 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/secret-splunk.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/service-agent.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/service-agent.yaml index 780d7bc077..edad6bf223 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/service-agent.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/serviceAccount.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/serviceAccount.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/target-allocator/rendered_manifests/clusterRole.yaml b/examples/target-allocator/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/target-allocator/rendered_manifests/clusterRole.yaml +++ b/examples/target-allocator/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/target-allocator/rendered_manifests/clusterRoleBinding.yaml b/examples/target-allocator/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/target-allocator/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/target-allocator/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/target-allocator/rendered_manifests/configmap-agent.yaml b/examples/target-allocator/rendered_manifests/configmap-agent.yaml index 8917e420ae..3f8b58f9af 100644 --- a/examples/target-allocator/rendered_manifests/configmap-agent.yaml +++ b/examples/target-allocator/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/target-allocator/rendered_manifests/configmap-cluster-receiver.yaml b/examples/target-allocator/rendered_manifests/configmap-cluster-receiver.yaml index 9c403c1dd5..193c4de474 100644 --- a/examples/target-allocator/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/target-allocator/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/target-allocator/rendered_manifests/daemonset.yaml b/examples/target-allocator/rendered_manifests/daemonset.yaml index 3dc613065b..9751ae4747 100644 --- a/examples/target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/target-allocator/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: c61c9e9893167bca52445f48aa1e466f73b15189d99821e46fac5b507798c67f +======= + checksum/config: b7a3eef28d41eaa9debd9726868c6eb5ef5183487cdcddc6cbc963950894a75e +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/target-allocator/rendered_manifests/deployment-cluster-receiver.yaml b/examples/target-allocator/rendered_manifests/deployment-cluster-receiver.yaml index c7fead9182..b264176a7a 100644 --- a/examples/target-allocator/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/target-allocator/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 0cc99583a1bdb65c971228e819dde6c80d05cfe90de2433c6105794abfd823ec + checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/target-allocator/rendered_manifests/secret-splunk.yaml b/examples/target-allocator/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/target-allocator/rendered_manifests/secret-splunk.yaml +++ b/examples/target-allocator/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/target-allocator/rendered_manifests/service-agent.yaml b/examples/target-allocator/rendered_manifests/service-agent.yaml index 4e91fe2676..95c885c814 100644 --- a/examples/target-allocator/rendered_manifests/service-agent.yaml +++ b/examples/target-allocator/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/target-allocator/rendered_manifests/serviceAccount.yaml b/examples/target-allocator/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/target-allocator/rendered_manifests/serviceAccount.yaml +++ b/examples/target-allocator/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/use-proxy/rendered_manifests/clusterRole.yaml b/examples/use-proxy/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/use-proxy/rendered_manifests/clusterRole.yaml +++ b/examples/use-proxy/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/use-proxy/rendered_manifests/clusterRoleBinding.yaml b/examples/use-proxy/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/use-proxy/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/use-proxy/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/use-proxy/rendered_manifests/configmap-agent.yaml b/examples/use-proxy/rendered_manifests/configmap-agent.yaml index ece40e3c75..efab869cdf 100644 --- a/examples/use-proxy/rendered_manifests/configmap-agent.yaml +++ b/examples/use-proxy/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/use-proxy/rendered_manifests/configmap-cluster-receiver.yaml b/examples/use-proxy/rendered_manifests/configmap-cluster-receiver.yaml index 9c403c1dd5..193c4de474 100644 --- a/examples/use-proxy/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/use-proxy/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/use-proxy/rendered_manifests/daemonset.yaml b/examples/use-proxy/rendered_manifests/daemonset.yaml index 4a698031a9..c01df753e6 100644 --- a/examples/use-proxy/rendered_manifests/daemonset.yaml +++ b/examples/use-proxy/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: 8667589d63d8151b2b21a6c35c531d94a0d63d225225f7a9214b881c8c265a6d +======= + checksum/config: 72bb72446fb2d265082dcd21ac9171737298f47265a30a7aec4d64c03976ce7b +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml b/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml index f9d336cb9d..10ba07c70c 100644 --- a/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 0cc99583a1bdb65c971228e819dde6c80d05cfe90de2433c6105794abfd823ec + checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/use-proxy/rendered_manifests/secret-splunk.yaml b/examples/use-proxy/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/use-proxy/rendered_manifests/secret-splunk.yaml +++ b/examples/use-proxy/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/use-proxy/rendered_manifests/service-agent.yaml b/examples/use-proxy/rendered_manifests/service-agent.yaml index 4e91fe2676..95c885c814 100644 --- a/examples/use-proxy/rendered_manifests/service-agent.yaml +++ b/examples/use-proxy/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/use-proxy/rendered_manifests/serviceAccount.yaml b/examples/use-proxy/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/use-proxy/rendered_manifests/serviceAccount.yaml +++ b/examples/use-proxy/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/with-target-allocator/rendered_manifests/clusterRole.yaml b/examples/with-target-allocator/rendered_manifests/clusterRole.yaml index ca89e35346..f365299bde 100644 --- a/examples/with-target-allocator/rendered_manifests/clusterRole.yaml +++ b/examples/with-target-allocator/rendered_manifests/clusterRole.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm rules: diff --git a/examples/with-target-allocator/rendered_manifests/clusterRoleBinding.yaml b/examples/with-target-allocator/rendered_manifests/clusterRoleBinding.yaml index def7c0ef02..e19e3f9a00 100644 --- a/examples/with-target-allocator/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/with-target-allocator/rendered_manifests/clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml b/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml index f8c92cb176..874fdf2897 100644 --- a/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml +++ b/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/with-target-allocator/rendered_manifests/configmap-cluster-receiver.yaml b/examples/with-target-allocator/rendered_manifests/configmap-cluster-receiver.yaml index 9c403c1dd5..193c4de474 100644 --- a/examples/with-target-allocator/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/with-target-allocator/rendered_manifests/configmap-cluster-receiver.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/with-target-allocator/rendered_manifests/daemonset.yaml b/examples/with-target-allocator/rendered_manifests/daemonset.yaml index 06688cfb00..600d06f0b5 100644 --- a/examples/with-target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/with-target-allocator/rendered_manifests/daemonset.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm spec: @@ -32,7 +32,11 @@ spec: component: otel-collector-agent release: default annotations: +<<<<<<< HEAD checksum/config: fe1bd8cc585a8584abd85e61b664d57fb6a30fc496bd9bea081da81e2f67e86e +======= + checksum/config: f585ef32756db41286dc7123e0e7a3a4bf3eae3223d2439f2bcfb1fbca5ee371 +>>>>>>> f632525f (Prepare release 0.113.0) kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/with-target-allocator/rendered_manifests/deployment-cluster-receiver.yaml b/examples/with-target-allocator/rendered_manifests/deployment-cluster-receiver.yaml index c7fead9182..b264176a7a 100644 --- a/examples/with-target-allocator/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/with-target-allocator/rendered_manifests/deployment-cluster-receiver.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-k8s-cluster-receiver @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 0cc99583a1bdb65c971228e819dde6c80d05cfe90de2433c6105794abfd823ec + checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/with-target-allocator/rendered_manifests/secret-splunk.yaml b/examples/with-target-allocator/rendered_manifests/secret-splunk.yaml index 21de7b87c9..c550912dc9 100644 --- a/examples/with-target-allocator/rendered_manifests/secret-splunk.yaml +++ b/examples/with-target-allocator/rendered_manifests/secret-splunk.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm type: Opaque diff --git a/examples/with-target-allocator/rendered_manifests/service-agent.yaml b/examples/with-target-allocator/rendered_manifests/service-agent.yaml index 4e91fe2676..95c885c814 100644 --- a/examples/with-target-allocator/rendered_manifests/service-agent.yaml +++ b/examples/with-target-allocator/rendered_manifests/service-agent.yaml @@ -7,13 +7,13 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector component: otel-collector-agent - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm app.kubernetes.io/component: otel-collector-agent diff --git a/examples/with-target-allocator/rendered_manifests/serviceAccount.yaml b/examples/with-target-allocator/rendered_manifests/serviceAccount.yaml index 5366c66856..2a5a436cd2 100644 --- a/examples/with-target-allocator/rendered_manifests/serviceAccount.yaml +++ b/examples/with-target-allocator/rendered_manifests/serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/examples/with-target-allocator/rendered_manifests/targetAllocator-clusterRoleBinding.yaml b/examples/with-target-allocator/rendered_manifests/targetAllocator-clusterRoleBinding.yaml index a187afe67e..8e8c4a6e64 100644 --- a/examples/with-target-allocator/rendered_manifests/targetAllocator-clusterRoleBinding.yaml +++ b/examples/with-target-allocator/rendered_manifests/targetAllocator-clusterRoleBinding.yaml @@ -6,12 +6,12 @@ metadata: name: default-splunk-otel-collector-ta-clusterRoleBinding labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm roleRef: diff --git a/examples/with-target-allocator/rendered_manifests/targetAllocator-configmap.yaml b/examples/with-target-allocator/rendered_manifests/targetAllocator-configmap.yaml index bc755dcec6..d1b5a1da3c 100644 --- a/examples/with-target-allocator/rendered_manifests/targetAllocator-configmap.yaml +++ b/examples/with-target-allocator/rendered_manifests/targetAllocator-configmap.yaml @@ -7,12 +7,12 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm data: diff --git a/examples/with-target-allocator/rendered_manifests/targetAllocator-serviceAccount.yaml b/examples/with-target-allocator/rendered_manifests/targetAllocator-serviceAccount.yaml index 12e26e87aa..48d87a2c2c 100644 --- a/examples/with-target-allocator/rendered_manifests/targetAllocator-serviceAccount.yaml +++ b/examples/with-target-allocator/rendered_manifests/targetAllocator-serviceAccount.yaml @@ -8,11 +8,11 @@ metadata: namespace: default labels: app.kubernetes.io/name: splunk-otel-collector - helm.sh/chart: splunk-otel-collector-0.112.1 + helm.sh/chart: splunk-otel-collector-0.113.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default app.kubernetes.io/version: "0.113.0" app: splunk-otel-collector - chart: splunk-otel-collector-0.112.1 + chart: splunk-otel-collector-0.113.0 release: default heritage: Helm diff --git a/helm-charts/splunk-otel-collector/Chart.yaml b/helm-charts/splunk-otel-collector/Chart.yaml index 083c4cb33f..b838e378d6 100644 --- a/helm-charts/splunk-otel-collector/Chart.yaml +++ b/helm-charts/splunk-otel-collector/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: splunk-otel-collector -version: 0.112.1 +version: 0.113.0 appVersion: 0.113.0 description: Splunk OpenTelemetry Collector for Kubernetes icon: https://github.com/signalfx/splunk-otel-collector-chart/tree/main/splunk.png From f3beac83526f62ad37730d1cd65625e7bcd88ab7 Mon Sep 17 00:00:00 2001 From: jvoravong <47871238+jvoravong@users.noreply.github.com> Date: Fri, 22 Nov 2024 08:56:31 -0700 Subject: [PATCH 2/4] Update CHANGELOG.md --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67fe15dc01..0110122c30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,6 @@ This Splunk OpenTelemetry Collector for Kubernetes release adopts the [Splunk Op ### 🧰 Bug fixes 🧰 - `agent`: Fixes hostmetrics receiver to use the correct mount path of the host's filesystem from inside the container ([#1547](https://github.com/signalfx/splunk-otel-collector-chart/pull/1547)) -- `agent`: Fix bug where sometimes Instrumentation opentelemetry.io/v1alpha1 can be installed too early ([#1544](https://github.com/signalfx/splunk-otel-collector-chart/pull/1544)) ## [0.112.1] - 2024-11-20 From 9295ed7ad0efe4bc530c46fc93e40a19aa7481c0 Mon Sep 17 00:00:00 2001 From: Dmitry Anoshin Date: Fri, 22 Nov 2024 15:42:55 -0800 Subject: [PATCH 3/4] make render --- .../add-filter-processor/rendered_manifests/daemonset.yaml | 6 +----- .../rendered_manifests/daemonset.yaml | 6 +----- .../add-receiver-creator/rendered_manifests/daemonset.yaml | 6 +----- examples/add-sampler/rendered_manifests/daemonset.yaml | 6 +----- examples/autodetect-istio/rendered_manifests/daemonset.yaml | 6 +----- .../collector-agent-only/rendered_manifests/daemonset.yaml | 6 +----- .../collector-all-modes/rendered_manifests/daemonset.yaml | 6 +----- .../rendered_manifests/daemonset.yaml | 6 +----- examples/crio-logging/rendered_manifests/daemonset.yaml | 6 +----- examples/default/rendered_manifests/daemonset.yaml | 6 +----- .../rendered_manifests/daemonset.yaml | 6 +----- examples/discovery-mode/rendered_manifests/daemonset.yaml | 6 +----- examples/distribution-aks/rendered_manifests/daemonset.yaml | 6 +----- examples/distribution-eks/rendered_manifests/daemonset.yaml | 6 +----- .../rendered_manifests/daemonset.yaml | 6 +----- examples/distribution-gke/rendered_manifests/daemonset.yaml | 6 +----- .../rendered_manifests/daemonset.yaml | 6 +----- .../rendered_manifests/daemonset.yaml | 6 +----- .../rendered_manifests/daemonset.yaml | 6 +----- .../rendered_manifests/daemonset.yaml | 6 +----- .../rendered_manifests/daemonset.yaml | 6 +----- .../rendered_manifests/daemonset.yaml | 6 +----- .../rendered_manifests/daemonset.yaml | 6 +----- examples/multi-metrics/rendered_manifests/daemonset.yaml | 6 +----- .../only-metrics-platform/rendered_manifests/daemonset.yaml | 6 +----- examples/only-metrics/rendered_manifests/daemonset.yaml | 6 +----- .../rendered_manifests/daemonset.yaml | 6 +----- examples/target-allocator/rendered_manifests/daemonset.yaml | 6 +----- examples/use-proxy/rendered_manifests/daemonset.yaml | 6 +----- .../with-target-allocator/rendered_manifests/daemonset.yaml | 6 +----- 30 files changed, 30 insertions(+), 150 deletions(-) diff --git a/examples/add-filter-processor/rendered_manifests/daemonset.yaml b/examples/add-filter-processor/rendered_manifests/daemonset.yaml index 52a8227321..5187441ca6 100644 --- a/examples/add-filter-processor/rendered_manifests/daemonset.yaml +++ b/examples/add-filter-processor/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 1e1d35fe52ea86d3b1c5f6912dfdccb373dbeb11d8079785df4d083cdca125fc -======= - checksum/config: 0a17ab2ba914520cad6014cbf1996bda18676468fa24f6738cbe1f6e5226b1f5 ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: 62b12f9782be458e4d851b56b3736779d9fa819b31d602c2690a85e1e2651398 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml index dfbc0827af..0d1e7447fd 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 6fcdb388a1a73d2963e183f75d50e4b986dbbcc7e8b6fc98340a0fd753e61877 -======= - checksum/config: 866ea1337cdea23d82ba3e26f33231884abf9881c50f586a6c79be9465c12942 ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: 6b91121b6bca3137df4e27936265ce0db0896ac28a41c32b655bd82f566ca63b kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml index 50376ccd9a..f9da0ea33e 100644 --- a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml +++ b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 9fda779728e6dbd2c7fe3b354c87648c0b1db713d9868a5d5042d28a3da1d2f1 -======= - checksum/config: d5c69cbe34b3cd06d24557568cd16de4c1605140c8be0d0cac078d015c3b4573 ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: 98e82d01663b276d8e9d39d0c067119a5e8faecdac14b95bed092414f1d26e4a kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/add-sampler/rendered_manifests/daemonset.yaml b/examples/add-sampler/rendered_manifests/daemonset.yaml index 501312fe76..43511b5e3a 100644 --- a/examples/add-sampler/rendered_manifests/daemonset.yaml +++ b/examples/add-sampler/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 13a7820b7cb33de19301208985377a91d7c098fbc57c54ee235c4bd4bf1e258f -======= - checksum/config: a145b2516d12f7fc23e8f4789ef24b381f6bc9f437f150249a873e68d86ddc6e ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: c516877b22714b6549007864d7a67fbb8247f2e9c7b3f3103cb758e734b07fac kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/autodetect-istio/rendered_manifests/daemonset.yaml b/examples/autodetect-istio/rendered_manifests/daemonset.yaml index 5b1fa4c186..5a549a8749 100644 --- a/examples/autodetect-istio/rendered_manifests/daemonset.yaml +++ b/examples/autodetect-istio/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 66b21e5dabb057fd110eebd50a90c0e8e58156b6b26cc4c606645bc772ba91e7 -======= - checksum/config: e503248ce4c1f757af3fdac6c7c27c8d13b0292497134c7fc6884452c60a02df ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: 6e673abe5511ec2032b2d3ae7db8f3753ed1fde726389c86bfdf44477423e8b6 kubectl.kubernetes.io/default-container: otel-collector sidecar.istio.io/inject: "false" spec: diff --git a/examples/collector-agent-only/rendered_manifests/daemonset.yaml b/examples/collector-agent-only/rendered_manifests/daemonset.yaml index 2b4334c365..89dff1db4d 100644 --- a/examples/collector-agent-only/rendered_manifests/daemonset.yaml +++ b/examples/collector-agent-only/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 8667589d63d8151b2b21a6c35c531d94a0d63d225225f7a9214b881c8c265a6d -======= - checksum/config: 72bb72446fb2d265082dcd21ac9171737298f47265a30a7aec4d64c03976ce7b ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: 777574d73f3948712985d93f22b80f7fd878e5b96d08e33ca35a949b7c826943 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/collector-all-modes/rendered_manifests/daemonset.yaml b/examples/collector-all-modes/rendered_manifests/daemonset.yaml index d4a35261b6..e3f922ff10 100644 --- a/examples/collector-all-modes/rendered_manifests/daemonset.yaml +++ b/examples/collector-all-modes/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 314eed3acbc1c301a3749a2c53587f8bf911c91ecad613872f01ad5b2012dca7 -======= - checksum/config: 450a13479fa5f27e7a7fe9d4750387be02031ade0b3e7cd1de0380a4e94019aa ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: 83e5487eaf9d38ed3e7b0e1794194e13e9999148ea9b243cb722b20c2e65f69e kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml index 28f6905c09..561ebcb841 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 8613bc77558deeb8d0540993de3b26e528120ce7e6adcfb0f644b33bf9b007fa -======= - checksum/config: d84f38b67a8a23f29c92cd302b138a6e24d2438cddd2e8ac7c56f9ab1d6f516d ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: bd7c6d887d5635760fdfce06ba65107fbebf3ce9b25eb718b654b1f7274d767a kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/crio-logging/rendered_manifests/daemonset.yaml b/examples/crio-logging/rendered_manifests/daemonset.yaml index 2b4334c365..89dff1db4d 100644 --- a/examples/crio-logging/rendered_manifests/daemonset.yaml +++ b/examples/crio-logging/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 8667589d63d8151b2b21a6c35c531d94a0d63d225225f7a9214b881c8c265a6d -======= - checksum/config: 72bb72446fb2d265082dcd21ac9171737298f47265a30a7aec4d64c03976ce7b ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: 777574d73f3948712985d93f22b80f7fd878e5b96d08e33ca35a949b7c826943 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/default/rendered_manifests/daemonset.yaml b/examples/default/rendered_manifests/daemonset.yaml index 2b4334c365..89dff1db4d 100644 --- a/examples/default/rendered_manifests/daemonset.yaml +++ b/examples/default/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 8667589d63d8151b2b21a6c35c531d94a0d63d225225f7a9214b881c8c265a6d -======= - checksum/config: 72bb72446fb2d265082dcd21ac9171737298f47265a30a7aec4d64c03976ce7b ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: 777574d73f3948712985d93f22b80f7fd878e5b96d08e33ca35a949b7c826943 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml index 7aa8395d52..0354692f14 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: ef6f7965727ca30cdf440838ca6301d52c9ca24c4d1f1d41a6d2490b64d2f084 -======= - checksum/config: afc411e671e4bc4c73bb03837338d5b5afc46ebb557ff6984de5486428bbff0a ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: b004ddf898fc1caa94ef51614938704a33563cdd32c01bdb097a597162642cc3 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/discovery-mode/rendered_manifests/daemonset.yaml b/examples/discovery-mode/rendered_manifests/daemonset.yaml index 8d2db61779..329e913d96 100644 --- a/examples/discovery-mode/rendered_manifests/daemonset.yaml +++ b/examples/discovery-mode/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 3578b34b0cceb9c01afbfc50da9b297906412107c73cc23ae5a9fb9abe74364c -======= - checksum/config: 514df56cb4cf6072b9db71ad6bea20306c3efdf3c380375c5ee46f1dc76ebace ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: 6304ccf9319530453afd837d241e5b5af1b36c4de40662d7b5bad40b004a258b kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-aks/rendered_manifests/daemonset.yaml b/examples/distribution-aks/rendered_manifests/daemonset.yaml index c44c515b8f..30654d5ac2 100644 --- a/examples/distribution-aks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-aks/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 9c0deba254b35108ce13c4c1903b1894cbfbf924b3b285ece073d9b636c29863 -======= - checksum/config: ef88b97ecd29fa5abf626cdb0d4994a9be693aa4d9664a72b9acdd07750eb2d7 ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: dcc20675c31a093e01099e1db64434a6f6cccfa8c8d1949d3b2173673d5221ec kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-eks/rendered_manifests/daemonset.yaml b/examples/distribution-eks/rendered_manifests/daemonset.yaml index 7b8e4b69f4..88a106be9c 100644 --- a/examples/distribution-eks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-eks/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: e0c7fdcdccb1ee8d8e191c70097f8cebfff33546c0dc2bf2d4ba83f114c22c25 -======= - checksum/config: b8499550bfe707f3362d3ba8101dc753dfacee95e2bb31f50f03402710caadd1 ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: a8fe90475cc286359dd2944b3a3af5b5e2b6f776e987da995f421216e348a41e kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml index 7bd9267b3d..2eaf175419 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 8cbfdd1dee09d8e1ccc6e82ffe4f900dcde02b03c54450790d5493d3ad665cb4 -======= - checksum/config: 778f2eb4bc742fa78ddc4fc49d5f12c8d4e3d02d59bcf402b1d522ee24a6fcd6 ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: c3292448f4b1f0def03cfde9e2772349cb2a533c3a70a412e4cbbf5b1507b787 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-gke/rendered_manifests/daemonset.yaml b/examples/distribution-gke/rendered_manifests/daemonset.yaml index 9ec4e39caa..5be7b9eddf 100644 --- a/examples/distribution-gke/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 710a9e155ba1e8a234e56eade0d4feec1bbe5d23b7493ddcfe96110e5805b7d0 -======= - checksum/config: 3312f1d5af6185f73b2562a369de8ad13cbcda1dcc06c07183e95db6194d2a40 ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: 56cf37f1b1eff2f7a9e128a839efab64ec48afc5ae1116006d670e079f8a71d4 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/distribution-openshift/rendered_manifests/daemonset.yaml b/examples/distribution-openshift/rendered_manifests/daemonset.yaml index 34420135da..e8f8d8539e 100644 --- a/examples/distribution-openshift/rendered_manifests/daemonset.yaml +++ b/examples/distribution-openshift/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 9343d86abbbf7dd2b6d588124ab613ad241dfd39c8d138297e4ff3bdfe839215 -======= - checksum/config: c235b6b88519ff1d1f6e9b5fdd7e60cbd22cc81bd6165478e891eb24a827277f ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: 8e095feeacd3811fb1b231b8f0d86f4c782ca875aee425d6335535d2572c5bf4 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true 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 0e85606138..4bf799d1b3 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 32d6799629be439ea0fa354d3b1e1f91091ec8b03bde85870c85838fa4b4b8f1 -======= - checksum/config: a42b2f76f11cea9bd571629d0bfcbd454d255427dec3083819d6b093844dad3d ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: 79059b846a30bbc5b483a786ee108a4112a98f1886fdef97969b9f3687000749 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml index 513774c69e..e1102b6f27 100644 --- a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 4afcd938e39e7c9ca40fed841694074c4b93ef7ca239e27cb78164f256b79dc0 -======= - checksum/config: 4c3a013efb496c0edd4fa606449b83d7f924be5ba515f132fbbc96f8ff5ec9b8 ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: 1a4382f5b77cb685de6686b307d6ea58f3a3c3da04463d088e8080f8f11c1fb1 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml index e59ea8caa8..1617beca9b 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 109a34ada5fdbe442a1cea77957cc5bec656a59d506f8497b0f64770a230a09c -======= - checksum/config: 3045ad9dc77eafb989e7a666d1d06bfa77e0352607fa4673971426cc967dce3f ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: aa6537d1dac202cd66363f17ce3173efe1dad71dfecd6a5b32e48837970dccc5 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true 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 e9b705e3d8..3c02778fc6 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 @@ -33,11 +33,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 2872074fc1f7e6e087a3652dc750fa9ea3561f26fd5d2e98c476e477dd3ca7cc -======= - checksum/config: b8dda031ee76b98853d8d33f90a3d70ee8572f34901b62726cac9b789e6f6151 ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: 7aec05b09489238f40b5db4c375900ed0fbd7a4295df4a732a879b5d166bd6cd kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml index ce07138408..c70fb4bea4 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml @@ -33,11 +33,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: f06168115df4b166185f3b66b518cda0d69835a9a59894db8a72cab8e694f899 -======= - checksum/config: bd30657da5b61553852b6291597cc15649f876a49f52bd64b3987958c387e480 ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: fa9cd8190ae8522320ba56f2574d27d32e937c4f331edac13af02c307eb9bfda kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml index a43e25a9e1..b4f2675786 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: a5e0912f6068cb152a6e77a3b8c251d48396619dbff5f11dba86e98bdfc20d1d -======= - checksum/config: 804492b0696c8f559adf6e47c7968e900e52ca471e69474314d7ddfa4d6f00c6 ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: 0f820425d8e3ec1265f78ed76a73995fc647a0a05cfa263b2621674c31302c5e kubectl.kubernetes.io/default-container: otel-collector spec: dnsPolicy: ClusterFirstWithHostNet diff --git a/examples/multi-metrics/rendered_manifests/daemonset.yaml b/examples/multi-metrics/rendered_manifests/daemonset.yaml index d29214c3d4..6f5a5ea020 100644 --- a/examples/multi-metrics/rendered_manifests/daemonset.yaml +++ b/examples/multi-metrics/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 3775265cfa376e304096ba49634c0bc60efa287083d328b475e4c2477bb7afd9 -======= - checksum/config: a1d64cf561a4db277a15087ee8c05c33ff98a2636b158107563bd271e9321baa ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: 95a8f2e139ce46d93d5d388a0ac6410b9ac3810940f67c3ff217942f1eb10829 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index 37ac546869..52e0c5e07f 100644 --- a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: d50d8169a27518fd76ad489d1cb8ef1b47e6301d9a507b259752268a52b18d06 -======= - checksum/config: d3393adc06b7f2fa9905916078e53f4f55ded69c1a135d8c039aa597730f0449 ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: 9143bce1e08ae4a051c797ef2ba503f0101f143b911653d71752d3252c888bb7 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/only-metrics/rendered_manifests/daemonset.yaml b/examples/only-metrics/rendered_manifests/daemonset.yaml index 728692684a..6b21f50e70 100644 --- a/examples/only-metrics/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: d154e83a90699f1647cd3836c92bcb38e3424188ad3e0eedccae98905a79bd76 -======= - checksum/config: b8403e290defd3dc6e079ca74819f50c2ac3dc9eff5b4a5e1309b1968096999e ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: fa508b761cb98ff0bc8b5fbc62e28016b574101048c9b69ec067572278a9a634 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true 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 59373b4ee8..44b2117cd9 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 @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: eb8be293b222b3aaa99cd6324cfed67702ba9685e87d7f8e71d49fe0b2f43502 -======= - checksum/config: 0d2a98565f056f4e136deb781ea314499077d8cad9e0b873a7e08541d7e316ac ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: a48a65ca17ab387b3a2358dc33ad091c53309eb0d371955defbf5500dbe1c5af kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/target-allocator/rendered_manifests/daemonset.yaml b/examples/target-allocator/rendered_manifests/daemonset.yaml index 9751ae4747..e87af61120 100644 --- a/examples/target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/target-allocator/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: c61c9e9893167bca52445f48aa1e466f73b15189d99821e46fac5b507798c67f -======= - checksum/config: b7a3eef28d41eaa9debd9726868c6eb5ef5183487cdcddc6cbc963950894a75e ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: be77a1e4ac17791bcde7128e6b566358a9deb90a24fc8c386ca40f0a5dcda325 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/use-proxy/rendered_manifests/daemonset.yaml b/examples/use-proxy/rendered_manifests/daemonset.yaml index c01df753e6..c3da433cad 100644 --- a/examples/use-proxy/rendered_manifests/daemonset.yaml +++ b/examples/use-proxy/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: 8667589d63d8151b2b21a6c35c531d94a0d63d225225f7a9214b881c8c265a6d -======= - checksum/config: 72bb72446fb2d265082dcd21ac9171737298f47265a30a7aec4d64c03976ce7b ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: 777574d73f3948712985d93f22b80f7fd878e5b96d08e33ca35a949b7c826943 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true diff --git a/examples/with-target-allocator/rendered_manifests/daemonset.yaml b/examples/with-target-allocator/rendered_manifests/daemonset.yaml index 600d06f0b5..6cbe4fe14b 100644 --- a/examples/with-target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/with-target-allocator/rendered_manifests/daemonset.yaml @@ -32,11 +32,7 @@ spec: component: otel-collector-agent release: default annotations: -<<<<<<< HEAD - checksum/config: fe1bd8cc585a8584abd85e61b664d57fb6a30fc496bd9bea081da81e2f67e86e -======= - checksum/config: f585ef32756db41286dc7123e0e7a3a4bf3eae3223d2439f2bcfb1fbca5ee371 ->>>>>>> f632525f (Prepare release 0.113.0) + checksum/config: 331113a08a530204f0895358fb1c3b56f6caa37bf572a54181bcf12a03e78a62 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true From 53ae5364905fee69c87c0d504cbad499b393344d Mon Sep 17 00:00:00 2001 From: Dmitry Anoshin Date: Fri, 22 Nov 2024 15:43:56 -0800 Subject: [PATCH 4/4] update changelog --- .chloggen/fix-scraping-error.yaml | 8 -------- CHANGELOG.md | 3 ++- 2 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 .chloggen/fix-scraping-error.yaml diff --git a/.chloggen/fix-scraping-error.yaml b/.chloggen/fix-scraping-error.yaml deleted file mode 100644 index 79902d1ca6..0000000000 --- a/.chloggen/fix-scraping-error.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix -# 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: Exclude scraping filesystem metrics from mounts that are not accessible from inside the container to avoid scraping errors. -# One or more tracking issues related to the change -issues: [1550] diff --git a/CHANGELOG.md b/CHANGELOG.md index 0110122c30..f162e27664 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,13 +4,14 @@ -## [0.113.0] - 2024-11-21 +## [0.113.0] - 2024-11-22 This Splunk OpenTelemetry Collector for Kubernetes release adopts the [Splunk OpenTelemetry Collector v0.113.0](https://github.com/signalfx/splunk-otel-collector/releases/tag/v0.113.0). ### 🧰 Bug fixes 🧰 - `agent`: Fixes hostmetrics receiver to use the correct mount path of the host's filesystem from inside the container ([#1547](https://github.com/signalfx/splunk-otel-collector-chart/pull/1547)) +- `agent`: Exclude scraping filesystem metrics from mounts that are not accessible from inside the container to avoid scraping errors. ([#1550](https://github.com/signalfx/splunk-otel-collector-chart/pull/1550)) ## [0.112.1] - 2024-11-20