Skip to content

Commit

Permalink
Merge pull request #14 from bakito/main
Browse files Browse the repository at this point in the history
do not resolve gvk if override is defined
  • Loading branch information
snorwin authored Sep 28, 2021
2 parents 9869d47 + 847ec2b commit 24118bf
Showing 1 changed file with 17 additions and 15 deletions.
32 changes: 17 additions & 15 deletions pkg/webhook/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,15 @@ func (blder *Builder) createAdmissionWebhook(handler Handler) (*admission.Webhoo
}

func (blder *Builder) registerValidatingWebhook(w *admission.Webhook) error {
gvk, err := apiutil.GVKForObject(blder.apiType, blder.mgr.GetScheme())
if err != nil {
return err
}
path := blder.pathValidate
if strings.TrimSpace(path) == "" {
gvk, err := apiutil.GVKForObject(blder.apiType, blder.mgr.GetScheme())
if err != nil {
return err
}

path := generatePath(blder.pathValidate, blder.prefixValidate, gvk)
path = generatePath(blder.prefixValidate, gvk)
}
if !isAlreadyHandled(blder.mgr, path) {
blder.mgr.GetWebhookServer().Register(path, w)
}
Expand All @@ -145,12 +148,15 @@ func (blder *Builder) registerValidatingWebhook(w *admission.Webhook) error {
}

func (blder *Builder) registerMutatingWebhook(w *admission.Webhook) error {
gvk, err := apiutil.GVKForObject(blder.apiType, blder.mgr.GetScheme())
if err != nil {
return err
}
path := blder.pathMutate
if strings.TrimSpace(path) == "" {
gvk, err := apiutil.GVKForObject(blder.apiType, blder.mgr.GetScheme())
if err != nil {
return err
}

path := generatePath(blder.pathMutate, blder.prefixMutate, gvk)
path = generatePath(blder.prefixMutate, gvk)
}
if !isAlreadyHandled(blder.mgr, path) {
blder.mgr.GetWebhookServer().Register(path, w)
}
Expand All @@ -171,11 +177,7 @@ func isAlreadyHandled(mgr ctrl.Manager, path string) bool {
return false
}

func generatePath(override string, prefix string, gvk schema.GroupVersionKind) string {
if override != "" {
return override
}

func generatePath(prefix string, gvk schema.GroupVersionKind) string {
return prefix + strings.Replace(gvk.Group, ".", "-", -1) + "-" +
gvk.Version + "-" + strings.ToLower(gvk.Kind)
}

0 comments on commit 24118bf

Please sign in to comment.