Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove deprecated v2alpha1 flag #1189

Merged
merged 2 commits into from
May 16, 2024
+3 −8
Merged

remove deprecated v2alpha1 flag #1189

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb542e6
remove deprecated v2alpha1 flag
celenechang May 16, 2024
1cf2d4c
add modified warning with webhookEnabled flag
celenechang May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ type options struct {
datadogSLOEnabled bool
operatorMetricsEnabled bool
webhookEnabled bool
v2APIEnabled bool
maximumGoroutines int
introspectionEnabled bool
datadogAgentProfileEnabled bool
Expand Down Expand Up @@ -159,7 +158,6 @@ func (opts *options) Parse() {
flag.BoolVar(&opts.datadogMonitorEnabled, "datadogMonitorEnabled", false, "Enable the DatadogMonitor controller")
flag.BoolVar(&opts.datadogSLOEnabled, "datadogSLOEnabled", false, "Enable the DatadogSLO controller")
flag.BoolVar(&opts.operatorMetricsEnabled, "operatorMetricsEnabled", true, "Enable sending operator metrics to Datadog")
flag.BoolVar(&opts.v2APIEnabled, "v2APIEnabled", true, "Enable the v2 api")
flag.BoolVar(&opts.webhookEnabled, "webhookEnabled", false, "Enable CRD conversion webhook.")
flag.IntVar(&opts.maximumGoroutines, "maximumGoroutines", defaultMaximumGoroutines, "Override health check threshold for maximum number of goroutines.")
flag.BoolVar(&opts.introspectionEnabled, "introspectionEnabled", false, "Enable introspection (beta)")
Expand Down Expand Up @@ -208,11 +206,8 @@ func run(opts *options) error {
}
version.PrintVersionLogs(setupLog)

if !opts.v2APIEnabled {
celenechang marked this conversation as resolved.
Show resolved Hide resolved
setupLog.Error(nil, "The 'v2APIEnabled' flag is deprecated since v1.2.0+ and will be removed in v1.7.0. "+
"Once removed, the Datadog Operator cannot be configured to reconcile the v1alpha1 DatadogAgent CRD. "+
"However, you will still be able to apply a v1alpha1 manifest with the conversion webhook enabled (using the flag 'webhookEnabled'). "+
"DatadogAgent v1alpha1 and the conversion webhook will be removed in v1.8.0. "+
if opts.webhookEnabled {
setupLog.Error(nil, "DatadogAgent v1alpha1 and the conversion webhook will be removed in v1.8.0. "+
"See the migration page for instructions on migrating to v2alpha1: https://docs.datadoghq.com/containers/guide/datadogoperator_migration/")
}

Expand Down Expand Up @@ -283,7 +278,7 @@ func run(opts *options) error {
DatadogMonitorEnabled: opts.datadogMonitorEnabled,
DatadogSLOEnabled: opts.datadogSLOEnabled,
OperatorMetricsEnabled: opts.operatorMetricsEnabled,
V2APIEnabled: opts.v2APIEnabled,
V2APIEnabled: true,
IntrospectionEnabled: opts.introspectionEnabled,
DatadogAgentProfileEnabled: opts.datadogAgentProfileEnabled,
ProcessChecksInCoreAgentEnabled: opts.processChecksInCoreAgentEnabled,
Expand Down
Loading