Merge pull request #62021 from CaoShuFeng/TokenRequest

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 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 https://github.com/kubernetes/kubernetes/issues/62020 **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` /assign @mikedanese

Merge pull request #62021 from CaoShuFeng/TokenRequest
fcfdda85 · Kubernetes Submit Queue · GitHub · 96746166 · da788a1a · fcfdda85
Unverified Commit fcfdda85 authored Apr 18, 2018 by Kubernetes Submit Queue Committed by GitHub Apr 18, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 2 deletions

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

No files found.
--- a/pkg/registry/core/serviceaccount/storage/token.go
+++ b/pkg/registry/core/serviceaccount/storage/token.go
@@ -70,7 +70,8 @@ func (r *TokenREST) Create(ctx genericapirequest.Context, name string, obj runti
 		gvk := schema.FromAPIVersionAndKind(ref.APIVersion, ref.Kind)
 		switch {
 		case gvk.Group == "" && gvk.Kind == "Pod":
-			podObj, err := r.pods.Get(ctx, ref.Name, &metav1.GetOptions{})
+			newCtx := newContext(ctx, "pods", ref.Name, gvk)
+			podObj, err := r.pods.Get(newCtx, ref.Name, &metav1.GetOptions{})
 			if err != nil {
 				return nil, err
 			}
@@ -80,7 +81,8 @@ func (r *TokenREST) Create(ctx genericapirequest.Context, name string, obj runti
 			}
 			uid = pod.UID
 		case gvk.Group == "" && gvk.Kind == "Secret":
-			secretObj, err := r.secrets.Get(ctx, ref.Name, &metav1.GetOptions{})
+			newCtx := newContext(ctx, "secrets", ref.Name, gvk)
+			secretObj, err := r.secrets.Get(newCtx, ref.Name, &metav1.GetOptions{})
 			if err != nil {
 				return nil, err
 			}
@@ -120,3 +122,22 @@ func (r *TokenREST) GroupVersionKind(containingGV schema.GroupVersion) schema.Gr
 type getter interface {
 	Get(ctx genericapirequest.Context, name string, options *metav1.GetOptions) (runtime.Object, error)
 }
+
+// newContext return a copy of ctx in which new RequestInfo is set
+func newContext(ctx genericapirequest.Context, resource, name string, gvk schema.GroupVersionKind) genericapirequest.Context {
+	oldInfo, found := genericapirequest.RequestInfoFrom(ctx)
+	if !found {
+		return ctx
+	}
+	newInfo := genericapirequest.RequestInfo{
+		IsResourceRequest: true,
+		Verb:              "get",
+		Namespace:         oldInfo.Namespace,
+		Resource:          resource,
+		Name:              name,
+		Parts:             []string{resource, name},
+		APIGroup:          gvk.Group,
+		APIVersion:        gvk.Version,
+	}
+	return genericapirequest.WithRequestInfo(ctx, &newInfo)
+}