From 07077a8aa522460526135194376c2be248fdad2f Mon Sep 17 00:00:00 2001 From: Jianfei Bai Date: Sun, 11 Aug 2019 21:05:49 +0800 Subject: [PATCH 1/2] Replace self defined const StatusTooManyRequests with http.StatusTooManyRequests. --- plugin/pkg/admission/eventratelimit/admission_test.go | 3 ++- staging/src/k8s.io/apimachinery/pkg/api/errors/errors.go | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/plugin/pkg/admission/eventratelimit/admission_test.go b/plugin/pkg/admission/eventratelimit/admission_test.go index 82566eea799..17a72d44b38 100644 --- a/plugin/pkg/admission/eventratelimit/admission_test.go +++ b/plugin/pkg/admission/eventratelimit/admission_test.go @@ -17,6 +17,7 @@ limitations under the License. package eventratelimit import ( + "net/http" "testing" "time" @@ -516,7 +517,7 @@ func TestEventRateLimiting(t *testing.T) { } if err != nil { statusErr, ok := err.(*errors.StatusError) - if ok && statusErr.ErrStatus.Code != errors.StatusTooManyRequests { + if ok && statusErr.ErrStatus.Code != http.StatusTooManyRequests { t.Fatalf("%v: Request %v should yield a 429 response: %v", tc.name, rqIndex, err) } } diff --git a/staging/src/k8s.io/apimachinery/pkg/api/errors/errors.go b/staging/src/k8s.io/apimachinery/pkg/api/errors/errors.go index f4201eb6910..2f7378c404a 100644 --- a/staging/src/k8s.io/apimachinery/pkg/api/errors/errors.go +++ b/staging/src/k8s.io/apimachinery/pkg/api/errors/errors.go @@ -30,6 +30,8 @@ import ( ) const ( + // DEPRECATED: please use http.StatusTooManyRequests, this will be removed in + // the future version. // StatusTooManyRequests means the server experienced too many requests within a // given window and that the client must wait to perform the action again. StatusTooManyRequests = 429 @@ -349,7 +351,7 @@ func NewTimeoutError(message string, retryAfterSeconds int) *StatusError { func NewTooManyRequestsError(message string) *StatusError { return &StatusError{metav1.Status{ Status: metav1.StatusFailure, - Code: StatusTooManyRequests, + Code: http.StatusTooManyRequests, Reason: metav1.StatusReasonTooManyRequests, Message: fmt.Sprintf("Too many requests: %s", message), }} From 2a6e6c977666486ac88f3765814ae2203b7ab7b2 Mon Sep 17 00:00:00 2001 From: Jianfei Bai Date: Mon, 12 Aug 2019 21:56:20 +0800 Subject: [PATCH 2/2] Replace self defined const StatusTooManyRequests with http.StatusTooManyRequests. --- staging/src/k8s.io/apimachinery/pkg/api/errors/errors.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/staging/src/k8s.io/apimachinery/pkg/api/errors/errors.go b/staging/src/k8s.io/apimachinery/pkg/api/errors/errors.go index 2f7378c404a..95d5c7a3553 100644 --- a/staging/src/k8s.io/apimachinery/pkg/api/errors/errors.go +++ b/staging/src/k8s.io/apimachinery/pkg/api/errors/errors.go @@ -30,11 +30,11 @@ import ( ) const ( - // DEPRECATED: please use http.StatusTooManyRequests, this will be removed in - // the future version. // StatusTooManyRequests means the server experienced too many requests within a // given window and that the client must wait to perform the action again. - StatusTooManyRequests = 429 + // DEPRECATED: please use http.StatusTooManyRequests, this will be removed in + // the future version. + StatusTooManyRequests = http.StatusTooManyRequests ) // StatusError is an error intended for consumption by a REST API server; it can also be