adding validation so ping-pong feature support only ALB traffic routing

Signed-off-by: Andrii Perenesenko <[email protected]>
argoproj · Feb 1, 2022 · 85888d6 · 85888d6
1 parent 0d1d08e
commit 85888d6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/pkg/apis/rollouts/validation/validation.go b/pkg/apis/rollouts/validation/validation.go
@@ -233,7 +233,9 @@ func ValidateRolloutStrategyCanary(rollout *v1alpha1.Rollout, fldPath *field.Pat
 		allErrs = append(allErrs, field.Invalid(fldPath.Child("stableService"), canary.StableService, DuplicatedServicesCanaryMessage))
 	}
 	if canary.PingPong != nil {
-		if canary.TrafficRouting == nil || canary.TrafficRouting.ALB == nil {
+		if canary.TrafficRouting == nil {
+			allErrs = append(allErrs, field.Invalid(fldPath.Child("trafficRouting"), canary.TrafficRouting, PingPongWithAlbOnlyMessage))
+		} else if canary.TrafficRouting.ALB == nil {
 			allErrs = append(allErrs, field.Invalid(fldPath.Child("trafficRouting").Child("alb"), canary.TrafficRouting.ALB, PingPongWithAlbOnlyMessage))
 		}
 		if canary.PingPong.PingService == "" {

diff --git a/pkg/apis/rollouts/validation/validation_test.go b/pkg/apis/rollouts/validation/validation_test.go
@@ -129,15 +129,12 @@ func TestValidateRolloutStrategyCanary(t *testing.T) {
 		CanaryService: "canary",
 		StableService: "stable",
 		TrafficRouting: &v1alpha1.RolloutTrafficRouting{
-			SMI: &v1alpha1.SMITrafficRouting{},
+			ALB: &v1alpha1.ALBTrafficRouting{RootService: "root-service"},
 		},
 		Steps: []v1alpha1.CanaryStep{{}},
 	}
 	ro := &v1alpha1.Rollout{}
 	ro.Spec.Strategy.Canary = canaryStrategy
-	ro.Spec.Strategy.Canary.TrafficRouting = &v1alpha1.RolloutTrafficRouting{
-		ALB: &v1alpha1.ALBTrafficRouting{RootService: "root-service"},
-	}
 
 	invalidArgs := []v1alpha1.AnalysisRunArgument{
 		{
@@ -211,6 +208,14 @@ func TestValidateRolloutStrategyCanary(t *testing.T) {
 		assert.Equal(t, PingPongWithAlbOnlyMessage, allErrs[0].Detail)
 	})
 
+	t.Run("ping-pong feature without the ALB traffic routing", func(t *testing.T) {
+		invalidRo := ro.DeepCopy()
+		invalidRo.Spec.Strategy.Canary.PingPong = &v1alpha1.PingPongSpec{PingService: "ping", PongService: "pong"}
+		invalidRo.Spec.Strategy.Canary.TrafficRouting = nil
+		allErrs := ValidateRolloutStrategyCanary(invalidRo, field.NewPath(""))
+		assert.Equal(t, PingPongWithAlbOnlyMessage, allErrs[0].Detail)
+	})
+
 	t.Run("invalid traffic routing", func(t *testing.T) {
 		invalidRo := ro.DeepCopy()
 		invalidRo.Spec.Strategy.Canary.CanaryService = ""