From ab8d077384a353069610fb42a76b5584f8ec356b Mon Sep 17 00:00:00 2001 From: Vyankatesh Kudtarkar Date: Thu, 22 Apr 2021 01:05:13 +0530 Subject: [PATCH] Fix Dev setup (#1815) Co-authored-by: vyankatesh --- cmd/kyverno/main.go | 4 ++-- pkg/webhookconfig/registration.go | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cmd/kyverno/main.go b/cmd/kyverno/main.go index 80044f50051c..c54a1480b14c 100755 --- a/cmd/kyverno/main.go +++ b/cmd/kyverno/main.go @@ -138,13 +138,14 @@ func main() { if err != nil { setupLog.Error(err, "ConfigMap lookup disabled: failed to create resource cache") } - + debug := serverIP != "" webhookCfg := webhookconfig.NewRegister( clientConfig, client, rCache, serverIP, int32(webhookTimeout), + debug, log.Log) // Resource Mutating Webhook Watcher @@ -334,7 +335,6 @@ func main() { // -- annotations on resources with update details on mutation JSON patches // -- generate policy violation resource // -- generate events on policy and resource - debug := serverIP != "" server, err := webhooks.NewWebhookServer( pclient, client, diff --git a/pkg/webhookconfig/registration.go b/pkg/webhookconfig/registration.go index 208ac9a9eea7..b6c57234c7a6 100644 --- a/pkg/webhookconfig/registration.go +++ b/pkg/webhookconfig/registration.go @@ -39,6 +39,7 @@ type Register struct { serverIP string // when running outside a cluster timeoutSeconds int32 log logr.Logger + debug bool } // NewRegister creates new Register instance @@ -48,6 +49,7 @@ func NewRegister( resCache resourcecache.ResourceCache, serverIP string, webhookTimeout int32, + debug bool, log logr.Logger) *Register { return &Register{ clientConfig: clientConfig, @@ -56,6 +58,7 @@ func NewRegister( serverIP: serverIP, timeoutSeconds: webhookTimeout, log: log.WithName("Register"), + debug: debug, } } @@ -65,10 +68,11 @@ func (wrc *Register) Register() error { if wrc.serverIP != "" { logger.Info("Registering webhook", "url", fmt.Sprintf("https://%s", wrc.serverIP)) } - if err := wrc.checkEndpoint(); err != nil { - return err + if !wrc.debug { + if err := wrc.checkEndpoint(); err != nil { + return err + } } - wrc.removeWebhookConfigurations() caData := wrc.readCaData()