File tree Expand file tree Collapse file tree 4 files changed +0
-15
lines changed Expand file tree Collapse file tree 4 files changed +0
-15
lines changed Original file line number Diff line number Diff line change @@ -38,7 +38,6 @@ import (
3838 "sigs.k8s.io/controller-runtime/pkg/cache"
3939 "sigs.k8s.io/controller-runtime/pkg/client"
4040 "sigs.k8s.io/controller-runtime/pkg/client/config"
41- controllerconfig "sigs.k8s.io/controller-runtime/pkg/config"
4241 "sigs.k8s.io/controller-runtime/pkg/log/zap"
4342 "sigs.k8s.io/controller-runtime/pkg/manager"
4443 "sigs.k8s.io/controller-runtime/pkg/metrics/filters"
@@ -117,9 +116,6 @@ func (o *options) complete() error {
117116 Scheme : scheme ,
118117 // allows us to quickly handover leadership on restarts
119118 LeaderElectionReleaseOnCancel : true ,
120- Controller : controllerconfig.Controller {
121- RecoverPanic : ptr .To (true ),
122- },
123119 }
124120 o .applyConfigToManagerOptions ()
125121 o .applyCacheOptions ()
Original file line number Diff line number Diff line change @@ -52,7 +52,6 @@ func (h *Handler) AddToManager(mgr manager.Manager) error {
5252 mgr .GetWebhookServer ().Register (WebhookPathPrefix , & admission.Webhook {
5353 Handler : h ,
5454 WithContextFunc : NewContextWithRequestPath ,
55- RecoverPanic : true ,
5655 })
5756 return nil
5857}
Original file line number Diff line number Diff line change @@ -31,9 +31,7 @@ import (
3131 utilruntime "k8s.io/apimachinery/pkg/util/runtime"
3232 clientgoscheme "k8s.io/client-go/kubernetes/scheme"
3333 "k8s.io/klog/v2"
34- "k8s.io/utils/ptr"
3534 ctrl "sigs.k8s.io/controller-runtime"
36- "sigs.k8s.io/controller-runtime/pkg/config"
3735 "sigs.k8s.io/controller-runtime/pkg/healthz"
3836 "sigs.k8s.io/controller-runtime/pkg/log/zap"
3937 "sigs.k8s.io/controller-runtime/pkg/manager"
@@ -106,10 +104,6 @@ func main() {
106104 },
107105 // disable leader election
108106 LeaderElection : false ,
109-
110- Controller : config.Controller {
111- RecoverPanic : ptr .To (true ),
112- },
113107 })
114108 if err != nil {
115109 return err
Original file line number Diff line number Diff line change @@ -42,7 +42,6 @@ import (
4242 ctrl "sigs.k8s.io/controller-runtime"
4343 "sigs.k8s.io/controller-runtime/pkg/cache"
4444 "sigs.k8s.io/controller-runtime/pkg/client"
45- "sigs.k8s.io/controller-runtime/pkg/config"
4645 "sigs.k8s.io/controller-runtime/pkg/healthz"
4746 "sigs.k8s.io/controller-runtime/pkg/log/zap"
4847 "sigs.k8s.io/controller-runtime/pkg/metrics"
@@ -194,9 +193,6 @@ func (o *options) Complete() error {
194193 Cache : cache.Options {
195194 DefaultTransform : dropUnwantedMetadata ,
196195 },
197- Controller : config.Controller {
198- RecoverPanic : ptr .To (true ),
199- },
200196 }
201197
202198 o .applyConfigToRESTConfig ()
You can’t perform that action at this time.
0 commit comments