Handle empty cluster name in sslcert namer

kubernetes · Jun 12, 2018 · a248f76 · a248f76
1 parent 96bd52f
commit a248f76
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/pkg/utils/namer.go b/pkg/utils/namer.go
@@ -192,6 +192,7 @@ func truncate(key string) string {
 
 func (n *Namer) decorateName(name string) string {
 	clusterName := n.UID()
+	// clusterName might be empty for legacy clusters
 	if clusterName == "" {
 		return name
 	}
@@ -342,7 +343,7 @@ func (n *Namer) IsLegacySSLCert(lbName string, resourceName string) bool {
 func (n *Namer) SSLCertName(lbName string, secretHash string) string {
 	lbNameHash := n.lbNameToHash(lbName)
 	// k8s-ssl-[lbNameHash]-[certhash]--[clusterUID]
-	return truncate(fmt.Sprintf("%s-%s-%s-%s%s%s", n.prefix, sslCertPrefix, lbNameHash, secretHash, clusterNameDelimiter, n.UID()))
+	return n.decorateName(fmt.Sprintf("%s-%s-%s-%s", n.prefix, sslCertPrefix, lbNameHash, secretHash))
 }
 
 // ForwardingRule returns the name of the forwarding rule prefix.

diff --git a/pkg/utils/namer_test.go b/pkg/utils/namer_test.go
@@ -19,6 +19,7 @@ package utils
 import (
 	"crypto/sha256"
 	"fmt"
+	"strings"
 	"testing"
 )
 
@@ -336,6 +337,17 @@ func TestNamerLoadBalancer(t *testing.T) {
 	}
 }
 
+// Ensure that a valid cert name is created if clusterName is empty.
+func TestNamerSSLCertName(t *testing.T) {
+	secretHash := fmt.Sprintf("%x", sha256.Sum256([]byte("test123")))[:16]
+	namer := NewNamerWithPrefix("k8s", "", "fw1")
+	lbName := namer.LoadBalancer("key1")
+	certName := namer.SSLCertName(lbName, secretHash)
+	if strings.HasSuffix(certName, clusterNameDelimiter) {
+		t.Errorf("Invalid Cert name %s ending with %s", certName, clusterNameDelimiter)
+	}
+}
+
 func TestNamerIsCertUsedForLB(t *testing.T) {
 	cases := map[string]struct {
 		prefix      string