Merge pull request #1851 from weaveworks/issue/1843-cluster-scope-sen…

…tinel

Admit "<cluster>" when parsing ResourceIDs

flux.go

@@ -14,12 +14,12 @@ var (
 	ErrInvalidServiceID = errors.New("invalid service ID")
 
 	LegacyServiceIDRegexp = regexp.MustCompile("^([a-zA-Z0-9_-]+)/([a-zA-Z0-9_-]+)$")
-	// The namespace and name commponents are (apparently
+	// The namespace and name components are (apparently
 	// non-normatively) defined in
 	// https://github.com/kubernetes/community/blob/master/contributors/design-proposals/architecture/identifiers.md
 	// In practice, more punctuation is used than allowed there;
 	// specifically, people use underscores as well as dashes and dots, and in names, colons.
-	ResourceIDRegexp            = regexp.MustCompile("^([a-zA-Z0-9_-]+):([a-zA-Z0-9_-]+)/([a-zA-Z0-9_.:-]+)$")
+	ResourceIDRegexp            = regexp.MustCompile("^(<cluster>|[a-zA-Z0-9_-]+):([a-zA-Z0-9_-]+)/([a-zA-Z0-9_.:-]+)$")
 	UnqualifiedResourceIDRegexp = regexp.MustCompile("^([a-zA-Z0-9_-]+)/([a-zA-Z0-9_.:-]+)$")
 )
 

resourceid_test.go

@@ -14,6 +14,7 @@ func TestResourceIDParsing(t *testing.T) {
 		{"dots", "namespace:kind/name.with.dots"},
 		{"colons", "namespace:kind/name:with:colons"},
 		{"punctuation in general", "name-space:ki_nd/punc_tu:a.tion-rules"},
+		{"cluster-scope resource", "<cluster>:namespace/foo"},
 	}
 	invalid := []test{
 		{"unqualified", "justname"},