Skip to content

Commit 0369112

Browse files
zanebzaneb
committed
Get rid of SetupWebhookWithManager functions
These functions offer almost no abstraction whatsoever.
1 parent 8a7edfb commit 0369112

5 files changed

Lines changed: 6 additions & 25 deletions

File tree

‎apis/go.mod‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ require (
2424
github.com/go-openapi/jsonreference v0.20.0 // indirect
2525
github.com/go-openapi/swag v0.19.14 // indirect
2626
github.com/gogo/protobuf v1.3.2 // indirect
27-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2827
github.com/golang/protobuf v1.5.2 // indirect
2928
github.com/google/gnostic v0.5.7-v3refs // indirect
3029
github.com/google/go-cmp v0.5.9 // indirect
@@ -42,7 +41,6 @@ require (
4241
github.com/prometheus/client_model v0.3.0 // indirect
4342
github.com/prometheus/common v0.37.0 // indirect
4443
github.com/prometheus/procfs v0.8.0 // indirect
45-
github.com/spf13/pflag v1.0.5 // indirect
4644
golang.org/x/net v0.7.0 // indirect
4745
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
4846
golang.org/x/sys v0.5.0 // indirect
@@ -55,9 +53,7 @@ require (
5553
gopkg.in/inf.v0 v0.9.1 // indirect
5654
gopkg.in/yaml.v2 v2.4.0 // indirect
5755
gopkg.in/yaml.v3 v3.0.1 // indirect
58-
k8s.io/apiextensions-apiserver v0.26.1 // indirect
5956
k8s.io/client-go v0.26.1 // indirect
60-
k8s.io/component-base v0.26.1 // indirect
6157
k8s.io/klog/v2 v2.80.1 // indirect
6258
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
6359
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect

‎apis/go.sum‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4er
100100
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
101101
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
102102
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
103-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
104103
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
105104
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
106105
github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
@@ -245,7 +244,6 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
245244
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
246245
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
247246
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
248-
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
249247
github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
250248
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
251249
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -268,7 +266,6 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
268266
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
269267
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
270268
go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
271-
go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
272269
go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
273270
go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
274271
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -578,13 +575,11 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
578575
k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ=
579576
k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg=
580577
k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI=
581-
k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM=
582578
k8s.io/apimachinery v0.26.1 h1:8EZ/eGJL+hY/MYCNwhmDzVqq2lPl3N3Bo8rvweJwXUQ=
583579
k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
584580
k8s.io/client-go v0.26.1 h1:87CXzYJnAMGaa/IDDfRdhTzxk/wzGZ+/HUQpqgVSZXU=
585581
k8s.io/client-go v0.26.1/go.mod h1:IWNSglg+rQ3OcvDkhY6+QLeasV4OYHDjdqeWkDQZwGE=
586582
k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4=
587-
k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU=
588583
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
589584
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
590585
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=

‎apis/metal3.io/v1alpha1/baremetalhost_webhook.go‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,13 @@ import (
1818
"k8s.io/apimachinery/pkg/util/errors"
1919

2020
"k8s.io/apimachinery/pkg/runtime"
21-
ctrl "sigs.k8s.io/controller-runtime"
2221
logf "sigs.k8s.io/controller-runtime/pkg/log"
2322
"sigs.k8s.io/controller-runtime/pkg/webhook"
2423
)
2524

2625
// log is for logging in this package.
2726
var baremetalhostlog = logf.Log.WithName("baremetalhost-resource")
2827

29-
func (r *BareMetalHost) SetupWebhookWithManager(mgr ctrl.Manager) error {
30-
return ctrl.NewWebhookManagedBy(mgr).
31-
For(r).
32-
Complete()
33-
}
34-
3528
//+kubebuilder:webhook:verbs=create;update,path=/validate-metal3-io-v1alpha1-baremetalhost,mutating=false,failurePolicy=fail,sideEffects=none,admissionReviewVersions=v1;v1beta,groups=metal3.io,resources=baremetalhosts,versions=v1alpha1,name=baremetalhost.metal3.io
3629

3730
var _ webhook.Validator = &BareMetalHost{}

‎apis/metal3.io/v1alpha1/bmceventsubscription_webhook.go‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,13 @@ import (
1818
"k8s.io/apimachinery/pkg/util/errors"
1919

2020
"k8s.io/apimachinery/pkg/runtime"
21-
ctrl "sigs.k8s.io/controller-runtime"
2221
logf "sigs.k8s.io/controller-runtime/pkg/log"
2322
"sigs.k8s.io/controller-runtime/pkg/webhook"
2423
)
2524

2625
// bmcsubscriptionlog is for logging in this package.
2726
var bmcsubscriptionlog = logf.Log.WithName("bmceventsubscription-resource")
2827

29-
func (s *BMCEventSubscription) SetupWebhookWithManager(mgr ctrl.Manager) error {
30-
return ctrl.NewWebhookManagedBy(mgr).
31-
For(s).
32-
Complete()
33-
}
34-
3528
//+kubebuilder:webhook:verbs=create;update,path=/validate-metal3-io-v1alpha1-bmceventsubscription,mutating=false,failurePolicy=fail,sideEffects=none,admissionReviewVersions=v1;v1beta,groups=metal3.io,resources=bmceventsubscriptions,versions=v1alpha1,name=bmceventsubscription.metal3.io
3629

3730
var _ webhook.Validator = &BMCEventSubscription{}

‎main.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,16 @@ func setupChecks(mgr ctrl.Manager) {
7575
}
7676

7777
func setupWebhooks(mgr ctrl.Manager) {
78-
if err := (&metal3iov1alpha1.BareMetalHost{}).SetupWebhookWithManager(mgr); err != nil {
78+
if err := ctrl.NewWebhookManagedBy(mgr).
79+
For(&metal3iov1alpha1.BareMetalHost{}).
80+
Complete(); err != nil {
7981
setupLog.Error(err, "unable to create webhook", "webhook", "BareMetalHost")
8082
os.Exit(1)
8183
}
8284

83-
if err := (&metal3iov1alpha1.BMCEventSubscription{}).SetupWebhookWithManager(mgr); err != nil {
85+
if err := ctrl.NewWebhookManagedBy(mgr).
86+
For(&metal3iov1alpha1.BMCEventSubscription{}).
87+
Complete(); err != nil {
8488
setupLog.Error(err, "unable to create webhook", "webhook", "BMCEventSubscription")
8589
os.Exit(1)
8690
}

0 commit comments

Comments
 (0)