Skip to content

Commit 850a913

Browse files
gongguangongguan
committed
extend ShouldCallHook benchmark to verify performance imporvement
1 parent c1d78f2 commit 850a913

File tree

1 file changed

+148
-2
lines changed
  • staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/generic

1 file changed

+148
-2
lines changed

‎staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/generic/webhook_test.go‎

Lines changed: 148 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ func (f fakeNamespaceLister) Get(name string) (*corev1.Namespace, error) {
348348
return nil, errors.NewNotFound(corev1.Resource("namespaces"), name)
349349
}
350350

351-
func BenchmarkShouldCallHook(b *testing.B) {
351+
func BenchmarkShouldCallHookWithComplexSelector(b *testing.B) {
352352
allScopes := v1.AllScopes
353353
equivalentMatch := v1.Equivalent
354354

@@ -386,9 +386,14 @@ func BenchmarkShouldCallHook(b *testing.B) {
386386
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1beta1", "statefulset"}, "scale", schema.GroupVersionKind{"apps", "v1beta1", "Scale"})
387387
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1alpha2", "statefulset"}, "scale", schema.GroupVersionKind{"apps", "v1beta2", "Scale"})
388388

389+
nsSelector := make(map[string]string)
390+
for i := 0; i < 100; i++ {
391+
nsSelector[fmt.Sprintf("key-%d", i)] = fmt.Sprintf("val-%d", i)
392+
}
393+
389394
wb := &v1.ValidatingWebhook{
390395
MatchPolicy: &equivalentMatch,
391-
NamespaceSelector: &metav1.LabelSelector{MatchLabels: map[string]string{"a": "b"}},
396+
NamespaceSelector: &metav1.LabelSelector{MatchLabels: nsSelector},
392397
ObjectSelector: &metav1.LabelSelector{},
393398
Rules: []v1.RuleWithOperations{
394399
{
@@ -411,3 +416,144 @@ func BenchmarkShouldCallHook(b *testing.B) {
411416
a.ShouldCallHook(wbAccessor, attrs, interfaces)
412417
}
413418
}
419+
420+
func BenchmarkShouldCallHookWithComplexRule(b *testing.B) {
421+
allScopes := v1.AllScopes
422+
equivalentMatch := v1.Equivalent
423+
424+
namespace1Labels := map[string]string{"ns": "ns1"}
425+
namespace1 := corev1.Namespace{
426+
ObjectMeta: metav1.ObjectMeta{
427+
Name: "ns1",
428+
Labels: namespace1Labels,
429+
},
430+
}
431+
namespaceLister := fakeNamespaceLister{map[string]*corev1.Namespace{"ns": &namespace1}}
432+
433+
mapper := runtime.NewEquivalentResourceRegistryWithIdentity(func(resource schema.GroupResource) string {
434+
if resource.Resource == "deployments" {
435+
// co-locate deployments in all API groups
436+
return "/deployments"
437+
}
438+
return ""
439+
})
440+
mapper.RegisterKindFor(schema.GroupVersionResource{"extensions", "v1beta1", "deployments"}, "", schema.GroupVersionKind{"extensions", "v1beta1", "Deployment"})
441+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1", "deployments"}, "", schema.GroupVersionKind{"apps", "v1", "Deployment"})
442+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1beta1", "deployments"}, "", schema.GroupVersionKind{"apps", "v1beta1", "Deployment"})
443+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1alpha1", "deployments"}, "", schema.GroupVersionKind{"apps", "v1alpha1", "Deployment"})
444+
445+
mapper.RegisterKindFor(schema.GroupVersionResource{"extensions", "v1beta1", "deployments"}, "scale", schema.GroupVersionKind{"extensions", "v1beta1", "Scale"})
446+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1", "deployments"}, "scale", schema.GroupVersionKind{"autoscaling", "v1", "Scale"})
447+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1beta1", "deployments"}, "scale", schema.GroupVersionKind{"apps", "v1beta1", "Scale"})
448+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1alpha1", "deployments"}, "scale", schema.GroupVersionKind{"apps", "v1alpha1", "Scale"})
449+
450+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1", "statefulset"}, "", schema.GroupVersionKind{"apps", "v1", "StatefulSet"})
451+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1beta1", "statefulset"}, "", schema.GroupVersionKind{"apps", "v1beta1", "StatefulSet"})
452+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1beta2", "statefulset"}, "", schema.GroupVersionKind{"apps", "v1beta2", "StatefulSet"})
453+
454+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1", "statefulset"}, "scale", schema.GroupVersionKind{"apps", "v1", "Scale"})
455+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1beta1", "statefulset"}, "scale", schema.GroupVersionKind{"apps", "v1beta1", "Scale"})
456+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1alpha2", "statefulset"}, "scale", schema.GroupVersionKind{"apps", "v1beta2", "Scale"})
457+
458+
wb := &v1.ValidatingWebhook{
459+
MatchPolicy: &equivalentMatch,
460+
NamespaceSelector: &metav1.LabelSelector{MatchLabels: map[string]string{"a": "b"}},
461+
ObjectSelector: &metav1.LabelSelector{},
462+
Rules: []v1.RuleWithOperations{},
463+
}
464+
465+
for i := 0; i < 100; i++ {
466+
rule := v1.RuleWithOperations{
467+
Operations: []v1.OperationType{"*"},
468+
Rule: v1.Rule{
469+
APIGroups: []string{fmt.Sprintf("app-%d", i)},
470+
APIVersions: []string{fmt.Sprintf("v%d", i)},
471+
Resources: []string{fmt.Sprintf("resource%d", i), fmt.Sprintf("resource%d/scale", i)},
472+
Scope: &allScopes,
473+
},
474+
}
475+
wb.Rules = append(wb.Rules, rule)
476+
}
477+
478+
wbAccessor := webhook.NewValidatingWebhookAccessor("webhook", "webhook-cfg", wb)
479+
attrs := admission.NewAttributesRecord(nil, nil, schema.GroupVersionKind{"autoscaling", "v1", "Scale"}, "ns", "name", schema.GroupVersionResource{"apps", "v1", "deployments"}, "scale", admission.Create, &metav1.CreateOptions{}, false, nil)
480+
interfaces := &admission.RuntimeObjectInterfaces{EquivalentResourceMapper: mapper}
481+
a := &Webhook{namespaceMatcher: &namespace.Matcher{NamespaceLister: namespaceLister}, objectMatcher: &object.Matcher{}}
482+
483+
for i := 0; i < b.N; i++ {
484+
a.ShouldCallHook(wbAccessor, attrs, interfaces)
485+
}
486+
}
487+
488+
func BenchmarkShouldCallHookWithComplexSelectorAndRule(b *testing.B) {
489+
allScopes := v1.AllScopes
490+
equivalentMatch := v1.Equivalent
491+
492+
namespace1Labels := map[string]string{"ns": "ns1"}
493+
namespace1 := corev1.Namespace{
494+
ObjectMeta: metav1.ObjectMeta{
495+
Name: "ns1",
496+
Labels: namespace1Labels,
497+
},
498+
}
499+
namespaceLister := fakeNamespaceLister{map[string]*corev1.Namespace{"ns": &namespace1}}
500+
501+
mapper := runtime.NewEquivalentResourceRegistryWithIdentity(func(resource schema.GroupResource) string {
502+
if resource.Resource == "deployments" {
503+
// co-locate deployments in all API groups
504+
return "/deployments"
505+
}
506+
return ""
507+
})
508+
mapper.RegisterKindFor(schema.GroupVersionResource{"extensions", "v1beta1", "deployments"}, "", schema.GroupVersionKind{"extensions", "v1beta1", "Deployment"})
509+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1", "deployments"}, "", schema.GroupVersionKind{"apps", "v1", "Deployment"})
510+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1beta1", "deployments"}, "", schema.GroupVersionKind{"apps", "v1beta1", "Deployment"})
511+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1alpha1", "deployments"}, "", schema.GroupVersionKind{"apps", "v1alpha1", "Deployment"})
512+
513+
mapper.RegisterKindFor(schema.GroupVersionResource{"extensions", "v1beta1", "deployments"}, "scale", schema.GroupVersionKind{"extensions", "v1beta1", "Scale"})
514+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1", "deployments"}, "scale", schema.GroupVersionKind{"autoscaling", "v1", "Scale"})
515+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1beta1", "deployments"}, "scale", schema.GroupVersionKind{"apps", "v1beta1", "Scale"})
516+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1alpha1", "deployments"}, "scale", schema.GroupVersionKind{"apps", "v1alpha1", "Scale"})
517+
518+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1", "statefulset"}, "", schema.GroupVersionKind{"apps", "v1", "StatefulSet"})
519+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1beta1", "statefulset"}, "", schema.GroupVersionKind{"apps", "v1beta1", "StatefulSet"})
520+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1beta2", "statefulset"}, "", schema.GroupVersionKind{"apps", "v1beta2", "StatefulSet"})
521+
522+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1", "statefulset"}, "scale", schema.GroupVersionKind{"apps", "v1", "Scale"})
523+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1beta1", "statefulset"}, "scale", schema.GroupVersionKind{"apps", "v1beta1", "Scale"})
524+
mapper.RegisterKindFor(schema.GroupVersionResource{"apps", "v1alpha2", "statefulset"}, "scale", schema.GroupVersionKind{"apps", "v1beta2", "Scale"})
525+
526+
nsSelector := make(map[string]string)
527+
for i := 0; i < 100; i++ {
528+
nsSelector[fmt.Sprintf("key-%d", i)] = fmt.Sprintf("val-%d", i)
529+
}
530+
531+
wb := &v1.ValidatingWebhook{
532+
MatchPolicy: &equivalentMatch,
533+
NamespaceSelector: &metav1.LabelSelector{MatchLabels: nsSelector},
534+
ObjectSelector: &metav1.LabelSelector{},
535+
Rules: []v1.RuleWithOperations{},
536+
}
537+
538+
for i := 0; i < 100; i++ {
539+
rule := v1.RuleWithOperations{
540+
Operations: []v1.OperationType{"*"},
541+
Rule: v1.Rule{
542+
APIGroups: []string{fmt.Sprintf("app-%d", i)},
543+
APIVersions: []string{fmt.Sprintf("v%d", i)},
544+
Resources: []string{fmt.Sprintf("resource%d", i), fmt.Sprintf("resource%d/scale", i)},
545+
Scope: &allScopes,
546+
},
547+
}
548+
wb.Rules = append(wb.Rules, rule)
549+
}
550+
551+
wbAccessor := webhook.NewValidatingWebhookAccessor("webhook", "webhook-cfg", wb)
552+
attrs := admission.NewAttributesRecord(nil, nil, schema.GroupVersionKind{"autoscaling", "v1", "Scale"}, "ns", "name", schema.GroupVersionResource{"apps", "v1", "deployments"}, "scale", admission.Create, &metav1.CreateOptions{}, false, nil)
553+
interfaces := &admission.RuntimeObjectInterfaces{EquivalentResourceMapper: mapper}
554+
a := &Webhook{namespaceMatcher: &namespace.Matcher{NamespaceLister: namespaceLister}, objectMatcher: &object.Matcher{}}
555+
556+
for i := 0; i < b.N; i++ {
557+
a.ShouldCallHook(wbAccessor, attrs, interfaces)
558+
}
559+
}

0 commit comments

Comments
 (0)