Merge pull request #62062 from CaoShuFeng/TokenRequest-information

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>. not expose object detail when creating TokenRequest **What this PR does / why we need it**: **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**: /assign @liggitt @mikedanese **Release note**: ```release-note NONE ```

Merge pull request #62062 from CaoShuFeng/TokenRequest-information
ed9b25c9 · Kubernetes Submit Queue · GitHub · 7d57060d · 5eefd7d0 · ed9b25c9
Unverified Commit ed9b25c9 authored May 01, 2018 by Kubernetes Submit Queue Committed by GitHub May 01, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

token.go pkg/registry/core/serviceaccount/storage/token.go +2 -2

No files found.
--- a/pkg/registry/core/serviceaccount/storage/token.go
+++ b/pkg/registry/core/serviceaccount/storage/token.go
@@ -79,7 +79,7 @@ func (r *TokenREST) Create(ctx context.Context, name string, obj runtime.Object,
 			}
 			pod = podObj.(*api.Pod)
 			if name != pod.Spec.ServiceAccountName {
-				return nil, errors.NewBadRequest(fmt.Sprintf("cannot bind token for serviceaccount %q to pod running with serviceaccount %q", name, pod.Spec.ServiceAccountName))
+				return nil, errors.NewBadRequest(fmt.Sprintf("cannot bind token for serviceaccount %q to pod running with different serviceaccount name.", name))
 			}
 			uid = pod.UID
 		case gvk.Group == "" && gvk.Kind == "Secret":
@@ -94,7 +94,7 @@ func (r *TokenREST) Create(ctx context.Context, name string, obj runtime.Object,
 			return nil, errors.NewBadRequest(fmt.Sprintf("cannot bind token to object of type %s", gvk.String()))
 		}
 		if ref.UID != "" && uid != ref.UID {
-			return nil, errors.NewConflict(schema.GroupResource{Group: gvk.Group, Resource: gvk.Kind}, ref.Name, fmt.Errorf("the UID in the bound object reference (%s) does not match the UID in record (%s). The object might have been deleted and then recreated", ref.UID, uid))
+			return nil, errors.NewConflict(schema.GroupResource{Group: gvk.Group, Resource: gvk.Kind}, ref.Name, fmt.Errorf("the UID in the bound object reference (%s) does not match the UID in record. The object might have been deleted and then recreated", ref.UID))
 		}
 	}
 	if len(out.Spec.Audiences) == 0 {