Addressed review comments w.r.t controller-runtime setlogger and [nits]

Signed-off-by: Abhijit Mukherjee <abhijit.mukherjee@infracloud.io>
kanisterio · Feb 28, 2024 · b6c01d3 · b6c01d3
1 parent 22f3b9b
commit b6c01d3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/cmd/reposervercontroller/main.go b/cmd/reposervercontroller/main.go
@@ -40,7 +40,6 @@ import (
 	"github.com/kanisterio/kanister/pkg/log"
 	"github.com/kanisterio/kanister/pkg/resource"
 	"github.com/kanisterio/kanister/pkg/validatingwebhook"
-
 	//+kubebuilder:scaffold:imports
 )
 

diff --git a/pkg/blockstorage/vmware/vmware.go b/pkg/blockstorage/vmware/vmware.go
@@ -257,7 +257,6 @@ var reVslmSyncFaultFatal = regexp.MustCompile("Change tracking invalid or disk i
 func (p *FcdProvider) SnapshotCreate(ctx context.Context, volume blockstorage.Volume, tags map[string]string) (*blockstorage.Snapshot, error) {
 	var res types.AnyType
 	description := generateSnapshotDescription(tags)
-
 	err := wait.PollUntilContextTimeout(ctx, time.Second, defaultRetryLimit, false, func(innerCtx context.Context) (bool, error) {
 		timeOfCreateSnapshotCall := time.Now()
 		var createErr error

diff --git a/pkg/handler/handler.go b/pkg/handler/handler.go
@@ -19,9 +19,9 @@ import (
 	"io"
 	"net/http"
 
+	"github.com/go-logr/logr"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
@@ -65,14 +65,14 @@ func (*healthCheckHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 // RunWebhookServer starts the validating webhook resources for blueprint kanister resources
 func RunWebhookServer(c *rest.Config) error {
-	log.SetLogger(zap.New())
+	log.SetLogger(logr.New(log.NullLogSink{}))
 	mgr, err := manager.New(c, manager.Options{})
 	if err != nil {
-		return errors.Wrapf(err, "Failed to create new webhook manager")
+		return errors.Wrap(err, "Failed to create new webhook manager")
 	}
 	bpValidator := &validatingwebhook.BlueprintValidator{}
 	if err = bpValidator.InjectDecoder(admission.NewDecoder(mgr.GetScheme())); err != nil {
-		return errors.Wrapf(err, "Failed to inject decoder")
+		return errors.Wrap(err, "Failed to inject decoder")
 	}
 
 	hookServerOptions := webhook.Options{CertDir: validatingwebhook.WHCertsDir}
@@ -82,7 +82,7 @@ func RunWebhookServer(c *rest.Config) error {
 	hookServer.Register(metricsPath, promhttp.Handler())
 
 	if err := mgr.Add(hookServer); err != nil {
-		return errors.Wrapf(err, "Failed to add new webhook server")
+		return errors.Wrap(err, "Failed to add new webhook server")
 	}
 
 	if err := mgr.Start(signals.SetupSignalHandler()); err != nil {

diff --git a/pkg/validatingwebhook/blueprint_handler.go b/pkg/validatingwebhook/blueprint_handler.go
@@ -3,13 +3,13 @@ package validatingwebhook
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
 	kanister "github.com/kanisterio/kanister/pkg"
 	crv1alpha1 "github.com/kanisterio/kanister/pkg/apis/cr/v1alpha1"
 	"github.com/kanisterio/kanister/pkg/blueprint/validate"
-	"net/http"
 )
 
 type BlueprintValidator struct {