Skip to content

Commit bde3899

Browse files
Return the context error
Signed-off-by: Michel Hollands <[email protected]>
1 parent bb6e241 commit bde3899

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

pkg/admission/annotations.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const (
2020
func addDownscaledAnnotationToStatefulSet(ctx context.Context, api kubernetes.Interface, namespace, stsName string) error {
2121
select {
2222
case <-ctx.Done():
23-
return fmt.Errorf("context cancelled")
23+
return ctx.Err()
2424
default:
2525
}
2626

@@ -39,7 +39,7 @@ type statefulSet struct {
3939
func findDownscalesDoneMinTimeAgo(ctx context.Context, api kubernetes.Interface, namespace, stsName, rolloutGroup string) (*statefulSet, error) {
4040
select {
4141
case <-ctx.Done():
42-
return nil, fmt.Errorf("context cancelled")
42+
return nil, ctx.Err()
4343
default:
4444
}
4545
client := api.AppsV1().StatefulSets(namespace)

pkg/admission/no_downscale.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func allowErr(logger log.Logger, msg string, err error) *v1.AdmissionResponse {
142142
func getResourceLabels(ctx context.Context, ar v1.AdmissionReview, api kubernetes.Interface) (map[string]string, error) {
143143
select {
144144
case <-ctx.Done():
145-
return nil, fmt.Errorf("context cancelled")
145+
return nil, ctx.Err()
146146
default:
147147
}
148148

pkg/admission/prep_downscale.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ type httpClient interface {
4141
func prepareDownscale(ctx context.Context, logger log.Logger, ar v1.AdmissionReview, api kubernetes.Interface, client httpClient) *v1.AdmissionResponse {
4242
select {
4343
case <-ctx.Done():
44-
return deny("context cancelled")
44+
return deny(ctx.Err().Error())
4545
default:
4646
}
4747

@@ -261,7 +261,7 @@ func deny(msg string, args ...any) *v1.AdmissionResponse {
261261
func getResourceAnnotations(ctx context.Context, ar v1.AdmissionReview, api kubernetes.Interface) (map[string]string, error) {
262262
select {
263263
case <-ctx.Done():
264-
return nil, fmt.Errorf("context cancelled")
264+
return nil, ctx.Err()
265265
default:
266266
}
267267

0 commit comments

Comments
 (0)