KubeletConfig: Verify EvictionSoftGracePeriod is set when EvictionSof…

…t is set.

Signed-off-by: Harshal Patil <harpatil@redhat.com>

pkg/controller/kubelet-config/helpers.go

@@ -109,6 +109,18 @@ func validateUserKubeletConfig(cfg *mcfgv1.KubeletConfig) error {
 		return fmt.Errorf("KubeletConfiguration: staticPodPath is not allowed to be set, but contains: %s", kcDecoded.StaticPodPath)
 	}
 
+	if kcDecoded.EvictionSoft != nil && len(kcDecoded.EvictionSoft) > 0 {
+		if kcDecoded.EvictionSoftGracePeriod == nil || len(kcDecoded.EvictionSoftGracePeriod) == 0 {
+			return fmt.Errorf("KubeletConfiguration: EvictionSoftGracePeriod must be set when evictionSoft is defined, evictionSoft: %v", kcDecoded.EvictionSoft)
+		}
+
+		for k := range kcDecoded.EvictionSoft {
+			if _, ok := kcDecoded.EvictionSoftGracePeriod[k]; !ok {
+				return fmt.Errorf("KubeletConfiguration: evictionSoft[%s] is defined but EvictionSoftGracePeriod[%s] is not set", k, k)
+			}
+		}
+	}
+
 	return nil
 }
 

pkg/controller/kubelet-config/kubelet_config_controller_test.go

@@ -461,6 +461,25 @@ func TestKubeletConfigBlacklistedOptions(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "evictionSoft cannot be supplied without evictionSoftGracePeriod",
+			config: &kubeletconfigv1beta1.KubeletConfiguration{
+				EvictionSoft: map[string]string{
+					"memory.available": "90%",
+				},
+			},
+		},
+		{
+			name: "evictionSoft cannot be supplied without corresponding evictionSoftGracePeriod",
+			config: &kubeletconfigv1beta1.KubeletConfiguration{
+				EvictionSoft: map[string]string{
+					"memory.available": "90%",
+				},
+				EvictionSoftGracePeriod: map[string]string{
+					"nodefs.inodesFree": "1h",
+				},
+			},
+		},
 	}
 
 	successTests := []struct {