Ver Fonte

cmd/k8s-operator: minor fix in name gen (#10830)

Updates#cleanup

Signed-off-by: Irbe Krumina <[email protected]>
Irbe Krumina há 2 anos atrás
pai
commit
169778e23b
2 ficheiros alterados com 3 adições e 5 exclusões
  1. 2 4
      cmd/k8s-operator/sts.go
  2. 1 1
      cmd/k8s-operator/sts_test.go

+ 2 - 4
cmd/k8s-operator/sts.go

@@ -222,10 +222,8 @@ func statefulSetNameBase(parent string) string {
 		if excess <= 0 {
 			return base
 		}
-		base = base[:len(base)-1-excess]   // cut off the excess chars
-		if !strings.HasSuffix(base, "-") { // dash may have been cut by the generator
-			base = base + "-"
-		}
+		base = base[:len(base)-1-excess] // cut off the excess chars
+		base = base + "-"                // re-instate the dash
 	}
 }
 

+ 1 - 1
cmd/k8s-operator/sts_test.go

@@ -28,7 +28,7 @@ func Test_statefulSetNameBase(t *testing.T) {
 		if _, err := b.WriteString("a"); err != nil {
 			t.Fatalf("error writing to string builder: %v", err)
 		}
-		baseLength := len(b.String())
+		baseLength := b.Len()
 		if baseLength > 43 {
 			baseLength = 43 // currently 43 is the max base length
 		}