Merge pull request #494 from freehan/bug-fix

include NEG naming scheme for NameBelongsToCluster
kubernetes · Sep 25, 2018 · b04a367 · b04a367
2 parents 2b6d216 + b3522bb
commit b04a367
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/pkg/utils/namer.go b/pkg/utils/namer.go
@@ -240,7 +240,7 @@ func (n *Namer) negBelongsToCluster(name string) bool {
 // NameBelongsToCluster checks if a given name is tagged with this
 // cluster's UID.
 func (n *Namer) NameBelongsToCluster(name string) bool {
-	if !strings.HasPrefix(name, n.prefix+"-") {
+	if !strings.HasPrefix(name, n.prefix) {
 		return false
 	}
 	clusterName := n.UID()

diff --git a/pkg/utils/namer_test.go b/pkg/utils/namer_test.go
@@ -136,6 +136,7 @@ func TestNameBelongsToCluster(t *testing.T) {
 			namer.ForwardingRule(lbName, HTTPProtocol),
 			namer.ForwardingRule(lbName, HTTPSProtocol),
 			namer.UrlMap(lbName),
+			namer.NEG("ns", "n", int32(80)),
 		} {
 			if !namer.NameBelongsToCluster(tc) {
 				t.Errorf("namer.NameBelongsToCluster(%q) = false, want true", tc)