Set RecoverPanic to true for webhooks

gardener · Sep 13, 2022 · ad6e673 · ad6e673
1 parent e0351eb
commit ad6e673
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 7 deletions.
diff --git a/extensions/pkg/webhook/cloudprovider/cloudprovider.go b/extensions/pkg/webhook/cloudprovider/cloudprovider.go
@@ -57,7 +57,7 @@ func New(mgr manager.Manager, args Args) (*extensionswebhook.Webhook, error) {
 		Target:   extensionswebhook.TargetSeed,
 		Provider: args.Provider,
 		Types:    types,
-		Webhook:  &admission.Webhook{Handler: handler},
+		Webhook:  &admission.Webhook{Handler: handler, RecoverPanic: true},
 		Path:     WebhookName,
 		Selector: namespaceSelector,
 	}

diff --git a/extensions/pkg/webhook/controlplane/controlplane.go b/extensions/pkg/webhook/controlplane/controlplane.go
@@ -81,7 +81,7 @@ func New(mgr manager.Manager, args Args) (*extensionswebhook.Webhook, error) {
 		Types:    args.Types,
 		Target:   extensionswebhook.TargetSeed,
 		Path:     getName(args.Kind),
-		Webhook:  &admission.Webhook{Handler: handler},
+		Webhook:  &admission.Webhook{Handler: handler, RecoverPanic: true},
 		Selector: namespaceSelector,
 	}, nil
 }

diff --git a/extensions/pkg/webhook/handler_shootclient.go b/extensions/pkg/webhook/handler_shootclient.go
@@ -52,6 +52,7 @@ func NewHandlerWithShootClient(mgr manager.Manager, types []Type, mutator Mutato
 				mutator:  mutator,
 				logger:   logger.WithName("handlerShootClient"),
 			},
+			RecoverPanic: true,
 		},
 	}, nil
 }

diff --git a/extensions/pkg/webhook/network/network.go b/extensions/pkg/webhook/network/network.go
@@ -73,7 +73,7 @@ func New(mgr manager.Manager, args Args) (*webhook.Webhook, error) {
 		Types:    args.Types,
 		Target:   extensionswebhook.TargetSeed,
 		Path:     path,
-		Webhook:  &admission.Webhook{Handler: handler},
+		Webhook:  &admission.Webhook{Handler: handler, RecoverPanic: true},
 		Selector: namespaceSelector,
 	}, nil
 

diff --git a/extensions/pkg/webhook/shoot/shoot.go b/extensions/pkg/webhook/shoot/shoot.go
@@ -70,7 +70,7 @@ func New(mgr manager.Manager, args Args) (*extensionswebhook.Webhook, error) {
 			return nil, err
 		}
 
-		wh.Webhook = &admission.Webhook{Handler: handler}
+		wh.Webhook = &admission.Webhook{Handler: handler, RecoverPanic: true}
 		return wh, nil
 
 	case args.MutatorWithShootClient != nil:

diff --git a/extensions/pkg/webhook/webhook.go b/extensions/pkg/webhook/webhook.go
@@ -91,6 +91,6 @@ func New(mgr manager.Manager, args Args) (*Webhook, error) {
 
 	return &Webhook{
 		Path:    args.Path,
-		Webhook: &admission.Webhook{Handler: handler},
+		Webhook: &admission.Webhook{Handler: handler, RecoverPanic: true},
 	}, nil
 }
diff --git a/pkg/provider-local/webhook/dnsconfig/add.go b/pkg/provider-local/webhook/dnsconfig/add.go
@@ -68,7 +68,7 @@ func AddToManagerWithOptions(mgr manager.Manager, _ AddOptions) (*extensionswebh
 		Types:    types,
 		Target:   extensionswebhook.TargetSeed,
 		Path:     name,
-		Webhook:  &admission.Webhook{Handler: handler},
+		Webhook:  &admission.Webhook{Handler: handler, RecoverPanic: true},
 		ObjectSelector: &metav1.LabelSelector{MatchExpressions: []metav1.LabelSelectorRequirement{
 			{Key: "app", Operator: metav1.LabelSelectorOpIn, Values: []string{
 				"machine",

diff --git a/pkg/provider-local/webhook/node/add.go b/pkg/provider-local/webhook/node/add.go
@@ -76,7 +76,7 @@ func AddToManagerWithOptions(
 		Types:          types,
 		Target:         target,
 		Path:           name,
-		Webhook:        &admission.Webhook{Handler: handler},
+		Webhook:        &admission.Webhook{Handler: handler, RecoverPanic: true},
 		FailurePolicy:  &failurePolicy,
 		TimeoutSeconds: pointer.Int32(5),
 	}, nil