From 86483ec76341f702f63808f31f7f3e87b1bbbb07 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Sat, 3 Aug 2024 21:48:52 -0700 Subject: [PATCH] [agent] Remove deprecated OTLP HTTP port from daemonset default open ports (#1359) --- .chloggen/removedeprecatedotlphttpport.yaml | 12 ++++++++++++ .../rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../add-sampler/rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/deployment-gateway.yaml | 3 --- .../rendered_manifests/service.yaml | 4 ---- .../rendered_manifests/deployment-gateway.yaml | 3 --- .../rendered_manifests/service.yaml | 4 ---- .../crio-logging/rendered_manifests/daemonset.yaml | 3 --- examples/default/rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../discovery-mode/rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/deployment-gateway.yaml | 3 --- .../rendered_manifests/service.yaml | 4 ---- .../rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../multi-metrics/rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../only-logs-otel/rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../only-metrics/rendered_manifests/daemonset.yaml | 3 --- .../only-traces/rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- .../rendered_manifests/daemonset.yaml | 3 --- examples/use-proxy/rendered_manifests/daemonset.yaml | 3 --- .../templates/config/_common.tpl | 1 - helm-charts/splunk-otel-collector/values.yaml | 8 -------- 43 files changed, 12 insertions(+), 132 deletions(-) create mode 100644 .chloggen/removedeprecatedotlphttpport.yaml diff --git a/.chloggen/removedeprecatedotlphttpport.yaml b/.chloggen/removedeprecatedotlphttpport.yaml new file mode 100644 index 0000000000..eeeca883c7 --- /dev/null +++ b/.chloggen/removedeprecatedotlphttpport.yaml @@ -0,0 +1,12 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking +# 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: Remove the deprecated OTLP HTTP port 55681 +# One or more tracking issues related to the change +issues: [1359] +# (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/examples/add-filter-processor/rendered_manifests/daemonset.yaml b/examples/add-filter-processor/rendered_manifests/daemonset.yaml index 669ced2813..646a7e8c2a 100644 --- a/examples/add-filter-processor/rendered_manifests/daemonset.yaml +++ b/examples/add-filter-processor/rendered_manifests/daemonset.yaml @@ -107,9 +107,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml index f74bfa4303..0fff926116 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml @@ -107,9 +107,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml index c4754d00aa..dfdab0fcd1 100644 --- a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml +++ b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml @@ -68,9 +68,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/add-sampler/rendered_manifests/daemonset.yaml b/examples/add-sampler/rendered_manifests/daemonset.yaml index b16dd7312d..6148163e08 100644 --- a/examples/add-sampler/rendered_manifests/daemonset.yaml +++ b/examples/add-sampler/rendered_manifests/daemonset.yaml @@ -68,9 +68,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/autodetect-istio/rendered_manifests/daemonset.yaml b/examples/autodetect-istio/rendered_manifests/daemonset.yaml index 9e017b0f8e..9c2518ef6f 100644 --- a/examples/autodetect-istio/rendered_manifests/daemonset.yaml +++ b/examples/autodetect-istio/rendered_manifests/daemonset.yaml @@ -108,9 +108,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/collector-agent-only/rendered_manifests/daemonset.yaml b/examples/collector-agent-only/rendered_manifests/daemonset.yaml index 0d5843bbcc..333fcdafe1 100644 --- a/examples/collector-agent-only/rendered_manifests/daemonset.yaml +++ b/examples/collector-agent-only/rendered_manifests/daemonset.yaml @@ -68,9 +68,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/collector-all-modes/rendered_manifests/daemonset.yaml b/examples/collector-all-modes/rendered_manifests/daemonset.yaml index 956c2337e8..7fb3329dba 100644 --- a/examples/collector-all-modes/rendered_manifests/daemonset.yaml +++ b/examples/collector-all-modes/rendered_manifests/daemonset.yaml @@ -68,9 +68,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml b/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml index 541ac8d714..9426bf2281 100644 --- a/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml +++ b/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml @@ -88,9 +88,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: signalfx containerPort: 9943 protocol: TCP diff --git a/examples/collector-all-modes/rendered_manifests/service.yaml b/examples/collector-all-modes/rendered_manifests/service.yaml index c0d06717d1..b24392b655 100644 --- a/examples/collector-all-modes/rendered_manifests/service.yaml +++ b/examples/collector-all-modes/rendered_manifests/service.yaml @@ -40,10 +40,6 @@ spec: port: 4318 targetPort: otlp-http protocol: TCP - - name: otlp-http-old - port: 55681 - targetPort: otlp-http-old - protocol: TCP - name: signalfx port: 9943 targetPort: signalfx diff --git a/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml b/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml index 12adbec8b9..58dc075e45 100644 --- a/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml +++ b/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml @@ -88,9 +88,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: signalfx containerPort: 9943 protocol: TCP diff --git a/examples/collector-gateway-only/rendered_manifests/service.yaml b/examples/collector-gateway-only/rendered_manifests/service.yaml index c0d06717d1..b24392b655 100644 --- a/examples/collector-gateway-only/rendered_manifests/service.yaml +++ b/examples/collector-gateway-only/rendered_manifests/service.yaml @@ -40,10 +40,6 @@ spec: port: 4318 targetPort: otlp-http protocol: TCP - - name: otlp-http-old - port: 55681 - targetPort: otlp-http-old - protocol: TCP - name: signalfx port: 9943 targetPort: signalfx diff --git a/examples/crio-logging/rendered_manifests/daemonset.yaml b/examples/crio-logging/rendered_manifests/daemonset.yaml index 0d5843bbcc..333fcdafe1 100644 --- a/examples/crio-logging/rendered_manifests/daemonset.yaml +++ b/examples/crio-logging/rendered_manifests/daemonset.yaml @@ -68,9 +68,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/default/rendered_manifests/daemonset.yaml b/examples/default/rendered_manifests/daemonset.yaml index 0d5843bbcc..333fcdafe1 100644 --- a/examples/default/rendered_manifests/daemonset.yaml +++ b/examples/default/rendered_manifests/daemonset.yaml @@ -68,9 +68,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml index 000f151e12..75ca7e4a29 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml @@ -107,9 +107,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/discovery-mode/rendered_manifests/daemonset.yaml b/examples/discovery-mode/rendered_manifests/daemonset.yaml index 6d2e0cc43f..12f7e49e42 100644 --- a/examples/discovery-mode/rendered_manifests/daemonset.yaml +++ b/examples/discovery-mode/rendered_manifests/daemonset.yaml @@ -69,9 +69,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/distribution-aks/rendered_manifests/daemonset.yaml b/examples/distribution-aks/rendered_manifests/daemonset.yaml index 6593d326b5..ea7af0dc0f 100644 --- a/examples/distribution-aks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-aks/rendered_manifests/daemonset.yaml @@ -68,9 +68,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml b/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml index 6085c4fb87..acc4a7ec14 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml @@ -88,9 +88,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: signalfx containerPort: 9943 protocol: TCP diff --git a/examples/distribution-eks-fargate/rendered_manifests/service.yaml b/examples/distribution-eks-fargate/rendered_manifests/service.yaml index c0d06717d1..b24392b655 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/service.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/service.yaml @@ -40,10 +40,6 @@ spec: port: 4318 targetPort: otlp-http protocol: TCP - - name: otlp-http-old - port: 55681 - targetPort: otlp-http-old - protocol: TCP - name: signalfx port: 9943 targetPort: signalfx diff --git a/examples/distribution-eks/rendered_manifests/daemonset.yaml b/examples/distribution-eks/rendered_manifests/daemonset.yaml index 3c48066d78..0d8a901036 100644 --- a/examples/distribution-eks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-eks/rendered_manifests/daemonset.yaml @@ -68,9 +68,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml index fd58676b71..f7353fd3b9 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml @@ -68,9 +68,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/distribution-gke/rendered_manifests/daemonset.yaml b/examples/distribution-gke/rendered_manifests/daemonset.yaml index 6d2eb2ddca..2f395a86c9 100644 --- a/examples/distribution-gke/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke/rendered_manifests/daemonset.yaml @@ -68,9 +68,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/distribution-openshift/rendered_manifests/daemonset.yaml b/examples/distribution-openshift/rendered_manifests/daemonset.yaml index ee5bf7121c..0f3509d2b3 100644 --- a/examples/distribution-openshift/rendered_manifests/daemonset.yaml +++ b/examples/distribution-openshift/rendered_manifests/daemonset.yaml @@ -68,9 +68,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 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 de89c85d02..3fa2c7fdf7 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml @@ -107,9 +107,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml index f80b61c8be..af0564d390 100644 --- a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml @@ -107,9 +107,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml index 6747e4a7d5..32175050e4 100644 --- a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml @@ -68,9 +68,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml index 711b922a47..461ef11a0c 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml @@ -68,9 +68,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 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 3345c5f30d..3352193530 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 @@ -141,9 +141,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml index ea72e45157..80f5693087 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml @@ -141,9 +141,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml index 524fe5bada..5056567aa2 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml @@ -73,9 +73,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/multi-metrics/rendered_manifests/daemonset.yaml b/examples/multi-metrics/rendered_manifests/daemonset.yaml index 9864450000..2aac3fde4b 100644 --- a/examples/multi-metrics/rendered_manifests/daemonset.yaml +++ b/examples/multi-metrics/rendered_manifests/daemonset.yaml @@ -99,9 +99,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: signalfx containerPort: 9943 hostPort: 9943 diff --git a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml index aadcd5b49f..36dd426e19 100644 --- a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml @@ -133,9 +133,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP image: quay.io/signalfx/splunk-otel-collector:0.105.0 imagePullPolicy: IfNotPresent env: diff --git a/examples/only-logs-otel/rendered_manifests/daemonset.yaml b/examples/only-logs-otel/rendered_manifests/daemonset.yaml index 1cd7daa6e1..6e532fae3b 100644 --- a/examples/only-logs-otel/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-otel/rendered_manifests/daemonset.yaml @@ -99,9 +99,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP image: quay.io/signalfx/splunk-otel-collector:0.105.0 imagePullPolicy: IfNotPresent securityContext: 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 f94c2d21b1..a01cc40260 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 @@ -99,9 +99,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP image: quay.io/signalfx/splunk-otel-collector:0.105.0 imagePullPolicy: IfNotPresent securityContext: diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index 7db7a788c5..83db96a049 100644 --- a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml @@ -60,9 +60,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: signalfx containerPort: 9943 hostPort: 9943 diff --git a/examples/only-metrics/rendered_manifests/daemonset.yaml b/examples/only-metrics/rendered_manifests/daemonset.yaml index e344437acd..d8dcd29c57 100644 --- a/examples/only-metrics/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics/rendered_manifests/daemonset.yaml @@ -60,9 +60,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: signalfx containerPort: 9943 hostPort: 9943 diff --git a/examples/only-traces/rendered_manifests/daemonset.yaml b/examples/only-traces/rendered_manifests/daemonset.yaml index da1f30f522..7dfc3b36c1 100644 --- a/examples/only-traces/rendered_manifests/daemonset.yaml +++ b/examples/only-traces/rendered_manifests/daemonset.yaml @@ -68,9 +68,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 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 63aaf72e2c..75fe6de9fa 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 @@ -68,9 +68,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/examples/secret-validation/rendered_manifests/daemonset.yaml b/examples/secret-validation/rendered_manifests/daemonset.yaml index 14212cd758..b2a5bb6f43 100644 --- a/examples/secret-validation/rendered_manifests/daemonset.yaml +++ b/examples/secret-validation/rendered_manifests/daemonset.yaml @@ -99,9 +99,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP image: quay.io/signalfx/splunk-otel-collector:0.105.0 imagePullPolicy: IfNotPresent securityContext: diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml index 8c03156369..9953b4dcd2 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml @@ -99,9 +99,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP image: quay.io/signalfx/splunk-otel-collector:0.105.0 imagePullPolicy: IfNotPresent securityContext: diff --git a/examples/use-proxy/rendered_manifests/daemonset.yaml b/examples/use-proxy/rendered_manifests/daemonset.yaml index 039222cdf5..71b7b1583e 100644 --- a/examples/use-proxy/rendered_manifests/daemonset.yaml +++ b/examples/use-proxy/rendered_manifests/daemonset.yaml @@ -68,9 +68,6 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - - name: otlp-http-old - containerPort: 55681 - protocol: TCP - name: sfx-forwarder containerPort: 9080 hostPort: 9080 diff --git a/helm-charts/splunk-otel-collector/templates/config/_common.tpl b/helm-charts/splunk-otel-collector/templates/config/_common.tpl index 4fec628338..3dcbd2b989 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_common.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_common.tpl @@ -29,7 +29,6 @@ otlp: grpc: endpoint: 0.0.0.0:4317 http: - # Deprecated 55681 port is also open by default: # https://github.com/open-telemetry/opentelemetry-collector/blob/9d3a8a4608a7dbd9f787867226a78356ace9b5e4/receiver/otlpreceiver/otlp.go#L140-L152 endpoint: 0.0.0.0:4318 diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml index 4a49ff6771..167a874bcb 100644 --- a/helm-charts/splunk-otel-collector/values.yaml +++ b/helm-charts/splunk-otel-collector/values.yaml @@ -339,10 +339,6 @@ agent: containerPort: 4318 protocol: TCP enabled_for: [metrics, traces, logs, profiling] - otlp-http-old: - containerPort: 55681 - protocol: TCP - enabled_for: [metrics, traces, logs] sfx-forwarder: containerPort: 9080 hostPort: 9080 @@ -1080,10 +1076,6 @@ gateway: containerPort: 4318 protocol: TCP enabled_for: [metrics, traces, logs] - otlp-http-old: - containerPort: 55681 - protocol: TCP - enabled_for: [metrics, traces, logs] jaeger-thrift: containerPort: 14268 protocol: TCP