Skip to content

Commit

Permalink
Remove validation for container resource requirement (#1264)
Browse files Browse the repository at this point in the history
  • Loading branch information
khewonc committed Jul 3, 2024
1 parent 2abf8c7 commit 3c66816
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 80 deletions.
15 changes: 0 additions & 15 deletions apis/datadoghq/v1alpha1/datadogagentprofile_validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,6 @@ func ValidateDatadogAgentProfileSpec(spec *DatadogAgentProfileSpec) error {
if spec.Config.Override == nil {
return fmt.Errorf("config override must be defined")
}
if spec.Config.Override[NodeAgentComponentName] == nil {
return fmt.Errorf("node agent override must be defined")
}
if spec.Config.Override[NodeAgentComponentName].Containers == nil {
return fmt.Errorf("node agent container must be defined")
}
containsAtLeastOneContainerResourceOverride := false
for _, container := range spec.Config.Override[NodeAgentComponentName].Containers {
if container.Resources != nil {
containsAtLeastOneContainerResourceOverride = true
}
}
if !containsAtLeastOneContainerResourceOverride {
return fmt.Errorf("at least one container resource must be defined")
}

return nil
}
65 changes: 0 additions & 65 deletions apis/datadoghq/v1alpha1/datadogagentprofile_validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,56 +70,6 @@ func TestIsValidDatadogAgentProfile(t *testing.T) {
},
},
}
missingResources := &DatadogAgentProfileSpec{
ProfileAffinity: &ProfileAffinity{
ProfileNodeAffinity: []corev1.NodeSelectorRequirement{
{
Key: "foo",
Operator: corev1.NodeSelectorOpIn,
Values: []string{"bar"},
},
},
},
Config: &Config{
Override: map[ComponentName]*Override{
NodeAgentComponentName: {
Containers: map[commonv1.AgentContainerName]*Container{
commonv1.CoreAgentContainerName: {},
},
},
},
},
}
missingContainer := &DatadogAgentProfileSpec{
ProfileAffinity: &ProfileAffinity{
ProfileNodeAffinity: []corev1.NodeSelectorRequirement{
{
Key: "foo",
Operator: corev1.NodeSelectorOpIn,
Values: []string{"bar"},
},
},
},
Config: &Config{
Override: map[ComponentName]*Override{
NodeAgentComponentName: {},
},
},
}
missingComponent := &DatadogAgentProfileSpec{
ProfileAffinity: &ProfileAffinity{
ProfileNodeAffinity: []corev1.NodeSelectorRequirement{
{
Key: "foo",
Operator: corev1.NodeSelectorOpIn,
Values: []string{"bar"},
},
},
},
Config: &Config{
Override: map[ComponentName]*Override{},
},
}
missingOverride := &DatadogAgentProfileSpec{
ProfileAffinity: &ProfileAffinity{
ProfileNodeAffinity: []corev1.NodeSelectorRequirement{
Expand Down Expand Up @@ -166,21 +116,6 @@ func TestIsValidDatadogAgentProfile(t *testing.T) {
name: "valid dap, resources specified in one container only",
spec: validResourceOverrideInOneContainerOnly,
},
{
name: "missing resources",
spec: missingResources,
wantErr: "at least one container resource must be defined",
},
{
name: "missing container",
spec: missingContainer,
wantErr: "node agent container must be defined",
},
{
name: "missing component",
spec: missingComponent,
wantErr: "node agent override must be defined",
},
{
name: "missing override",
spec: missingOverride,
Expand Down

0 comments on commit 3c66816

Please sign in to comment.