github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #85810 from liggitt/disable-webhook-ratelimit

Browse Source 
Ensure webhook backend requests are not artificially rate-limited
This commit is contained in:
Kubernetes Prow Robot 2019-12-02 15:03:09 -08:00 committed by GitHub
commit 19ee1ea9fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/apiserver/pkg/util/webhook/client.go
View File

@ -131,6 +131,10 @@ func (cm *ClientManager) HookClient(cc ClientConfig) (*rest.RESTClient, error) {
} }
complete := func(cfg *rest.Config) (*rest.RESTClient, error) { complete := func(cfg *rest.Config) (*rest.RESTClient, error) {
// Avoid client-side rate limiting talking to the webhook backend.
// Rate limiting should happen when deciding how many requests to serve.
cfg.QPS = -1
// Combine CAData from the config with any existing CA bundle provided // Combine CAData from the config with any existing CA bundle provided
if len(cfg.TLSClientConfig.CAData) > 0 { if len(cfg.TLSClientConfig.CAData) > 0 {
cfg.TLSClientConfig.CAData = append(cfg.TLSClientConfig.CAData, '\n') cfg.TLSClientConfig.CAData = append(cfg.TLSClientConfig.CAData, '\n')

4
staging/src/k8s.io/apiserver/pkg/util/webhook/webhook.go
View File

@ -88,6 +88,10 @@ func newGenericWebhook(scheme *runtime.Scheme, codecFactory serializer.CodecFact
// Set this to something reasonable so request to webhooks don't hang forever. // Set this to something reasonable so request to webhooks don't hang forever.
clientConfig.Timeout = requestTimeout clientConfig.Timeout = requestTimeout
// Avoid client-side rate limiting talking to the webhook backend.
// Rate limiting should happen when deciding how many requests to serve.
clientConfig.QPS = -1
codec := codecFactory.LegacyCodec(groupVersions...) codec := codecFactory.LegacyCodec(groupVersions...)
clientConfig.ContentConfig.NegotiatedSerializer = serializer.NegotiatedSerializerWrapper(runtime.SerializerInfo{Serializer: codec}) clientConfig.ContentConfig.NegotiatedSerializer = serializer.NegotiatedSerializerWrapper(runtime.SerializerInfo{Serializer: codec})

10
test/integration/apiserver/admissionwebhook/admission_test.go
View File

@ -566,6 +566,9 @@ func testWebhookAdmission(t *testing.T, watchCache bool) {
// Allow the webhook to establish // Allow the webhook to establish
time.Sleep(time.Second) time.Sleep(time.Second)
start := time.Now()
count := 0
// Test admission on all resources, subresources, and verbs // Test admission on all resources, subresources, and verbs
for _, gvr := range gvrsToTest { for _, gvr := range gvrsToTest {
resource := resourcesByGVR[gvr] resource := resourcesByGVR[gvr]
@ -573,6 +576,7 @@ func testWebhookAdmission(t *testing.T, watchCache bool) {
for _, verb := range []string{"create", "update", "patch", "connect", "delete", "deletecollection"} { for _, verb := range []string{"create", "update", "patch", "connect", "delete", "deletecollection"} {
if shouldTestResourceVerb(gvr, resource, verb) { if shouldTestResourceVerb(gvr, resource, verb) {
t.Run(verb, func(t *testing.T) { t.Run(verb, func(t *testing.T) {
count++
holder.reset(t) holder.reset(t)
testFunc := getTestFunc(gvr, verb) testFunc := getTestFunc(gvr, verb)
testFunc(&testContext{ testFunc(&testContext{
@ -591,6 +595,12 @@ func testWebhookAdmission(t *testing.T, watchCache bool) {
} }
}) })
} }
duration := time.Now().Sub(start)
perResourceDuration := time.Duration(int(duration) / count)
if perResourceDuration >= 150*time.Millisecond {
t.Errorf("expected resources to process in < 150ms, average was %v", perResourceDuration)
}
} }
// //