🐛 fix webhook injector #316
Conversation
k8s-ci-robot
added
the
cncf-cla: yes
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: mengqiy If they are not already assigned, you can assign the PR to them by writing The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
size/M
|
cc: @kdada |
|
can you provide a bit more detail in the PR description/commit message? Otherwise LGTM |
mengqiy
force-pushed
the
fixinjectorforwebhook
branch
from
aa84331
to
859819e
Compare
Done. Updated both. |
pkg/webhook/server.go
Outdated
| @@ -181,6 +180,11 @@ func (s *Server) Register(webhooks ...Webhook) error { | |||
| } | |||
| s.registry[webhook.GetPath()] = webhooks[i] | |||
| s.sMux.Handle(webhook.GetPath(), webhook.Handler()) | |||
|
|
|||
| // Inject dependencies into each webhook | |||
| if err := s.manager.SetFields(webhooks[i]); err != nil { | |||
There was a problem hiding this comment.
Interesting... Won't manager call SetField on webhook server and that should call the inject field for each of the webhooks ? because manager knows when all the deps are resolved ?
There was a problem hiding this comment.
yeah, this should be receiving an injectfunc, which it should be using to inject things, as opposed to having a reference to the manager.
mengqiy
force-pushed
the
fixinjectorforwebhook
branch
from
859819e
to
c5c7205
Compare
k8s-ci-robot
added
size/XXL
mengqiy
force-pushed
the
fixinjectorforwebhook
branch
from
c5c7205
to
47a7b28
Compare
…face for webhooks
mengqiy
force-pushed
the
fixinjectorforwebhook
branch
from
47a7b28
to
a4ef929
Compare
|
The first 2 commits are from #300. |
| Mutating(). | ||
| Operations(admissionregistrationv1beta1.Create, admissionregistrationv1beta1.Update). | ||
| WithManager(mgr). | ||
| ForType(&corev1.Pod{}). | ||
| Handlers(&podAnnotator{}). | ||
| Build() |
There was a problem hiding this comment.
This looks a lot simpler now :)
drop server name and client fix injector
|
Closing since the commit will be in #300. |
fixes #309
Based on #300.
use
mgr.SetFields()for webhook server and implementInjectorinterface for webhooks.