From 3c668168b68457d9024397e66aba0140c6b68b1b Mon Sep 17 00:00:00 2001 From: khewonc <39867936+khewonc@users.noreply.github.com> Date: Wed, 3 Jul 2024 12:17:43 -0400 Subject: [PATCH] Remove validation for container resource requirement (#1264) --- .../datadogagentprofile_validation.go | 15 ----- .../datadogagentprofile_validation_test.go | 65 ------------------- 2 files changed, 80 deletions(-) diff --git a/apis/datadoghq/v1alpha1/datadogagentprofile_validation.go b/apis/datadoghq/v1alpha1/datadogagentprofile_validation.go index e08577cd0..2f4254626 100644 --- a/apis/datadoghq/v1alpha1/datadogagentprofile_validation.go +++ b/apis/datadoghq/v1alpha1/datadogagentprofile_validation.go @@ -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 } diff --git a/apis/datadoghq/v1alpha1/datadogagentprofile_validation_test.go b/apis/datadoghq/v1alpha1/datadogagentprofile_validation_test.go index e51419824..c981dffc0 100644 --- a/apis/datadoghq/v1alpha1/datadogagentprofile_validation_test.go +++ b/apis/datadoghq/v1alpha1/datadogagentprofile_validation_test.go @@ -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{ @@ -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,