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

Merge pull request #79659 from liggitt/test-webhook-watch-cache

Browse Source 
Test webhooks with and without watch cache enabled
This commit is contained in:
Kubernetes Prow Robot 2019-08-07 07:02:50 -07:00 committed by GitHub
commit 28e88e3f19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -386,8 +386,18 @@ func (h *holder) verifyOptions(options runtime.Object) error {
return nil return nil
} }
// TestWebhookAdmission tests communication between API server and webhook process. // TestWebhookAdmissionWithWatchCache tests communication between API server and webhook process.
func TestWebhookAdmission(t *testing.T) { func TestWebhookAdmissionWithWatchCache(t *testing.T) {
testWebhookAdmission(t, true)
}
// TestWebhookAdmissionWithoutWatchCache tests communication between API server and webhook process.
func TestWebhookAdmissionWithoutWatchCache(t *testing.T) {
testWebhookAdmission(t, false)
}
// testWebhookAdmission tests communication between API server and webhook process.
func testWebhookAdmission(t *testing.T, watchCache bool) {
// holder communicates expectations to webhooks, and results from webhooks // holder communicates expectations to webhooks, and results from webhooks
holder := &holder{ holder := &holder{
t: t, t: t,
@ -428,6 +438,7 @@ func TestWebhookAdmission(t *testing.T) {
// start API server // start API server
etcdConfig := framework.SharedEtcd() etcdConfig := framework.SharedEtcd()
server := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{ server := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{
fmt.Sprintf("--watch-cache=%v", watchCache),
// turn off admission plugins that add finalizers // turn off admission plugins that add finalizers
"--disable-admission-plugins=ServiceAccount,StorageObjectInUseProtection", "--disable-admission-plugins=ServiceAccount,StorageObjectInUseProtection",
// force enable all resources so we can check storage. // force enable all resources so we can check storage.

15
test/integration/apiserver/admissionwebhook/reinvocation_test.go
View File

@ -49,8 +49,18 @@ const (
testReinvocationClientUsername = "webhook-reinvocation-integration-client" testReinvocationClientUsername = "webhook-reinvocation-integration-client"
) )
// TestWebhookReinvocationPolicy ensures that the admission webhook reinvocation policy is applied correctly. // TestWebhookReinvocationPolicyWithWatchCache ensures that the admission webhook reinvocation policy is applied correctly with the watch cache enabled.
func TestWebhookReinvocationPolicy(t *testing.T) { func TestWebhookReinvocationPolicyWithWatchCache(t *testing.T) {
testWebhookReinvocationPolicy(t, true)
}
// TestWebhookReinvocationPolicyWithoutWatchCache ensures that the admission webhook reinvocation policy is applied correctly without the watch cache enabled.
func TestWebhookReinvocationPolicyWithoutWatchCache(t *testing.T) {
testWebhookReinvocationPolicy(t, false)
}
// testWebhookReinvocationPolicy ensures that the admission webhook reinvocation policy is applied correctly.
func testWebhookReinvocationPolicy(t *testing.T, watchCache bool) {
reinvokeNever := registrationv1beta1.NeverReinvocationPolicy reinvokeNever := registrationv1beta1.NeverReinvocationPolicy
reinvokeIfNeeded := registrationv1beta1.IfNeededReinvocationPolicy reinvokeIfNeeded := registrationv1beta1.IfNeededReinvocationPolicy
@ -175,6 +185,7 @@ func TestWebhookReinvocationPolicy(t *testing.T) {
s := kubeapiservertesting.StartTestServerOrDie(t, kubeapiservertesting.NewDefaultTestServerOptions(), []string{ s := kubeapiservertesting.StartTestServerOrDie(t, kubeapiservertesting.NewDefaultTestServerOptions(), []string{
"--disable-admission-plugins=ServiceAccount", "--disable-admission-plugins=ServiceAccount",
fmt.Sprintf("--watch-cache=%v", watchCache),
}, framework.SharedEtcd()) }, framework.SharedEtcd())
defer s.TearDownFn() defer s.TearDownFn()