Skip to content

Commit

Permalink
Move operator.observability.prometheus to be beta (open-telemetry#2748)
Browse files Browse the repository at this point in the history
* Move operator.observability.prometheus to be beta

* remove unused entry
  • Loading branch information
jaronoff97 authored Mar 11, 2024
1 parent 95b31fe commit 92b4e2a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ jobs:
- e2e-multi-instrumentation
- e2e-metadata-filters
include:
- group: e2e-prometheuscr
setup: "prepare-e2e-with-featuregates FEATUREGATES=+operator.observability.prometheus"
- group: e2e-multi-instrumentation
setup: "add-operator-arg OPERATOR_ARG=--enable-multi-instrumentation prepare-e2e"
- group: e2e-metadata-filters
Expand Down
8 changes: 2 additions & 6 deletions controllers/builder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ var (
pathTypePrefix = networkingv1.PathTypePrefix
)

var (
prometheusFeatureGate = featuregate.PrometheusOperatorIsAvailable.ID()
)

var (
opampbridgeSelectorLabels = map[string]string{
"app.kubernetes.io/managed-by": "opentelemetry-operator",
Expand Down Expand Up @@ -1951,7 +1947,7 @@ prometheus_cr:
},
Spec: monitoringv1.ServiceMonitorSpec{
Endpoints: []monitoringv1.Endpoint{
monitoringv1.Endpoint{Port: "targetallocation"},
{Port: "targetallocation"},
},
Selector: v1.LabelSelector{
MatchLabels: map[string]string{
Expand All @@ -1969,7 +1965,7 @@ prometheus_cr:
},
},
wantErr: false,
featuregates: []string{prometheusFeatureGate},
featuregates: []string{},
},
}
for _, tt := range tests {
Expand Down
2 changes: 1 addition & 1 deletion pkg/featuregate/featuregate.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ var (
// PrometheusOperatorIsAvailable is the feature gate that enables features associated to the Prometheus Operator.
PrometheusOperatorIsAvailable = featuregate.GlobalRegistry().MustRegister(
"operator.observability.prometheus",
featuregate.StageAlpha,
featuregate.StageBeta,
featuregate.WithRegisterDescription("enables features associated to the Prometheus Operator"),
featuregate.WithRegisterFromVersion("v0.82.0"),
)
Expand Down

0 comments on commit 92b4e2a

Please sign in to comment.