From 3c7f1bd6a731fb99997316d62c4765196d2beffd Mon Sep 17 00:00:00 2001 From: Israel Blancas Date: Mon, 24 Jul 2023 22:18:43 +0200 Subject: [PATCH 1/2] Add version to the different feature flags Signed-off-by: Israel Blancas --- pkg/featuregate/featuregate.go | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkg/featuregate/featuregate.go b/pkg/featuregate/featuregate.go index 901f6ae642..61b132541a 100644 --- a/pkg/featuregate/featuregate.go +++ b/pkg/featuregate/featuregate.go @@ -28,27 +28,39 @@ var ( EnableDotnetAutoInstrumentationSupport = featuregate.GlobalRegistry().MustRegister( "operator.autoinstrumentation.dotnet", featuregate.StageBeta, - featuregate.WithRegisterDescription("controls whether the operator supports .NET auto-instrumentation")) + featuregate.WithRegisterDescription("controls whether the operator supports .NET auto-instrumentation"), + featuregate.WithRegisterFromVersion("v0.76.1"), + ) EnablePythonAutoInstrumentationSupport = featuregate.GlobalRegistry().MustRegister( "operator.autoinstrumentation.python", featuregate.StageBeta, - featuregate.WithRegisterDescription("controls whether the operator supports Python auto-instrumentation")) + featuregate.WithRegisterDescription("controls whether the operator supports Python auto-instrumentation"), + featuregate.WithRegisterFromVersion("v0.76.1"), + ) EnableJavaAutoInstrumentationSupport = featuregate.GlobalRegistry().MustRegister( "operator.autoinstrumentation.java", featuregate.StageBeta, - featuregate.WithRegisterDescription("controls whether the operator supports Java auto-instrumentation")) + featuregate.WithRegisterDescription("controls whether the operator supports Java auto-instrumentation"), + featuregate.WithRegisterFromVersion("v0.76.1"), + ) EnableNodeJSAutoInstrumentationSupport = featuregate.GlobalRegistry().MustRegister( "operator.autoinstrumentation.nodejs", featuregate.StageBeta, - featuregate.WithRegisterDescription("controls whether the operator supports NodeJS auto-instrumentation")) + featuregate.WithRegisterDescription("controls whether the operator supports NodeJS auto-instrumentation"), + featuregate.WithRegisterFromVersion("v0.76.1"), + ) EnableGoAutoInstrumentationSupport = featuregate.GlobalRegistry().MustRegister( "operator.autoinstrumentation.go", featuregate.StageAlpha, - featuregate.WithRegisterDescription("controls whether the operator supports Golang auto-instrumentation")) + featuregate.WithRegisterDescription("controls whether the operator supports Golang auto-instrumentation"), + featuregate.WithRegisterFromVersion("v0.77.0"), + ) EnableApacheHTTPAutoInstrumentationSupport = featuregate.GlobalRegistry().MustRegister( "operator.autoinstrumentation.apache-httpd", featuregate.StageBeta, - featuregate.WithRegisterDescription("controls whether the operator supports Apache HTTPD auto-instrumentation")) + featuregate.WithRegisterDescription("controls whether the operator supports Apache HTTPD auto-instrumentation"), + featuregate.WithRegisterFromVersion("v0.76.1"), + ) // EnableTargetAllocatorRewrite is the feature gate that controls whether the collector's configuration should // automatically be rewritten when the target allocator is enabled. From 4c0747adbeb694c0daf13b1fd7296942fed28b45 Mon Sep 17 00:00:00 2001 From: Israel Blancas Date: Mon, 24 Jul 2023 22:23:26 +0200 Subject: [PATCH 2/2] Add missing version Signed-off-by: Israel Blancas --- pkg/featuregate/featuregate.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/featuregate/featuregate.go b/pkg/featuregate/featuregate.go index 61b132541a..c2bcfd250e 100644 --- a/pkg/featuregate/featuregate.go +++ b/pkg/featuregate/featuregate.go @@ -59,7 +59,7 @@ var ( "operator.autoinstrumentation.apache-httpd", featuregate.StageBeta, featuregate.WithRegisterDescription("controls whether the operator supports Apache HTTPD auto-instrumentation"), - featuregate.WithRegisterFromVersion("v0.76.1"), + featuregate.WithRegisterFromVersion("v0.80.0"), ) // EnableTargetAllocatorRewrite is the feature gate that controls whether the collector's configuration should @@ -67,7 +67,9 @@ var ( EnableTargetAllocatorRewrite = featuregate.GlobalRegistry().MustRegister( "operator.collector.rewritetargetallocator", featuregate.StageAlpha, - featuregate.WithRegisterDescription("controls whether the operator should configure the collector's targetAllocator configuration")) + featuregate.WithRegisterDescription("controls whether the operator should configure the collector's targetAllocator configuration"), + featuregate.WithRegisterFromVersion("v0.76.1"), + ) ) // Flags creates a new FlagSet that represents the available featuregate flags using the supplied featuregate registry.