-
Notifications
You must be signed in to change notification settings - Fork 104
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.
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
Add registerAPIService option to external metrics feature to allow disabling external metrics endpoint registration #953
Changes from 3 commits
c48f013
055e245
8d7661c
2cc8617
3e74775
9bb568a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -85,30 +85,36 @@ func TestExternalMetricsFeature(t *testing.T) { | |
////////////////////////// | ||
{ | ||
Name: "v2alpha1 external metrics not enabled", | ||
DDAv2: newV2Agent(false, false, false, v2alpha1.DatadogCredentials{}), | ||
DDAv2: newV2Agent(false, true, false, false, v2alpha1.DatadogCredentials{}), | ||
WantConfigure: false, | ||
}, | ||
{ | ||
Name: "v2alpha1 external metrics enabled", | ||
DDAv2: newV2Agent(true, true, false, v2alpha1.DatadogCredentials{}), | ||
DDAv2: newV2Agent(true, true, true, false, v2alpha1.DatadogCredentials{}), | ||
WantConfigure: true, | ||
ClusterAgent: testDCAResources(true, false, false), | ||
}, | ||
{ | ||
Name: "v2alpha1 external metrics enabled, wpa controller enabled", | ||
DDAv2: newV2Agent(true, true, true, v2alpha1.DatadogCredentials{}), | ||
DDAv2: newV2Agent(true, true, true, true, v2alpha1.DatadogCredentials{}), | ||
WantConfigure: true, | ||
ClusterAgent: testDCAResources(true, true, false), | ||
}, | ||
{ | ||
Name: "v2alpha1 external metrics enabled, ddm disabled", | ||
DDAv2: newV2Agent(true, false, false, v2alpha1.DatadogCredentials{}), | ||
DDAv2: newV2Agent(true, true, false, false, v2alpha1.DatadogCredentials{}), | ||
WantConfigure: true, | ||
ClusterAgent: testDCAResources(false, false, false), | ||
}, | ||
{ | ||
Name: "v2alpha1 external metrics enabled, secrets set", | ||
DDAv2: newV2Agent(true, true, false, secretV2), | ||
DDAv2: newV2Agent(true, true, true, false, secretV2), | ||
WantConfigure: true, | ||
ClusterAgent: testDCAResources(true, false, true), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This and next test pass different values for |
||
}, | ||
{ | ||
Name: "v2alpha1 external metrics enabled, secrets set, registerAPIService disabled", | ||
DDAv2: newV2Agent(true, false, true, false, secretV2), | ||
WantConfigure: true, | ||
ClusterAgent: testDCAResources(true, false, true), | ||
}, | ||
|
@@ -135,15 +141,16 @@ func TestExternalMetricsFeature(t *testing.T) { | |
// } | ||
// } | ||
|
||
func newV2Agent(enabled, useDDM, wpaController bool, secret v2alpha1.DatadogCredentials) *v2alpha1.DatadogAgent { | ||
func newV2Agent(enabled, registerAPIService, useDDM, wpaController bool, secret v2alpha1.DatadogCredentials) *v2alpha1.DatadogAgent { | ||
return &v2alpha1.DatadogAgent{ | ||
Spec: v2alpha1.DatadogAgentSpec{ | ||
Features: &v2alpha1.DatadogFeatures{ | ||
ExternalMetricsServer: &v2alpha1.ExternalMetricsServerFeatureConfig{ | ||
Enabled: apiutils.NewBoolPointer(enabled), | ||
WPAController: apiutils.NewBoolPointer(wpaController), | ||
UseDatadogMetrics: apiutils.NewBoolPointer(useDDM), | ||
Port: apiutils.NewInt32Pointer(8443), | ||
Enabled: apiutils.NewBoolPointer(enabled), | ||
RegisterAPIService: apiutils.NewBoolPointer(registerAPIService), | ||
WPAController: apiutils.NewBoolPointer(wpaController), | ||
UseDatadogMetrics: apiutils.NewBoolPointer(useDDM), | ||
Port: apiutils.NewInt32Pointer(8443), | ||
Endpoint: &v2alpha1.Endpoint{ | ||
Credentials: &secret, | ||
}, | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please add default value to
datadogagent_default.go
and set it in the same file, see this example.