Skip to content

Commit c08913e

Browse files
frzifusfrzifus
committed
apis/v1beta1: remove ComponentUseLocalHostAsDefaultHost feature gate
Signed-off-by: Benedikt Bongartz <[email protected]>
1 parent 20a320c commit c08913e

File tree

8 files changed

+62
-38
lines changed

8 files changed

+62
-38
lines changed

‎.chloggen/remove_localhost_fg.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: bug_fix
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action)
5+
component: operator
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: Remove ComponentUseLocalHostAsDefaultHost feature gate.
9+
10+
# One or more tracking issues related to the change
11+
issues: [3306]
12+
13+
# (Optional) One or more lines of additional information to render under the primary note.
14+
# These lines will be padded with 2 spaces and then inserted directly into the document.
15+
# Use pipe (|) for multiline entries.
16+
subtext:

‎apis/v1beta1/collector_webhook.go

-22
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ func (c CollectorWebhook) Default(_ context.Context, obj runtime.Object) error {
7878
otelcol.Spec.TargetAllocator.Replicas = &one
7979
}
8080

81-
ComponentUseLocalHostAsDefaultHost(otelcol)
82-
8381
if otelcol.Spec.Autoscaler != nil && otelcol.Spec.Autoscaler.MaxReplicas != nil {
8482
if otelcol.Spec.Autoscaler.MinReplicas == nil {
8583
otelcol.Spec.Autoscaler.MinReplicas = otelcol.Spec.Replicas
@@ -453,23 +451,3 @@ func SetupCollectorWebhook(mgr ctrl.Manager, cfg config.Config, reviewer *rbac.R
453451
WithDefaulter(cvw).
454452
Complete()
455453
}
456-
457-
// ComponentUseLocalHostAsDefaultHost enables component.UseLocalHostAsDefaultHost
458-
// featuregate on the given collector instance.
459-
// NOTE: For more details, visit:
460-
// https://github.com/open-telemetry/opentelemetry-collector/issues/8510
461-
func ComponentUseLocalHostAsDefaultHost(otelcol *OpenTelemetryCollector) {
462-
const (
463-
baseFlag = "feature-gates"
464-
fgFlag = "component.UseLocalHostAsDefaultHost"
465-
)
466-
if otelcol.Spec.Args == nil {
467-
otelcol.Spec.Args = make(map[string]string)
468-
}
469-
args, ok := otelcol.Spec.Args[baseFlag]
470-
if !ok || len(args) == 0 {
471-
otelcol.Spec.Args[baseFlag] = "-" + fgFlag
472-
} else if !strings.Contains(otelcol.Spec.Args[baseFlag], fgFlag) {
473-
otelcol.Spec.Args[baseFlag] += ",-" + fgFlag
474-
}
475-
}

‎apis/v1beta1/collector_webhook_test.go

-12
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
162162
},
163163
Spec: v1beta1.OpenTelemetryCollectorSpec{
164164
OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
165-
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
166165
ManagementState: v1beta1.ManagementStateManaged,
167166
Replicas: &one,
168167
},
@@ -195,7 +194,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
195194
},
196195
Spec: v1beta1.OpenTelemetryCollectorSpec{
197196
OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
198-
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
199197
ManagementState: v1beta1.ManagementStateManaged,
200198
Replicas: &one,
201199
},
@@ -219,7 +217,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
219217
},
220218
Spec: v1beta1.OpenTelemetryCollectorSpec{
221219
OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
222-
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
223220
ManagementState: v1beta1.ManagementStateManaged,
224221
Replicas: &one,
225222
},
@@ -247,7 +244,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
247244
Mode: v1beta1.ModeSidecar,
248245
UpgradeStrategy: "adhoc",
249246
OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
250-
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
251247
Replicas: &five,
252248
ManagementState: v1beta1.ManagementStateManaged,
253249
},
@@ -274,7 +270,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
274270
Mode: v1beta1.ModeSidecar,
275271
UpgradeStrategy: "adhoc",
276272
OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
277-
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
278273
Replicas: &five,
279274
ManagementState: v1beta1.ManagementStateUnmanaged,
280275
},
@@ -299,7 +294,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
299294
Mode: v1beta1.ModeDeployment,
300295
UpgradeStrategy: v1beta1.UpgradeStrategyAutomatic,
301296
OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
302-
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
303297
Replicas: &one,
304298
ManagementState: v1beta1.ManagementStateManaged,
305299
},
@@ -328,7 +322,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
328322
Spec: v1beta1.OpenTelemetryCollectorSpec{
329323
Mode: v1beta1.ModeDeployment,
330324
OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
331-
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
332325
ManagementState: v1beta1.ManagementStateManaged,
333326
Replicas: &one,
334327
},
@@ -364,7 +357,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
364357
Spec: v1beta1.OpenTelemetryCollectorSpec{
365358
Mode: v1beta1.ModeDeployment,
366359
OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
367-
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
368360
Replicas: &one,
369361
ManagementState: v1beta1.ManagementStateManaged,
370362
PodDisruptionBudget: &v1beta1.PodDisruptionBudgetSpec{
@@ -402,7 +394,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
402394
Spec: v1beta1.OpenTelemetryCollectorSpec{
403395
Mode: v1beta1.ModeDeployment,
404396
OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
405-
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
406397
Replicas: &one,
407398
ManagementState: v1beta1.ManagementStateManaged,
408399
},
@@ -445,7 +436,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
445436
Spec: v1beta1.OpenTelemetryCollectorSpec{
446437
Mode: v1beta1.ModeDeployment,
447438
OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
448-
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
449439
Replicas: &one,
450440
ManagementState: v1beta1.ManagementStateManaged,
451441
},
@@ -483,7 +473,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
483473
Spec: v1beta1.OpenTelemetryCollectorSpec{
484474
Mode: v1beta1.ModeDeployment,
485475
OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
486-
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
487476
Replicas: &one,
488477
ManagementState: v1beta1.ManagementStateManaged,
489478
},
@@ -514,7 +503,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
514503
Spec: v1beta1.OpenTelemetryCollectorSpec{
515504
Mode: v1beta1.ModeDeployment,
516505
OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
517-
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
518506
Replicas: &one,
519507
ManagementState: v1beta1.ManagementStateManaged,
520508
},

‎pkg/collector/upgrade/v0_104_0.go

+21-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func upgrade0_104_0_TA(_ VersionUpgrade, otelcol *v1beta1.OpenTelemetryCollector
2727
}
2828

2929
func upgrade0_104_0(u VersionUpgrade, otelcol *v1beta1.OpenTelemetryCollector) (*v1beta1.OpenTelemetryCollector, error) {
30-
v1beta1.ComponentUseLocalHostAsDefaultHost(otelcol)
30+
ComponentUseLocalHostAsDefaultHost(otelcol)
3131

3232
const issueID = "https://github.com/open-telemetry/opentelemetry-collector/issues/8510"
3333
warnStr := fmt.Sprintf(
@@ -69,3 +69,23 @@ func TAUnifyEnvVarExpansion(otelcol *v1beta1.OpenTelemetryCollector) {
6969
otelcol.Spec.Args[baseFlag] += ",-" + fgFlag
7070
}
7171
}
72+
73+
// ComponentUseLocalHostAsDefaultHost enables component.UseLocalHostAsDefaultHost
74+
// featuregate on the given collector instance.
75+
// NOTE: For more details, visit:
76+
// https://github.com/open-telemetry/opentelemetry-collector/issues/8510
77+
func ComponentUseLocalHostAsDefaultHost(otelcol *v1beta1.OpenTelemetryCollector) {
78+
const (
79+
baseFlag = "feature-gates"
80+
fgFlag = "component.UseLocalHostAsDefaultHost"
81+
)
82+
if otelcol.Spec.Args == nil {
83+
otelcol.Spec.Args = make(map[string]string)
84+
}
85+
args, ok := otelcol.Spec.Args[baseFlag]
86+
if !ok || len(args) == 0 {
87+
otelcol.Spec.Args[baseFlag] = "-" + fgFlag
88+
} else if !strings.Contains(otelcol.Spec.Args[baseFlag], fgFlag) {
89+
otelcol.Spec.Args[baseFlag] += ",-" + fgFlag
90+
}
91+
}

‎pkg/collector/upgrade/v0_110_0.go

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Copyright The OpenTelemetry Authors
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
package upgrade
16+
17+
import (
18+
"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
19+
)
20+
21+
func upgrade0_110_0(_ VersionUpgrade, otelcol *v1beta1.OpenTelemetryCollector) (*v1beta1.OpenTelemetryCollector, error) {
22+
envVarExpansionFeatureFlag := "-component.UseLocalHostAsDefaultHost"
23+
otelcol.Spec.OpenTelemetryCommonFields.Args = RemoveFeatureGate(otelcol.Spec.OpenTelemetryCommonFields.Args, envVarExpansionFeatureFlag)
24+
return otelcol, nil
25+
}

‎tests/e2e/daemonset-features/02-assert.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ spec:
99
containers:
1010
- args:
1111
- --config=/conf/collector.yaml
12-
- --feature-gates=-component.UseLocalHostAsDefaultHost
1312
name: otc-container

‎tests/e2e/statefulset-features/00-assert.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ spec:
99
containers:
1010
- args:
1111
- --config=/conf/collector.yaml
12-
- --feature-gates=-component.UseLocalHostAsDefaultHost
1312
name: otc-container
1413
volumeMounts:
1514
- mountPath: /conf

‎tests/e2e/statefulset-features/01-assert.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ spec:
99
containers:
1010
- args:
1111
- --config=/conf/collector.yaml
12-
- --feature-gates=-component.UseLocalHostAsDefaultHost
1312
name: otc-container
1413
volumeMounts:
1514
- mountPath: /conf

0 commit comments

Comments
 (0)