Merge pull request #63569 from hanxiaoshuai/bugfix0509

Automatic merge from submit-queue (batch tested with PRs 63569, 63918, 63980, 63295, 63989). 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 a small mistake in function getFieldMeta **What this PR does / why we need it**: fix a small mistake in function getFieldMeta **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: ``` if e, found := ext["x-kubernetes-patch-strategy"]; found { strategy, ok := e.(string) if !ok { return apply.FieldMetaImpl{}, fmt.Errorf("Expected string for x-kubernetes-patch-strategy by got %T", s) } } ``` According the judgment above, I think we should print the type of e. **Release note**: ```release-note NONE ```

Merge pull request #63569 from hanxiaoshuai/bugfix0509
08a094ca · Kubernetes Submit Queue · GitHub · dfdfea84 · c01f6a1e · 08a094ca
Unverified Commit 08a094ca authored May 18, 2018 by Kubernetes Submit Queue Committed by GitHub May 18, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

util.go pkg/kubectl/apply/parse/util.go +1 -1

No files found.
--- a/pkg/kubectl/apply/parse/util.go
+++ b/pkg/kubectl/apply/parse/util.go
@@ -104,7 +104,7 @@ func getFieldMeta(s proto.Schema, name string) (apply.FieldMetaImpl, error) {
 		if e, found := ext["x-kubernetes-patch-strategy"]; found {
 			strategy, ok := e.(string)
 			if !ok {
-				return apply.FieldMetaImpl{}, fmt.Errorf("Expected string for x-kubernetes-patch-strategy by got %T", s)
+				return apply.FieldMetaImpl{}, fmt.Errorf("Expected string for x-kubernetes-patch-strategy by got %T", e)
 			}
 			// Take the first strategy if there are substrategies.