Merge branch 'master' into persist-ttl-string

tikv · Nov 5, 2020 · 84e2e55 · 84e2e55
2 parents 031a6e7 + 4d4d293
commit 84e2e55
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
diff --git a/pkg/autoscaling/calculation.go b/pkg/autoscaling/calculation.go
@@ -14,6 +14,7 @@
 package autoscaling
 
 import (
+	"fmt"
 	"math"
 	"strings"
 	"time"
@@ -425,7 +426,7 @@ func findBestGroupToScaleOut(strategy *Strategy, scaleOutQuota float64, groups [
 		ResourceType: resources[0].ResourceType,
 		Labels: map[string]string{
 			// TODO: we need to make this label not duplicated when we implement the heterogeneous logic.
-			groupLabelKey:        autoScalingGroupLabelKeyPrefix + component.String(),
+			groupLabelKey:        fmt.Sprintf("%s-%s", autoScalingGroupLabelKeyPrefix, component.String()),
 			resourceTypeLabelKey: resources[0].ResourceType,
 		},
 	}