chore: replace prefix match with compDefMatched

apecloud · Dec 24, 2024 · efd37a1 · efd37a1
1 parent 5326a9f
commit efd37a1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/controllers/apps/componentversion_controller.go b/controllers/apps/componentversion_controller.go
@@ -447,12 +447,12 @@ func serviceVersionToCompDefinitions(ctx context.Context, cli client.Reader,
 
 // compatibleServiceVersions4Definition returns all service versions that are compatible with specified component definition.
 func compatibleServiceVersions4Definition(compDef *appsv1alpha1.ComponentDefinition, compVersion *appsv1alpha1.ComponentVersion) sets.Set[string] {
-	prefixMatch := func(prefix string) bool {
-		return strings.HasPrefix(compDef.Name, prefix)
+	compDefMatched := func(compDefPattern string) bool {
+		return component.CompDefMatched(compDef.Name, compDefPattern)
 	}
 	releases := make(map[string]bool, 0)
 	for _, rule := range compVersion.Spec.CompatibilityRules {
-		if slices.IndexFunc(rule.CompDefs, prefixMatch) >= 0 {
+		if slices.IndexFunc(rule.CompDefs, compDefMatched) >= 0 {
 			for _, release := range rule.Releases {
 				releases[release] = true
 			}