From 5d30e416efdf2921e1d0c553a81961b8a5bd9069 Mon Sep 17 00:00:00 2001 From: Vamsi Krishna Siddu Date: Tue, 21 Jan 2025 14:52:57 +0530 Subject: [PATCH] Fix the managed-by-label getting populated with invalid value. Signed-off-by: Vamsi Krishna Siddu --- cmd/csi-provisioner/util.go | 2 +- cmd/csi-provisioner/util_test.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/csi-provisioner/util.go b/cmd/csi-provisioner/util.go index 0b5924183c..bf7870c825 100644 --- a/cmd/csi-provisioner/util.go +++ b/cmd/csi-provisioner/util.go @@ -36,7 +36,7 @@ func getNameWithMaxLength(base, suffix string, maxLength int) string { baseLength := maxLength - 10 /*length of -hash-*/ - len(suffix) // if the suffix is too long, ignore it - if baseLength < 0 { + if baseLength <= 0 { prefix := base[0:min(len(base), max(0, maxLength-9))] // Calculate hash on initial base-suffix string shortName := fmt.Sprintf("%s-%s", prefix, hash(name)) diff --git a/cmd/csi-provisioner/util_test.go b/cmd/csi-provisioner/util_test.go index b43f775ea0..ea253ec376 100644 --- a/cmd/csi-provisioner/util_test.go +++ b/cmd/csi-provisioner/util_test.go @@ -45,6 +45,10 @@ func TestGetNameWithMaxLength(t *testing.T) { nodeName: fmt.Sprintf("node%s", strings.Repeat("a", 39)), }, "very long, ignore suffix": { + expected: fmt.Sprintf("%s-%s", externalProvisioner, "a3607ff1"), + nodeName: fmt.Sprintf("node%s", strings.Repeat("a", 49)), + }, + "very very long, ignore suffix": { expected: fmt.Sprintf("%s-%s", externalProvisioner, "df38e37f"), nodeName: fmt.Sprintf("node%s", strings.Repeat("a", 63)), },