From 2f26a0ee542ace063a9fe2f245d0fbfff536951f Mon Sep 17 00:00:00 2001 From: Benedikt Bongartz Date: Mon, 7 Oct 2024 23:07:42 +0200 Subject: [PATCH 1/3] apis/v1beta1: remove ComponentUseLocalHostAsDefaultHost feature gate Signed-off-by: Benedikt Bongartz --- .chloggen/remove_localhost_fg.yaml | 18 +++++++++++++ apis/v1beta1/collector_webhook.go | 22 ---------------- apis/v1beta1/collector_webhook_test.go | 12 --------- pkg/collector/upgrade/upgrade_test.go | 2 +- pkg/collector/upgrade/v0_104_0.go | 22 +++++++++++++++- pkg/collector/upgrade/v0_104_0_test.go | 2 +- pkg/collector/upgrade/v0_110_0.go | 25 +++++++++++++++++++ pkg/collector/upgrade/v0_38_0_test.go | 10 +++----- pkg/collector/upgrade/v0_43_0_test.go | 2 -- pkg/collector/upgrade/versions.go | 4 +++ .../01-assert.yaml | 1 - .../01-assert.yaml | 1 - .../02-assert.yaml | 1 - .../01-assert.yaml | 1 - .../02-assert.yaml | 1 - .../01-assert.yaml | 1 - .../instrumentation-dotnet/01-assert.yaml | 1 - .../instrumentation-go/02-assert.yaml | 1 - .../01-assert.yaml | 1 - .../02-assert.yaml | 1 - .../03-assert.yaml | 1 - .../instrumentation-java/01-assert.yaml | 1 - .../01-assert.yaml | 1 - .../01-assert.yaml | 1 - .../02-assert.yaml | 1 - .../instrumentation-nginx/01-assert.yaml | 1 - .../01-assert.yaml | 1 - .../02-assert.yaml | 1 - .../instrumentation-nodejs/01-assert.yaml | 1 - .../00-install-collector.yaml | 2 ++ .../01-assert.yaml | 1 - .../02-assert.yaml | 1 - .../instrumentation-python/01-assert.yaml | 1 - .../instrumentation-sdk/01-assert.yaml | 1 - .../02-assert.yaml | 1 - .../01-assert.yaml | 1 - .../01-assert.yaml | 1 - .../01-assert.yaml | 1 - .../targetallocator-features/00-assert.yaml | 1 - tests/e2e/daemonset-features/02-assert.yaml | 1 - tests/e2e/statefulset-features/00-assert.yaml | 1 - tests/e2e/statefulset-features/01-assert.yaml | 1 - 42 files changed, 76 insertions(+), 76 deletions(-) create mode 100755 .chloggen/remove_localhost_fg.yaml create mode 100644 pkg/collector/upgrade/v0_110_0.go diff --git a/.chloggen/remove_localhost_fg.yaml b/.chloggen/remove_localhost_fg.yaml new file mode 100755 index 0000000000..efd686eda8 --- /dev/null +++ b/.chloggen/remove_localhost_fg.yaml @@ -0,0 +1,18 @@ +# 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. collector, target allocator, auto-instrumentation, opamp, github action) +component: operator + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Remove ComponentUseLocalHostAsDefaultHost feature gate. + +# One or more tracking issues related to the change +issues: [3306] + +# (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: | + This change may break setups where receiver endpoints are not explicitly configured to listen on e.g. 0.0.0.0. + Change \#3333 attempts to address this issue for a known set of components. diff --git a/apis/v1beta1/collector_webhook.go b/apis/v1beta1/collector_webhook.go index 45744ef3a5..e1a53a543d 100644 --- a/apis/v1beta1/collector_webhook.go +++ b/apis/v1beta1/collector_webhook.go @@ -78,8 +78,6 @@ func (c CollectorWebhook) Default(_ context.Context, obj runtime.Object) error { otelcol.Spec.TargetAllocator.Replicas = &one } - ComponentUseLocalHostAsDefaultHost(otelcol) - if otelcol.Spec.Autoscaler != nil && otelcol.Spec.Autoscaler.MaxReplicas != nil { if otelcol.Spec.Autoscaler.MinReplicas == nil { otelcol.Spec.Autoscaler.MinReplicas = otelcol.Spec.Replicas @@ -453,23 +451,3 @@ func SetupCollectorWebhook(mgr ctrl.Manager, cfg config.Config, reviewer *rbac.R WithDefaulter(cvw). Complete() } - -// ComponentUseLocalHostAsDefaultHost enables component.UseLocalHostAsDefaultHost -// featuregate on the given collector instance. -// NOTE: For more details, visit: -// https://github.com/open-telemetry/opentelemetry-collector/issues/8510 -func ComponentUseLocalHostAsDefaultHost(otelcol *OpenTelemetryCollector) { - const ( - baseFlag = "feature-gates" - fgFlag = "component.UseLocalHostAsDefaultHost" - ) - if otelcol.Spec.Args == nil { - otelcol.Spec.Args = make(map[string]string) - } - args, ok := otelcol.Spec.Args[baseFlag] - if !ok || len(args) == 0 { - otelcol.Spec.Args[baseFlag] = "-" + fgFlag - } else if !strings.Contains(otelcol.Spec.Args[baseFlag], fgFlag) { - otelcol.Spec.Args[baseFlag] += ",-" + fgFlag - } -} diff --git a/apis/v1beta1/collector_webhook_test.go b/apis/v1beta1/collector_webhook_test.go index 9407c0f112..0b6b915486 100644 --- a/apis/v1beta1/collector_webhook_test.go +++ b/apis/v1beta1/collector_webhook_test.go @@ -162,7 +162,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) { }, Spec: v1beta1.OpenTelemetryCollectorSpec{ OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{ - Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"}, ManagementState: v1beta1.ManagementStateManaged, Replicas: &one, }, @@ -195,7 +194,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) { }, Spec: v1beta1.OpenTelemetryCollectorSpec{ OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{ - Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"}, ManagementState: v1beta1.ManagementStateManaged, Replicas: &one, }, @@ -219,7 +217,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) { }, Spec: v1beta1.OpenTelemetryCollectorSpec{ OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{ - Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"}, ManagementState: v1beta1.ManagementStateManaged, Replicas: &one, }, @@ -247,7 +244,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) { Mode: v1beta1.ModeSidecar, UpgradeStrategy: "adhoc", OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{ - Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"}, Replicas: &five, ManagementState: v1beta1.ManagementStateManaged, }, @@ -274,7 +270,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) { Mode: v1beta1.ModeSidecar, UpgradeStrategy: "adhoc", OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{ - Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"}, Replicas: &five, ManagementState: v1beta1.ManagementStateUnmanaged, }, @@ -299,7 +294,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) { Mode: v1beta1.ModeDeployment, UpgradeStrategy: v1beta1.UpgradeStrategyAutomatic, OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{ - Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"}, Replicas: &one, ManagementState: v1beta1.ManagementStateManaged, }, @@ -328,7 +322,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) { Spec: v1beta1.OpenTelemetryCollectorSpec{ Mode: v1beta1.ModeDeployment, OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{ - Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"}, ManagementState: v1beta1.ManagementStateManaged, Replicas: &one, }, @@ -364,7 +357,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) { Spec: v1beta1.OpenTelemetryCollectorSpec{ Mode: v1beta1.ModeDeployment, OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{ - Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"}, Replicas: &one, ManagementState: v1beta1.ManagementStateManaged, PodDisruptionBudget: &v1beta1.PodDisruptionBudgetSpec{ @@ -402,7 +394,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) { Spec: v1beta1.OpenTelemetryCollectorSpec{ Mode: v1beta1.ModeDeployment, OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{ - Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"}, Replicas: &one, ManagementState: v1beta1.ManagementStateManaged, }, @@ -445,7 +436,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) { Spec: v1beta1.OpenTelemetryCollectorSpec{ Mode: v1beta1.ModeDeployment, OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{ - Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"}, Replicas: &one, ManagementState: v1beta1.ManagementStateManaged, }, @@ -483,7 +473,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) { Spec: v1beta1.OpenTelemetryCollectorSpec{ Mode: v1beta1.ModeDeployment, OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{ - Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"}, Replicas: &one, ManagementState: v1beta1.ManagementStateManaged, }, @@ -514,7 +503,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) { Spec: v1beta1.OpenTelemetryCollectorSpec{ Mode: v1beta1.ModeDeployment, OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{ - Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"}, Replicas: &one, ManagementState: v1beta1.ManagementStateManaged, }, diff --git a/pkg/collector/upgrade/upgrade_test.go b/pkg/collector/upgrade/upgrade_test.go index d687e96faf..616b58daa8 100644 --- a/pkg/collector/upgrade/upgrade_test.go +++ b/pkg/collector/upgrade/upgrade_test.go @@ -141,7 +141,7 @@ func TestEnvVarUpdates(t *testing.T) { require.Equal(t, collectorInstance.Status.Version, persisted.Status.Version) currentV := version.Get() - currentV.OpenTelemetryCollector = "0.105.0" + currentV.OpenTelemetryCollector = "0.110.0" up := &upgrade.VersionUpgrade{ Log: logger, Version: currentV, diff --git a/pkg/collector/upgrade/v0_104_0.go b/pkg/collector/upgrade/v0_104_0.go index 45fe8a7461..50a74cc08b 100644 --- a/pkg/collector/upgrade/v0_104_0.go +++ b/pkg/collector/upgrade/v0_104_0.go @@ -27,7 +27,7 @@ func upgrade0_104_0_TA(_ VersionUpgrade, otelcol *v1beta1.OpenTelemetryCollector } func upgrade0_104_0(u VersionUpgrade, otelcol *v1beta1.OpenTelemetryCollector) (*v1beta1.OpenTelemetryCollector, error) { - v1beta1.ComponentUseLocalHostAsDefaultHost(otelcol) + ComponentUseLocalHostAsDefaultHost(otelcol) const issueID = "https://github.com/open-telemetry/opentelemetry-collector/issues/8510" warnStr := fmt.Sprintf( @@ -69,3 +69,23 @@ func TAUnifyEnvVarExpansion(otelcol *v1beta1.OpenTelemetryCollector) { otelcol.Spec.Args[baseFlag] += ",-" + fgFlag } } + +// ComponentUseLocalHostAsDefaultHost enables component.UseLocalHostAsDefaultHost +// featuregate on the given collector instance. +// NOTE: For more details, visit: +// https://github.com/open-telemetry/opentelemetry-collector/issues/8510 +func ComponentUseLocalHostAsDefaultHost(otelcol *v1beta1.OpenTelemetryCollector) { + const ( + baseFlag = "feature-gates" + fgFlag = "component.UseLocalHostAsDefaultHost" + ) + if otelcol.Spec.Args == nil { + otelcol.Spec.Args = make(map[string]string) + } + args, ok := otelcol.Spec.Args[baseFlag] + if !ok || len(args) == 0 { + otelcol.Spec.Args[baseFlag] = "-" + fgFlag + } else if !strings.Contains(otelcol.Spec.Args[baseFlag], fgFlag) { + otelcol.Spec.Args[baseFlag] += ",-" + fgFlag + } +} diff --git a/pkg/collector/upgrade/v0_104_0_test.go b/pkg/collector/upgrade/v0_104_0_test.go index 9f9faf9a74..bdf88e7c8e 100644 --- a/pkg/collector/upgrade/v0_104_0_test.go +++ b/pkg/collector/upgrade/v0_104_0_test.go @@ -56,7 +56,7 @@ func Test0_104_0Upgrade(t *testing.T) { t.Errorf("expect err: nil but got: %v", err) } assert.EqualValues(t, - map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"}, + map[string]string{}, col.Spec.Args, "missing featuregate") } diff --git a/pkg/collector/upgrade/v0_110_0.go b/pkg/collector/upgrade/v0_110_0.go new file mode 100644 index 0000000000..9ffc523116 --- /dev/null +++ b/pkg/collector/upgrade/v0_110_0.go @@ -0,0 +1,25 @@ +// Copyright The OpenTelemetry Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package upgrade + +import ( + "github.com/open-telemetry/opentelemetry-operator/apis/v1beta1" +) + +func upgrade0_110_0(_ VersionUpgrade, otelcol *v1beta1.OpenTelemetryCollector) (*v1beta1.OpenTelemetryCollector, error) { //nolint:unparam + envVarExpansionFeatureFlag := "-component.UseLocalHostAsDefaultHost" + otelcol.Spec.OpenTelemetryCommonFields.Args = RemoveFeatureGate(otelcol.Spec.OpenTelemetryCommonFields.Args, envVarExpansionFeatureFlag) + return otelcol, nil +} diff --git a/pkg/collector/upgrade/v0_38_0_test.go b/pkg/collector/upgrade/v0_38_0_test.go index 3d3b3102bb..26e3d69bbb 100644 --- a/pkg/collector/upgrade/v0_38_0_test.go +++ b/pkg/collector/upgrade/v0_38_0_test.go @@ -82,9 +82,8 @@ service: // verify assert.Equal(t, map[string]string{ - "--hii": "hello", - "--arg1": "", - "feature-gates": "-component.UseLocalHostAsDefaultHost", + "--hii": "hello", + "--arg1": "", }, res.Spec.Args) // verify @@ -149,8 +148,7 @@ service: // verify assert.YAMLEq(t, configWithLogging, res.Spec.Config) assert.Equal(t, map[string]string{ - "--hii": "hello", - "--arg1": "", - "feature-gates": "-component.UseLocalHostAsDefaultHost", + "--hii": "hello", + "--arg1": "", }, res.Spec.Args) } diff --git a/pkg/collector/upgrade/v0_43_0_test.go b/pkg/collector/upgrade/v0_43_0_test.go index 60ee30f3a5..348b1d0b96 100644 --- a/pkg/collector/upgrade/v0_43_0_test.go +++ b/pkg/collector/upgrade/v0_43_0_test.go @@ -82,7 +82,6 @@ service: assert.Equal(t, map[string]string{ "--test-upgrade43": "true", "--test-arg1": "otel", - "feature-gates": "-component.UseLocalHostAsDefaultHost", }, res.Spec.Args) // verify @@ -143,7 +142,6 @@ service: assert.Equal(t, map[string]string{ "--test-upgrade43": "true", "--test-arg1": "otel", - "feature-gates": "-component.UseLocalHostAsDefaultHost", }, res.Spec.Args) } diff --git a/pkg/collector/upgrade/versions.go b/pkg/collector/upgrade/versions.go index a0a06898a0..2d856c4a1f 100644 --- a/pkg/collector/upgrade/versions.go +++ b/pkg/collector/upgrade/versions.go @@ -102,6 +102,10 @@ var ( Version: *semver.MustParse("0.105.0"), upgradeV1beta1: upgrade0_105_0, }, + { + Version: *semver.MustParse("0.110.0"), + upgradeV1beta1: upgrade0_110_0, + }, } // Latest represents the latest version that we need to upgrade. This is not necessarily the latest known version. diff --git a/tests/e2e-instrumentation/instrumentation-apache-httpd/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-apache-httpd/01-assert.yaml index b80944e0c1..6eacda120d 100644 --- a/tests/e2e-instrumentation/instrumentation-apache-httpd/01-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-apache-httpd/01-assert.yaml @@ -46,7 +46,6 @@ spec: - name: otel-apache-conf-dir mountPath: /usr/local/apache2/conf - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-apache-multicontainer/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-apache-multicontainer/01-assert.yaml index 952f1f4d0c..04243da459 100644 --- a/tests/e2e-instrumentation/instrumentation-apache-multicontainer/01-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-apache-multicontainer/01-assert.yaml @@ -76,7 +76,6 @@ spec: - name: OTEL_RESOURCE_ATTRIBUTES name: myrabbit - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-apache-multicontainer/02-assert.yaml b/tests/e2e-instrumentation/instrumentation-apache-multicontainer/02-assert.yaml index 231ca34b7c..fe1c599b6b 100644 --- a/tests/e2e-instrumentation/instrumentation-apache-multicontainer/02-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-apache-multicontainer/02-assert.yaml @@ -56,7 +56,6 @@ spec: - image: rabbitmq name: myrabbit - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/01-assert.yaml index 62bf4b2d11..91ecb8117a 100644 --- a/tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/01-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/01-assert.yaml @@ -128,7 +128,6 @@ spec: - mountPath: /otel-auto-instrumentation-dotnet name: opentelemetry-auto-instrumentation-dotnet - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/02-assert.yaml b/tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/02-assert.yaml index 2e0a9a5399..dfda236729 100644 --- a/tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/02-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/02-assert.yaml @@ -85,7 +85,6 @@ spec: - mountPath: /var/run/secrets/kubernetes.io/serviceaccount readOnly: true - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-dotnet-musl/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-dotnet-musl/01-assert.yaml index 7d12914698..08afb75104 100644 --- a/tests/e2e-instrumentation/instrumentation-dotnet-musl/01-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-dotnet-musl/01-assert.yaml @@ -67,7 +67,6 @@ spec: - mountPath: /otel-auto-instrumentation-dotnet name: opentelemetry-auto-instrumentation-dotnet - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-dotnet/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-dotnet/01-assert.yaml index 964cd5cfe4..1318ded23d 100644 --- a/tests/e2e-instrumentation/instrumentation-dotnet/01-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-dotnet/01-assert.yaml @@ -67,7 +67,6 @@ spec: - mountPath: /otel-auto-instrumentation-dotnet name: opentelemetry-auto-instrumentation-dotnet - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-go/02-assert.yaml b/tests/e2e-instrumentation/instrumentation-go/02-assert.yaml index e5cd59392e..cec1654cbe 100644 --- a/tests/e2e-instrumentation/instrumentation-go/02-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-go/02-assert.yaml @@ -11,7 +11,6 @@ spec: containers: - name: productcatalogservice - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container - env: diff --git a/tests/e2e-instrumentation/instrumentation-java-multicontainer/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-java-multicontainer/01-assert.yaml index 30cd157402..a4dca94976 100644 --- a/tests/e2e-instrumentation/instrumentation-java-multicontainer/01-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-java-multicontainer/01-assert.yaml @@ -110,7 +110,6 @@ spec: - mountPath: /otel-auto-instrumentation-java name: opentelemetry-auto-instrumentation-java - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-java-multicontainer/02-assert.yaml b/tests/e2e-instrumentation/instrumentation-java-multicontainer/02-assert.yaml index eef9e69105..03c002d2d8 100644 --- a/tests/e2e-instrumentation/instrumentation-java-multicontainer/02-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-java-multicontainer/02-assert.yaml @@ -76,7 +76,6 @@ spec: - mountPath: /var/run/secrets/kubernetes.io/serviceaccount readOnly: true - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-java-other-ns/03-assert.yaml b/tests/e2e-instrumentation/instrumentation-java-other-ns/03-assert.yaml index 09da192cf2..0b6ea1db84 100644 --- a/tests/e2e-instrumentation/instrumentation-java-other-ns/03-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-java-other-ns/03-assert.yaml @@ -59,7 +59,6 @@ spec: - mountPath: /otel-auto-instrumentation-java name: opentelemetry-auto-instrumentation-java - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-java/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-java/01-assert.yaml index c641118364..cd8a8a37fe 100644 --- a/tests/e2e-instrumentation/instrumentation-java/01-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-java/01-assert.yaml @@ -59,7 +59,6 @@ spec: - mountPath: /otel-auto-instrumentation-java name: opentelemetry-auto-instrumentation-java - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-nginx-contnr-secctx/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-nginx-contnr-secctx/01-assert.yaml index c465e12eef..01b5a1cf0c 100644 --- a/tests/e2e-instrumentation/instrumentation-nginx-contnr-secctx/01-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-nginx-contnr-secctx/01-assert.yaml @@ -49,7 +49,6 @@ spec: - mountPath: /etc/nginx name: otel-nginx-conf-dir - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/01-assert.yaml index 47b10a1a45..bb25e80bcd 100644 --- a/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/01-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/01-assert.yaml @@ -89,7 +89,6 @@ spec: - mountPath: /var/run/secrets/kubernetes.io/serviceaccount readOnly: true - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/02-assert.yaml b/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/02-assert.yaml index b16e4a4a8a..29a8ccc948 100644 --- a/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/02-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/02-assert.yaml @@ -68,7 +68,6 @@ spec: - mountPath: /var/run/secrets/kubernetes.io/serviceaccount readOnly: true - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-nginx/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-nginx/01-assert.yaml index 7452263c11..c5484ac536 100644 --- a/tests/e2e-instrumentation/instrumentation-nginx/01-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-nginx/01-assert.yaml @@ -56,7 +56,6 @@ spec: - mountPath: /etc/nginx name: otel-nginx-conf-dir - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/01-assert.yaml index df0652b172..7da5c15637 100644 --- a/tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/01-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/01-assert.yaml @@ -100,7 +100,6 @@ spec: - mountPath: /otel-auto-instrumentation-nodejs name: opentelemetry-auto-instrumentation-nodejs - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/02-assert.yaml b/tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/02-assert.yaml index 243f72e7d1..0738786abd 100644 --- a/tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/02-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/02-assert.yaml @@ -72,7 +72,6 @@ spec: - mountPath: /var/run/secrets/kubernetes.io/serviceaccount readOnly: true - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-nodejs/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-nodejs/01-assert.yaml index f8adfc92db..719727ca68 100644 --- a/tests/e2e-instrumentation/instrumentation-nodejs/01-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-nodejs/01-assert.yaml @@ -59,7 +59,6 @@ spec: - mountPath: /otel-auto-instrumentation-nodejs name: opentelemetry-auto-instrumentation-nodejs - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-python-multicontainer/00-install-collector.yaml b/tests/e2e-instrumentation/instrumentation-python-multicontainer/00-install-collector.yaml index 5db3bc0afb..964ffb0443 100644 --- a/tests/e2e-instrumentation/instrumentation-python-multicontainer/00-install-collector.yaml +++ b/tests/e2e-instrumentation/instrumentation-python-multicontainer/00-install-collector.yaml @@ -9,7 +9,9 @@ spec: otlp: protocols: grpc: + endpoint: 0.0.0.0:4317 http: + endpoint: 0.0.0.0:4318 processors: exporters: diff --git a/tests/e2e-instrumentation/instrumentation-python-multicontainer/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-python-multicontainer/01-assert.yaml index 5069eee345..d0e8c12567 100644 --- a/tests/e2e-instrumentation/instrumentation-python-multicontainer/01-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-python-multicontainer/01-assert.yaml @@ -106,7 +106,6 @@ spec: - mountPath: /otel-auto-instrumentation-python name: opentelemetry-auto-instrumentation-python - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-python-multicontainer/02-assert.yaml b/tests/e2e-instrumentation/instrumentation-python-multicontainer/02-assert.yaml index 2916f799e6..da7c987e54 100644 --- a/tests/e2e-instrumentation/instrumentation-python-multicontainer/02-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-python-multicontainer/02-assert.yaml @@ -74,7 +74,6 @@ spec: - mountPath: /var/run/secrets/kubernetes.io/serviceaccount readOnly: true - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-python/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-python/01-assert.yaml index 15a1009ced..62cf682ba0 100644 --- a/tests/e2e-instrumentation/instrumentation-python/01-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-python/01-assert.yaml @@ -59,7 +59,6 @@ spec: - mountPath: /otel-auto-instrumentation-python name: opentelemetry-auto-instrumentation-python - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-instrumentation/instrumentation-sdk/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-sdk/01-assert.yaml index 4806b8e18e..b40ad1208f 100644 --- a/tests/e2e-instrumentation/instrumentation-sdk/01-assert.yaml +++ b/tests/e2e-instrumentation/instrumentation-sdk/01-assert.yaml @@ -45,7 +45,6 @@ spec: - mountPath: /var/run/secrets/kubernetes.io/serviceaccount readOnly: true - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container status: diff --git a/tests/e2e-multi-instrumentation/instrumentation-multi-multicontainer-go/02-assert.yaml b/tests/e2e-multi-instrumentation/instrumentation-multi-multicontainer-go/02-assert.yaml index 5e50fb65d0..71d4e05d06 100644 --- a/tests/e2e-multi-instrumentation/instrumentation-multi-multicontainer-go/02-assert.yaml +++ b/tests/e2e-multi-instrumentation/instrumentation-multi-multicontainer-go/02-assert.yaml @@ -71,7 +71,6 @@ spec: - mountPath: /otel-auto-instrumentation-python name: opentelemetry-auto-instrumentation-python - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG env: - name: POD_NAME diff --git a/tests/e2e-multi-instrumentation/instrumentation-multi-multicontainer/01-assert.yaml b/tests/e2e-multi-instrumentation/instrumentation-multi-multicontainer/01-assert.yaml index 616b048e75..61eabd4e91 100644 --- a/tests/e2e-multi-instrumentation/instrumentation-multi-multicontainer/01-assert.yaml +++ b/tests/e2e-multi-instrumentation/instrumentation-multi-multicontainer/01-assert.yaml @@ -310,7 +310,6 @@ spec: - mountPath: /var/run/secrets/kubernetes.io/serviceaccount readOnly: true - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG env: - name: POD_NAME diff --git a/tests/e2e-multi-instrumentation/instrumentation-multi-no-containers/01-assert.yaml b/tests/e2e-multi-instrumentation/instrumentation-multi-no-containers/01-assert.yaml index 747def41f6..fbadd4f5af 100644 --- a/tests/e2e-multi-instrumentation/instrumentation-multi-no-containers/01-assert.yaml +++ b/tests/e2e-multi-instrumentation/instrumentation-multi-no-containers/01-assert.yaml @@ -26,7 +26,6 @@ spec: - mountPath: /var/run/secrets/kubernetes.io/serviceaccount readOnly: true - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container status: diff --git a/tests/e2e-multi-instrumentation/instrumentation-single-instr-first-container/01-assert.yaml b/tests/e2e-multi-instrumentation/instrumentation-single-instr-first-container/01-assert.yaml index 390e5e6b21..704e8b12a7 100644 --- a/tests/e2e-multi-instrumentation/instrumentation-single-instr-first-container/01-assert.yaml +++ b/tests/e2e-multi-instrumentation/instrumentation-single-instr-first-container/01-assert.yaml @@ -56,7 +56,6 @@ spec: - mountPath: /var/run/secrets/kubernetes.io/serviceaccount readOnly: true - args: - - --feature-gates=-component.UseLocalHostAsDefaultHost - --config=env:OTEL_CONFIG name: otc-container initContainers: diff --git a/tests/e2e-targetallocator/targetallocator-features/00-assert.yaml b/tests/e2e-targetallocator/targetallocator-features/00-assert.yaml index 69dea24df6..fb1aaebc23 100644 --- a/tests/e2e-targetallocator/targetallocator-features/00-assert.yaml +++ b/tests/e2e-targetallocator/targetallocator-features/00-assert.yaml @@ -9,7 +9,6 @@ spec: containers: - args: - --config=/conf/collector.yaml - - --feature-gates=-component.UseLocalHostAsDefaultHost name: otc-container volumeMounts: - mountPath: /conf diff --git a/tests/e2e/daemonset-features/02-assert.yaml b/tests/e2e/daemonset-features/02-assert.yaml index ee69351ecf..03798dbd6d 100644 --- a/tests/e2e/daemonset-features/02-assert.yaml +++ b/tests/e2e/daemonset-features/02-assert.yaml @@ -9,5 +9,4 @@ spec: containers: - args: - --config=/conf/collector.yaml - - --feature-gates=-component.UseLocalHostAsDefaultHost name: otc-container diff --git a/tests/e2e/statefulset-features/00-assert.yaml b/tests/e2e/statefulset-features/00-assert.yaml index 2929ec1138..b80a130bf6 100644 --- a/tests/e2e/statefulset-features/00-assert.yaml +++ b/tests/e2e/statefulset-features/00-assert.yaml @@ -9,7 +9,6 @@ spec: containers: - args: - --config=/conf/collector.yaml - - --feature-gates=-component.UseLocalHostAsDefaultHost name: otc-container volumeMounts: - mountPath: /conf diff --git a/tests/e2e/statefulset-features/01-assert.yaml b/tests/e2e/statefulset-features/01-assert.yaml index a2ddf2ea5b..45584c25f3 100644 --- a/tests/e2e/statefulset-features/01-assert.yaml +++ b/tests/e2e/statefulset-features/01-assert.yaml @@ -9,7 +9,6 @@ spec: containers: - args: - --config=/conf/collector.yaml - - --feature-gates=-component.UseLocalHostAsDefaultHost name: otc-container volumeMounts: - mountPath: /conf From bd901da8bf2acd1729d2a9673ae0c5c8d55e065f Mon Sep 17 00:00:00 2001 From: Benedikt Bongartz Date: Tue, 8 Oct 2024 10:46:44 +0200 Subject: [PATCH 2/3] update changelog Signed-off-by: Benedikt Bongartz --- .chloggen/remove_localhost_fg.yaml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.chloggen/remove_localhost_fg.yaml b/.chloggen/remove_localhost_fg.yaml index efd686eda8..808355faa6 100755 --- a/.chloggen/remove_localhost_fg.yaml +++ b/.chloggen/remove_localhost_fg.yaml @@ -1,11 +1,11 @@ # One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix +change_type: breaking # The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action) -component: operator +component: collector # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove ComponentUseLocalHostAsDefaultHost feature gate. +note: Remove ComponentUseLocalHostAsDefaultHost collector feature gate. # One or more tracking issues related to the change issues: [3306] @@ -16,3 +16,21 @@ issues: [3306] subtext: | This change may break setups where receiver endpoints are not explicitly configured to listen on e.g. 0.0.0.0. Change \#3333 attempts to address this issue for a known set of components. + The operator performs the adjustment for the following receivers: + - otlp/gRPC, otlp/HTTP + - skywalking/gRPC, skywalking/HTTP + - jaeger/gRPC, jaeger/thrift_http, jaeger/thrift_compact, jaeger/thrift_binary + - lok/gRPC, loki/HTTP + - opencensus + - zipkin + - tcplog + - udplog + - fluentforward + - statsd + - awsxray/UDP + - carbon + - collectd + - sapm + - signalfx + - splunk_hec + - wavefront From 96df0e0d3e3f1c04f5415e235259273d246a7572 Mon Sep 17 00:00:00 2001 From: Benedikt Bongartz Date: Tue, 8 Oct 2024 11:32:42 +0200 Subject: [PATCH 3/3] fix Signed-off-by: Benedikt Bongartz --- .chloggen/remove_localhost_fg.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.chloggen/remove_localhost_fg.yaml b/.chloggen/remove_localhost_fg.yaml index 808355faa6..276c3d74b3 100755 --- a/.chloggen/remove_localhost_fg.yaml +++ b/.chloggen/remove_localhost_fg.yaml @@ -17,10 +17,10 @@ subtext: | This change may break setups where receiver endpoints are not explicitly configured to listen on e.g. 0.0.0.0. Change \#3333 attempts to address this issue for a known set of components. The operator performs the adjustment for the following receivers: - - otlp/gRPC, otlp/HTTP - - skywalking/gRPC, skywalking/HTTP - - jaeger/gRPC, jaeger/thrift_http, jaeger/thrift_compact, jaeger/thrift_binary - - lok/gRPC, loki/HTTP + - otlp + - skywalking + - jaeger + - loki - opencensus - zipkin - tcplog