Merge pull request #54218 from CaoShuFeng/stra

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix error message of custrom resource validation /assign @deads2k /assign @sttts **Release note**: ``` NONE ``` Kubernetes-commit: 194f3983f09be84c9a7e6eaab09e1fd6064b05bf
sttts · Oct 20, 2017 · 6994313 · 6994313
2 parents ac65cb2 + 318f9e6
commit 6994313
Show file tree

Hide file tree

Showing 9 changed files with 1,242 additions and 1,098 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/pkg/registry/customresource/strategy.go b/pkg/registry/customresource/strategy.go
@@ -135,7 +135,7 @@ func (a customResourceValidator) Validate(ctx genericapirequest.Context, obj run
 		return field.ErrorList{field.Invalid(field.NewPath("kind"), typeAccessor.GetKind(), fmt.Sprintf("must be %v", a.kind.Kind))}
 	}
 	if typeAccessor.GetAPIVersion() != a.kind.Group+"/"+a.kind.Version {
-		return field.ErrorList{field.Invalid(field.NewPath("apiVersion"), typeAccessor.GetKind(), fmt.Sprintf("must be %v", a.kind.Group+"/"+a.kind.Version))}
+		return field.ErrorList{field.Invalid(field.NewPath("apiVersion"), typeAccessor.GetAPIVersion(), fmt.Sprintf("must be %v", a.kind.Group+"/"+a.kind.Version))}
 	}
 
 	customResourceObject, ok := obj.(*unstructured.Unstructured)
@@ -169,7 +169,7 @@ func (a customResourceValidator) ValidateUpdate(ctx genericapirequest.Context, o
 		return field.ErrorList{field.Invalid(field.NewPath("kind"), typeAccessor.GetKind(), fmt.Sprintf("must be %v", a.kind.Kind))}
 	}
 	if typeAccessor.GetAPIVersion() != a.kind.Group+"/"+a.kind.Version {
-		return field.ErrorList{field.Invalid(field.NewPath("apiVersion"), typeAccessor.GetKind(), fmt.Sprintf("must be %v", a.kind.Group+"/"+a.kind.Version))}
+		return field.ErrorList{field.Invalid(field.NewPath("apiVersion"), typeAccessor.GetAPIVersion(), fmt.Sprintf("must be %v", a.kind.Group+"/"+a.kind.Version))}
 	}
 
 	customResourceObject, ok := obj.(*unstructured.Unstructured)