Fix manual rollback (immediate rollback is still not working)

mumoshu · Jan 1, 2022 · 17d46a4 · 17d46a4
1 parent d418a59
commit 17d46a4
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 45 deletions.
diff --git a/pkg/awstargetgroupset/awstargetgroupset.go b/pkg/awstargetgroupset/awstargetgroupset.go
@@ -468,45 +468,45 @@ func ListLatestAWSTargetGroups(config ListLatestAWSTargetGroupsInput) (*semver.V
 
 	versionedGroups := map[string]entry{}
 
-	if latestVer == nil {
-		for _, g := range groups {
-			g := g
+	var maxVer *semver.Version
 
-			var verStr string
+	for _, g := range groups {
+		g := g
 
-			for _, labelKey := range labelKeys {
-				verStr = g.Labels[labelKey]
-				if verStr != "" {
-					break
-				}
-			}
+		var verStr string
 
-			if verStr == "" {
-				return nil, nil, fmt.Errorf("no semver label found on group: %v", g)
+		for _, labelKey := range labelKeys {
+			verStr = g.Labels[labelKey]
+			if verStr != "" {
+				break
 			}
+		}
 
-			ver, err := semver.Parse(verStr)
-			if err != nil {
-				return nil, nil, err
-			}
+		if verStr == "" {
+			return nil, nil, fmt.Errorf("no semver label found on group: %v", g)
+		}
 
-			if latestVer == nil {
-				latestVer = &ver
-			} else if latestVer.LT(ver) {
-				latestVer = &ver
-			}
+		ver, err := semver.Parse(verStr)
+		if err != nil {
+			return nil, nil, err
+		}
 
-			e := versionedGroups[ver.String()]
+		if maxVer == nil {
+			maxVer = &ver
+		} else if maxVer.LT(ver) {
+			maxVer = &ver
+		}
 
-			e.ver = ver
-			e.groups = append(e.groups, g)
+		e := versionedGroups[ver.String()]
 
-			versionedGroups[ver.String()] = e
-		}
+		e.ver = ver
+		e.groups = append(e.groups, g)
 
-		if latestVer == nil {
-			return nil, nil, nil
-		}
+		versionedGroups[ver.String()] = e
+	}
+
+	if latestVer == nil {
+		latestVer = maxVer
 	}
 
 	latest := versionedGroups[latestVer.String()]

diff --git a/pkg/cell/cell.go b/pkg/cell/cell.go
@@ -103,31 +103,22 @@ func Sync(config SyncInput) error {
 		labelKeys = []string{okrav1alpha1.DefaultVersionLabelKey}
 	}
 
-	latestVer, latestTGs, err := awstargetgroupset.ListLatestAWSTargetGroups(awstargetgroupset.ListLatestAWSTargetGroupsInput{
+	v := cell.Spec.Version
+
+	desiredVer, latestTGs, err := awstargetgroupset.ListLatestAWSTargetGroups(awstargetgroupset.ListLatestAWSTargetGroupsInput{
 		ListAWSTargetGroupsInput: awstargetgroupset.ListAWSTargetGroupsInput{
 			NS:       cell.Namespace,
 			Selector: tgSelector.String(),
 		},
 		SemverLabelKeys: labelKeys,
+		Version:         v,
 	})
 	if err != nil {
 		return err
 	}
 
-	var desiredVer *semver.Version
-
-	if cell.Spec.Version != "" {
-		ver, err := semver.Parse(cell.Spec.Version)
-		if err != nil {
-			log.Printf("Failed to parse cell.Spec.Version(%s): %v", cell.Spec.Version, err)
-			return err
-		}
-
-		log.Printf("Using cell.Spec.Version(%s) instead of latest version(%s)", ver, desiredVer)
-
-		desiredVer = &ver
-	} else {
-		desiredVer = latestVer
+	if v != "" {
+		log.Printf("Using cell.Spec.Version(%s) instead of latest version", v)
 	}
 
 	currentTGs, err := awstargetgroupset.ListAWSTargetGroups(awstargetgroupset.ListAWSTargetGroupsInput{
@@ -164,7 +155,7 @@ func Sync(config SyncInput) error {
 		threshold = int(*cell.Spec.Replicas)
 	}
 
-	log.Printf("cell=%s/%s, albConfigExists=%v, tgSelector=%s, len(latestTGs)=%d, len(desiredTGs)=%d\n", cell.Namespace, cell.Name, albConfigExists, tgSelector.String(), len(latestTGs), len(desiredTGs))
+	log.Printf("cell=%s/%s, albConfigExists=%v, tgSelector=%s, len(latestTGs)=%d\n", cell.Namespace, cell.Name, albConfigExists, tgSelector.String(), len(latestTGs))
 
 	if numLatestTGs != threshold {
 		return nil