From 98f51de62839f85ac10a462ff19d5dd3ee7afff3 Mon Sep 17 00:00:00 2001 From: CatherineF-dev Date: Wed, 17 Apr 2024 17:18:28 -0400 Subject: [PATCH 1/4] Fix bug that `.` is removed in nodeName --- pkg/options/types.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/options/types.go b/pkg/options/types.go index 9f03ec863b..46f15a1923 100644 --- a/pkg/options/types.go +++ b/pkg/options/types.go @@ -18,7 +18,6 @@ package options import ( "errors" - "regexp" "sort" "strings" @@ -145,9 +144,7 @@ func (n *NodeType) GetNodeFieldSelector() string { klog.InfoS("Using node type is nil") return EmptyFieldSelector() } - pattern := "[^a-zA-Z0-9_,-]+" - re := regexp.MustCompile(pattern) - result := re.ReplaceAllString(n.String(), "") + result := n.String() klog.InfoS("Using node type", "node", result) return fields.OneTermEqualSelector("spec.nodeName", result).String() From a040897ba7202adc16339234ea748fefdd0058a4 Mon Sep 17 00:00:00 2001 From: CatherineF-dev Date: Thu, 18 Apr 2024 13:27:18 -0400 Subject: [PATCH 2/4] Update types.go --- pkg/options/types.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/options/types.go b/pkg/options/types.go index 46f15a1923..88793771eb 100644 --- a/pkg/options/types.go +++ b/pkg/options/types.go @@ -18,6 +18,7 @@ package options import ( "errors" + "regexp" "sort" "strings" @@ -144,7 +145,9 @@ func (n *NodeType) GetNodeFieldSelector() string { klog.InfoS("Using node type is nil") return EmptyFieldSelector() } - result := n.String() + pattern := "[^a-zA-Z0-9_,-\\.]+" + re := regexp.MustCompile(pattern) + result := re.ReplaceAllString(n.String(), "") klog.InfoS("Using node type", "node", result) return fields.OneTermEqualSelector("spec.nodeName", result).String() From 82da5815d816f5d1f3bf4add20f426b1add46933 Mon Sep 17 00:00:00 2001 From: CatherineF-dev Date: Fri, 19 Apr 2024 09:36:59 -0400 Subject: [PATCH 3/4] Update types.go --- pkg/options/types.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/options/types.go b/pkg/options/types.go index 88793771eb..46f15a1923 100644 --- a/pkg/options/types.go +++ b/pkg/options/types.go @@ -18,7 +18,6 @@ package options import ( "errors" - "regexp" "sort" "strings" @@ -145,9 +144,7 @@ func (n *NodeType) GetNodeFieldSelector() string { klog.InfoS("Using node type is nil") return EmptyFieldSelector() } - pattern := "[^a-zA-Z0-9_,-\\.]+" - re := regexp.MustCompile(pattern) - result := re.ReplaceAllString(n.String(), "") + result := n.String() klog.InfoS("Using node type", "node", result) return fields.OneTermEqualSelector("spec.nodeName", result).String() From af984416e7c76bf45330a772282dead49b5f76cd Mon Sep 17 00:00:00 2001 From: CatherineF-dev Date: Wed, 8 May 2024 21:30:34 -0400 Subject: [PATCH 4/4] Update types.go --- pkg/options/types.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/options/types.go b/pkg/options/types.go index 46f15a1923..88793771eb 100644 --- a/pkg/options/types.go +++ b/pkg/options/types.go @@ -18,6 +18,7 @@ package options import ( "errors" + "regexp" "sort" "strings" @@ -144,7 +145,9 @@ func (n *NodeType) GetNodeFieldSelector() string { klog.InfoS("Using node type is nil") return EmptyFieldSelector() } - result := n.String() + pattern := "[^a-zA-Z0-9_,-\\.]+" + re := regexp.MustCompile(pattern) + result := re.ReplaceAllString(n.String(), "") klog.InfoS("Using node type", "node", result) return fields.OneTermEqualSelector("spec.nodeName", result).String()