kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix kube-apiserver panic when CRD Kind contains only one letter 

Signed-off-by: SataQiu <1527062125@qq.com>

Kubernetes-commit: 2c8c9d02098a975ee3f42c6a6d29579da8502b6d
This commit is contained in:
SataQiu 2020-06-06 23:01:35 +08:00 committed by Kubernetes Publisher
parent 3f3681bf8c
commit 6b9950ac7e
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/endpoints/installer.go
View File

@ -1070,7 +1070,7 @@ func splitSubresource(path string) (string, string, error) {
// GetArticleForNoun returns the article needed for the given noun. // GetArticleForNoun returns the article needed for the given noun.
func GetArticleForNoun(noun string, padding string) string { func GetArticleForNoun(noun string, padding string) string {
if noun[len(noun)-2:] != "ss" && noun[len(noun)-1:] == "s" { if !strings.HasSuffix(noun, "ss") && strings.HasSuffix(noun, "s") {
// Plurals don't have an article. // Plurals don't have an article.
// Don't catch words like class // Don't catch words like class
return fmt.Sprintf("%v", padding) return fmt.Sprintf("%v", padding)

10
pkg/endpoints/installer_test.go
View File

@ -80,6 +80,16 @@ func TestGetArticleForNoun(t *testing.T) {
padding: " ", padding: " ",
want: " a ", want: " a ",
}, },
{
noun: "S",
padding: " ",
want: " a ",
},
{
noun: "O",
padding: " ",
want: " an ",
},
} }
for _, tt := range tests { for _, tt := range tests {
if got := GetArticleForNoun(tt.noun, tt.padding); got != tt.want { if got := GetArticleForNoun(tt.noun, tt.padding); got != tt.want {