wait grace period seconds after pod creation/upgrade

Signed-off-by: mingzhou.swx <[email protected]>

pkg/trafficrouting/manager.go

@@ -120,6 +120,14 @@ func (m *Manager) DoTrafficRouting(c *TrafficRoutingContext) (bool, error) {
 	canaryService := &corev1.Service{}
 	canaryService.Namespace = stableService.Namespace
 	canaryService.Name = canaryServiceName
+
+	// After modify workload or stable service configuration, give the network provider (e.g., CCM) 3 seconds to react
+	if verifyTime := c.LastUpdateTime.Add(time.Second * time.Duration(trafficRouting.GracePeriodSeconds)); verifyTime.After(time.Now()) {
+		klog.Infof("%s update workload or service selector, and wait 3 seconds", c.Key)
+		return false, nil
+	}
+
+	var serviceModified bool
 	// end-to-end canary deployment scenario(a -> b -> c), if only b or c is released,
 	//and a is not released in this scenario, then the canary service is not needed.
 	if !c.OnlyTrafficRouting {
@@ -146,6 +154,7 @@ func (m *Manager) DoTrafficRouting(c *TrafficRoutingContext) (bool, error) {
 				klog.Errorf("%s patch canary service(%s) selector failed: %s", c.Key, canaryService.Name, err.Error())
 				return false, err
 			}
+			serviceModified = true
 			// update canary service time, and wait 3 seconds, just to be safe
 			c.LastUpdateTime = &metav1.Time{Time: time.Now()}
 			klog.Infof("%s patch canary service(%s) selector(%s=%s) success",
@@ -158,17 +167,18 @@ func (m *Manager) DoTrafficRouting(c *TrafficRoutingContext) (bool, error) {
 				klog.Errorf("%s patch stable service(%s) selector failed: %s", c.Key, stableService.Name, err.Error())
 				return false, err
 			}
+			serviceModified = true
 			// update stable service time, and wait 3 seconds, just to be safe
 			c.LastUpdateTime = &metav1.Time{Time: time.Now()}
 			klog.Infof("add %s stable service(%s) selector(%s=%s) success",
 				c.Key, stableService.Name, c.RevisionLabelKey, c.StableRevision)
 			return false, nil
 		}
-		// After modify stable service configuration, give the network provider 3 seconds to react
-		if verifyTime := c.LastUpdateTime.Add(time.Second * time.Duration(trafficRouting.GracePeriodSeconds)); verifyTime.After(time.Now()) {
-			klog.Infof("%s update service selector, and wait 3 seconds", c.Key)
-			return false, nil
-		}
+	}
+
+	// wait seconds for network providers to consume the modification.
+	if serviceModified {
+		return false, nil
 	}
 
 	// new network provider, ingress or gateway

pkg/trafficrouting/manager_test.go

@@ -473,6 +473,7 @@ func TestFinalisingTrafficRouting(t *testing.T) {
 				obj := demoRollout.DeepCopy()
 				obj.Status.CanaryStatus.CurrentStepState = v1beta1.CanaryStepStateCompleted
 				obj.Status.CanaryStatus.CurrentStepIndex = 4
+				obj.Status.CanaryStatus.LastUpdateTime = &metav1.Time{Time: time.Now().Add(-time.Hour)}
 				return obj, &util.Workload{RevisionLabelKey: apps.DefaultDeploymentUniqueLabelKey}
 			},
 			onlyRestoreStableService: true,