flag config error if admissionGP exceeds warmupGP

Author: dgrove-oss

pkg/config/config.go

@@ -143,7 +143,11 @@ func ValidateAppWrapperConfig(config *AppWrapperConfig) error {
 			config.FaultTolerance.AdmissionGracePeriod, config.FaultTolerance.GracePeriodMaximum)
 	}
 	if config.FaultTolerance.WarmupGracePeriod > config.FaultTolerance.GracePeriodMaximum {
-		return fmt.Errorf("WarmupGracePeriod %v exceeds GracePeriodCeiling %v",
+		return fmt.Errorf("AdmissionGracePeriod %v exceeds GracePeriodCeiling %v",
+			config.FaultTolerance.WarmupGracePeriod, config.FaultTolerance.GracePeriodMaximum)
+	}
+	if config.FaultTolerance.AdmissionGracePeriod > config.FaultTolerance.WarmupGracePeriod {
+		return fmt.Errorf("AdmissionGracePeriod %v exceeds AdmissionGracePeriod %v",
 			config.FaultTolerance.WarmupGracePeriod, config.FaultTolerance.GracePeriodMaximum)
 	}
 	if config.FaultTolerance.SuccessTTL <= 0 {

pkg/config/config_test.go

@@ -56,6 +56,9 @@ var _ = Describe("AppWrapper Config", func() {
 		bad = &FaultToleranceConfig{WarmupGracePeriod: 10 * time.Second, GracePeriodMaximum: 1 * time.Second}
 		Expect(ValidateAppWrapperConfig(&AppWrapperConfig{FaultTolerance: bad})).ShouldNot(Succeed())
 
+		bad = &FaultToleranceConfig{AdmissionGracePeriod: 10 * time.Second, WarmupGracePeriod: 1 * time.Second}
+		Expect(ValidateAppWrapperConfig(&AppWrapperConfig{FaultTolerance: bad})).ShouldNot(Succeed())
+
 		bad = &FaultToleranceConfig{SuccessTTL: -1 * time.Second}
 		Expect(ValidateAppWrapperConfig(&AppWrapperConfig{FaultTolerance: bad})).ShouldNot(Succeed())
 	})