Skip to content

fix: validate LowNodeUtilization metrics source #1877

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

Open
immanuwell wants to merge 1 commit into
base: master
Choose a base branch
from
+61 −0
Open

fix: validate LowNodeUtilization metrics source #1877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions pkg/framework/plugins/nodeutilization/validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ func ValidateLowNodeUtilizationArgs(obj runtime.Object) error {
return err
}
if args.MetricsUtilization != nil {
if args.MetricsUtilization.Source == "" && !args.MetricsUtilization.MetricsServer {
return fmt.Errorf("metrics source is empty")
}
if args.MetricsUtilization.Source != "" && args.MetricsUtilization.Source != api.KubernetesMetrics && args.MetricsUtilization.Source != api.PrometheusMetrics {
return fmt.Errorf("unrecognized metrics source")
}
if args.MetricsUtilization.Source == api.KubernetesMetrics && args.MetricsUtilization.MetricsServer {
return fmt.Errorf("it is not allowed to set both %q source and metricsServer", api.KubernetesMetrics)
}
Expand Down
55 changes: 55 additions & 0 deletions pkg/framework/plugins/nodeutilization/validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,25 @@ func TestValidateLowNodeUtilizationPluginConfig(t *testing.T) {
},
errInfo: fmt.Errorf("it is not allowed to set both \"KubernetesMetrics\" source and metricsServer"),
},
{
name: "legacy metrics server without metrics source",
args: &LowNodeUtilizationArgs{
Thresholds: api.ResourceThresholds{
v1.ResourceCPU: 20,
v1.ResourceMemory: 20,
extendedResource: 20,
},
TargetThresholds: api.ResourceThresholds{
v1.ResourceCPU: 80,
v1.ResourceMemory: 80,
extendedResource: 80,
},
MetricsUtilization: &MetricsUtilization{
MetricsServer: true,
},
},
errInfo: nil,
},
{
name: "missing prometheus query",
args: &LowNodeUtilizationArgs{
Expand Down Expand Up @@ -242,6 +261,42 @@ func TestValidateLowNodeUtilizationPluginConfig(t *testing.T) {
},
errInfo: fmt.Errorf("prometheus configuration is not allowed to set when source is set to \"KubernetesMetrics\""),
},
{
name: "metrics utilization without metrics source",
args: &LowNodeUtilizationArgs{
Thresholds: api.ResourceThresholds{
v1.ResourceCPU: 20,
v1.ResourceMemory: 20,
extendedResource: 20,
},
TargetThresholds: api.ResourceThresholds{
v1.ResourceCPU: 80,
v1.ResourceMemory: 80,
extendedResource: 80,
},
MetricsUtilization: &MetricsUtilization{},
},
errInfo: fmt.Errorf("metrics source is empty"),
},
{
name: "unknown metrics source",
args: &LowNodeUtilizationArgs{
Thresholds: api.ResourceThresholds{
v1.ResourceCPU: 20,
v1.ResourceMemory: 20,
extendedResource: 20,
},
TargetThresholds: api.ResourceThresholds{
v1.ResourceCPU: 80,
v1.ResourceMemory: 80,
extendedResource: 80,
},
MetricsUtilization: &MetricsUtilization{
Source: api.MetricsSource("UnknownMetrics"),
},
},
errInfo: fmt.Errorf("unrecognized metrics source"),
},
}

for _, testCase := range tests {
Expand Down