adding exception for init container resource checks

FairwindsOps · May 23, 2019 · 9a03f87 · 9a03f87
1 parent 69d8b95
commit 9a03f87
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/pkg/validator/container.go b/pkg/validator/container.go
@@ -55,6 +55,12 @@ func ValidateContainer(cnConf *conf.Configuration, container *corev1.Container,
 }
 
 func (cv *ContainerValidation) validateResources(resConf *conf.Resources) {
+	// Only validate resources for primary containers. Although it can
+	// be helpful to set these in certain cases, it usually isn't
+	if cv.IsInitContainer {
+		return
+	}
+
 	category := messages.CategoryResources
 	res := cv.Container.Resources
 

diff --git a/pkg/validator/container_test.go b/pkg/validator/container_test.go
@@ -161,6 +161,27 @@ func TestValidateResourcesPartiallyValid(t *testing.T) {
 	testValidateResources(t, &container, &resourceConf1, &expectedErrors, &expectedWarnings)
 }
 
+func TestValidateResourcesInit(t *testing.T) {
+	cvEmpty := ContainerValidation{
+		Container:          &corev1.Container{},
+		ResourceValidation: &ResourceValidation{},
+	}
+	cvInit := ContainerValidation{
+		Container:          &corev1.Container{},
+		ResourceValidation: &ResourceValidation{},
+		IsInitContainer:    true,
+	}
+
+	parsedConf, err := conf.Parse([]byte(resourceConf1))
+	assert.NoError(t, err, "Expected no error when parsing config")
+
+	cvEmpty.validateResources(&parsedConf.Resources)
+	assert.Len(t, cvEmpty.Errors, 4)
+
+	cvInit.validateResources(&parsedConf.Resources)
+	assert.Len(t, cvInit.Errors, 0)
+}
+
 func TestValidateResourcesFullyValid(t *testing.T) {
 	cpuRequest, err := resource.ParseQuantity("300m")
 	assert.NoError(t, err, "Error parsing quantity")