[kueuectl] Fix resource flavor name pattern on create cq (kubernetes-…

…sigs#2703)
openshift-kannon92 · Nov 19, 2024 · af088b5 · af088b5
1 parent 21d3a88
commit af088b5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cmd/kueuectl/app/create/create_clusterqueue.go b/cmd/kueuectl/app/create/create_clusterqueue.go
@@ -308,7 +308,7 @@ func (o *ClusterQueueOptions) parseResourceGroups() error {
 func parseUserSpecifiedResourceQuotas(resources []string, quotaType string) ([]v1beta1.ResourceGroup, error) {
 	var resourceGroups []v1beta1.ResourceGroup
 
-	regex := regexp.MustCompile(`^(\w+):((\w+[\.-]?)*\/?\w+=\w+;)*(\w+[\.-]?)*\/?\w+=\w+;?$`)
+	regex := regexp.MustCompile(`^([a-z0-9][a-z0-9\-\.]{0,252}):((\w+[\.-]?)*\/?\w+=\w+;)*(\w+[\.-]?)*\/?\w+=\w+;?$`)
 	for _, r := range resources {
 		if !regex.MatchString(r) {
 			return resourceGroups, errInvalidResourcesSpec

diff --git a/cmd/kueuectl/app/create/create_clusterqueue_test.go b/cmd/kueuectl/app/create/create_clusterqueue_test.go
@@ -102,14 +102,15 @@ func TestParseResourceQuotas(t *testing.T) {
 		wantResourceGroups []v1beta1.ResourceGroup
 	}{
 		"should create one resource group with one flavor and nominalQuota set": {
-			quotaArgs: []string{"alpha:cpu=1;memory=1"},
+			quotaArgs: []string{"alpha-2.0:cpu=1;memory=1;example-1.org/memory=5Gi"},
 			wantResourceGroups: []v1beta1.ResourceGroup{
 				{
-					CoveredResources: []corev1.ResourceName{"cpu", "memory"},
+					CoveredResources: []corev1.ResourceName{"cpu", "memory", "example-1.org/memory"},
 					Flavors: []v1beta1.FlavorQuotas{
-						*utiltesting.MakeFlavorQuotas("alpha").
+						*utiltesting.MakeFlavorQuotas("alpha-2.0").
 							Resource("cpu", "1").
 							Resource("memory", "1").
+							Resource("example-1.org/memory", "5Gi").
 							Obj(),
 					},
 				},