Do log "Setting weight to <VALUE>" on the final step, where VALUE=100

mumoshu · Sep 11, 2020 · ffe623b · ffe623b
1 parent 01633c0
commit ffe623b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/pkg/courier/route53_record_set_router.go b/pkg/courier/route53_record_set_router.go
@@ -75,13 +75,7 @@ func (r *Route53RecordSetRouter) TrafficShift(ctx context.Context) error {
 		select {
 		case <-ticker.C:
 			if p >= 100 {
-				fmt.Printf("Done.")
 				p = 100
-
-				if err := rp.Update(100); err != nil {
-					return err
-				}
-				return nil
 			}
 
 			log.Printf("Setting weight to %v", p)
@@ -90,6 +84,11 @@ func (r *Route53RecordSetRouter) TrafficShift(ctx context.Context) error {
 				return err
 			}
 
+			if p == 100 {
+				fmt.Printf("Done.")
+				return nil
+			}
+
 			p += step
 		case <-ctx.Done():
 			if p != 100 {

diff --git a/pkg/courier/traffic_shift.go b/pkg/courier/traffic_shift.go
@@ -42,13 +42,7 @@ func DoGradualTrafficShift(ctx context.Context, svc elbv2iface.ELBV2API, l Liste
 			select {
 			case <-ticker.C:
 				if p >= 100 {
-					fmt.Printf("Done.")
 					p = 100
-
-					if err := SetDesiredTGTrafficPercentage(svc, l, 100); err != nil {
-						return err
-					}
-					return nil
 				}
 
 				log.Printf("Setting weight to %v", p)
@@ -57,6 +51,11 @@ func DoGradualTrafficShift(ctx context.Context, svc elbv2iface.ELBV2API, l Liste
 					return err
 				}
 
+				if p == 100 {
+					fmt.Printf("Done.")
+					return nil
+				}
+
 				p += step
 			case <-ctx.Done():
 				if p != 100 {