Skip to content

Commit b78edd8

Browse files
committed
Plumb context to webhook calls
1 parent 4c686dd commit b78edd8

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

plugin/pkg/admission/imagepolicy/admission.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ func (a *Plugin) admitPod(ctx context.Context, pod *api.Pod, attributes admissio
175175
review.Status = entry.(v1alpha1.ImageReviewStatus)
176176
} else {
177177
result := a.webhook.WithExponentialBackoff(ctx, func() rest.Result {
178-
return a.webhook.RestClient.Post().Body(review).Do()
178+
return a.webhook.RestClient.Post().Context(ctx).Body(review).Do()
179179
})
180180

181181
if err := result.Error(); err != nil {

staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook/webhook.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func (w *WebhookTokenAuthenticator) AuthenticateToken(ctx context.Context, token
9999
auds authenticator.Audiences
100100
)
101101
webhook.WithExponentialBackoff(ctx, w.initialBackoff, func() error {
102-
result, err = w.tokenReview.Create(r)
102+
result, err = w.tokenReview.CreateContext(ctx, r)
103103
return err
104104
})
105105
if err != nil {
@@ -171,7 +171,11 @@ type tokenReviewClient struct {
171171
}
172172

173173
func (t *tokenReviewClient) Create(tokenReview *authentication.TokenReview) (*authentication.TokenReview, error) {
174+
return t.CreateContext(context.Background(), tokenReview)
175+
}
176+
177+
func (t *tokenReviewClient) CreateContext(ctx context.Context, tokenReview *authentication.TokenReview) (*authentication.TokenReview, error) {
174178
result := &authentication.TokenReview{}
175-
err := t.w.RestClient.Post().Body(tokenReview).Do().Into(result)
179+
err := t.w.RestClient.Post().Context(ctx).Body(tokenReview).Do().Into(result)
176180
return result, err
177181
}

staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ func (w *WebhookAuthorizer) Authorize(ctx context.Context, attr authorizer.Attri
189189
err error
190190
)
191191
webhook.WithExponentialBackoff(ctx, w.initialBackoff, func() error {
192-
result, err = w.subjectAccessReview.Create(r)
192+
result, err = w.subjectAccessReview.CreateContext(ctx, r)
193193
return err
194194
})
195195
if err != nil {
@@ -265,8 +265,12 @@ type subjectAccessReviewClient struct {
265265
}
266266

267267
func (t *subjectAccessReviewClient) Create(subjectAccessReview *authorization.SubjectAccessReview) (*authorization.SubjectAccessReview, error) {
268+
return t.CreateContext(context.Background(), subjectAccessReview)
269+
}
270+
271+
func (t *subjectAccessReviewClient) CreateContext(ctx context.Context, subjectAccessReview *authorization.SubjectAccessReview) (*authorization.SubjectAccessReview, error) {
268272
result := &authorization.SubjectAccessReview{}
269-
err := t.w.RestClient.Post().Body(subjectAccessReview).Do().Into(result)
273+
err := t.w.RestClient.Post().Context(ctx).Body(subjectAccessReview).Do().Into(result)
270274
return result, err
271275
}
272276

0 commit comments

Comments
 (0)