{"", "ab", -1},
	{"bc", "ab", -1},
	{"ab", "ab", 0},
	{"xab", "ab", 1},
	{"xab"[:2], "ab", -1},
	{"", "abc", -1},
	{"xbc", "abc", -1},
	{"abc", "abc", 0},
	{"xabc", "abc", 1},
	{"xabc"[:3], "abc", -1},
	{"xabxc", "abc", -1},
	{"", "abcd", -1},
	{"xbcd", "abcd", -1},
	{"abcd", "abcd", 0},
	{"xabcd", "abcd", 1},
	{"xyabcd"[:5], "abcd", -1},
	{"xbcqq", "abcqq", -1},
	{"abcqq", "abcqq", 0},

        "abc"               | "  "   | "  abc"
        "abc"               | "def"  | "defabc"
        "abc\ndef\nghi"     | " "    | " abc\n def\n ghi"
        "abc\n\t\n   \nghi" | "X"    | "Xabc\n\t\n   \nXghi"
    }

    def shorterOf() {
        expect:
        TextUtil.shorterOf("a", "b") == "a"
        TextUtil.shorterOf("aa", "b") == "b"
        TextUtil.shorterOf("a", "bb") == "a"

E	a?(ac{0}b|ba)ab			abab	(0,4)(0,2)
E	ab|abab				abbabab	(0,2)
E	aba|bab|bba			baaabbbaba	(5,8)
E	aba|bab				baaabbbaba	(6,9)
E	(aa|aaa)*|(a|aaaaa)		aa	(0,2)(0,2)
E	(a.|.a.)*|(a|.a...)		aa	(0,2)(0,2)
E	ab|a				xabc	(1,3)
E	ab|a				xxabc	(2,4)
Ei	(Ab|cD)*			aBcD	(0,4)(2,4)
BE	[^-]			--a		(2,3)
BE	[a-]*			--a		(0,3)
BE	[a-m-]*			--amoma--	(0,4)
E	:::1:::0:|:::1:1:0:	:::0:::1:::1:::0:	(8,17)

### Client
* Use Prometheus instrumentation conventions ([#36704](https://github.com/kubernetes/kubernetes/pull/36704), [@fabxc](https://github.com/fabxc))
* Clients now use the `?watch=true` parameter to make watch API calls, instead of the `/watch/` path prefix ([#41722](https://github.com/kubernetes/kubernetes/pull/41722), [@liggitt](https://github.com/liggitt))