From feb5d4a2640227c28acdc506a1a9a867c4f1404e Mon Sep 17 00:00:00 2001 From: Jacob Aronoff Date: Mon, 11 Mar 2024 14:38:08 -0400 Subject: [PATCH] Move operator.observability.prometheus to be beta (#2748) * Move operator.observability.prometheus to be beta * remove unused entry --- .github/workflows/e2e.yaml | 2 -- controllers/builder_test.go | 8 ++------ pkg/featuregate/featuregate.go | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 5720eb5d65..e01e19b844 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -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 diff --git a/controllers/builder_test.go b/controllers/builder_test.go index 20480934cd..fb51879595 100644 --- a/controllers/builder_test.go +++ b/controllers/builder_test.go @@ -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", @@ -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{ @@ -1969,7 +1965,7 @@ prometheus_cr: }, }, wantErr: false, - featuregates: []string{prometheusFeatureGate}, + featuregates: []string{}, }, } for _, tt := range tests { diff --git a/pkg/featuregate/featuregate.go b/pkg/featuregate/featuregate.go index 1269188c4f..d1b8057b6c 100644 --- a/pkg/featuregate/featuregate.go +++ b/pkg/featuregate/featuregate.go @@ -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"), )