From 5a9206abe937049445b2851a7db438fd8fd7ac95 Mon Sep 17 00:00:00 2001 From: MicahSee Date: Fri, 15 Nov 2024 22:21:15 +0000 Subject: [PATCH 1/2] Signed-off-by: MicahSee Edited file to use global instance of logger instead of creating a new one --- controller/proxy-injector/webhook.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/controller/proxy-injector/webhook.go b/controller/proxy-injector/webhook.go index 5c757c5339b16..aa3e4a22b8764 100644 --- a/controller/proxy-injector/webhook.go +++ b/controller/proxy-injector/webhook.go @@ -12,7 +12,7 @@ import ( "github.com/linkerd/linkerd2/pkg/inject" pkgK8s "github.com/linkerd/linkerd2/pkg/k8s" "github.com/linkerd/linkerd2/pkg/version" - "github.com/sirupsen/logrus" + log "github.com/sirupsen/logrus" admissionv1beta1 "k8s.io/api/admission/v1beta1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -25,7 +25,6 @@ const ( eventTypeInjected = "Injected" ) -var log = logrus.New() // Inject returns the function that produces an AdmissionResponse containing // the patch, if any, to apply to the pod (proxy sidecar and eventually the From 8bd45fd3d6d4a793e271e5b1d8cb14bc26089311 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Mon, 18 Nov 2024 16:44:30 +0000 Subject: [PATCH 2/2] fix: formatting --- controller/proxy-injector/webhook.go | 1 - 1 file changed, 1 deletion(-) diff --git a/controller/proxy-injector/webhook.go b/controller/proxy-injector/webhook.go index aa3e4a22b8764..0572759c54e46 100644 --- a/controller/proxy-injector/webhook.go +++ b/controller/proxy-injector/webhook.go @@ -25,7 +25,6 @@ const ( eventTypeInjected = "Injected" ) - // Inject returns the function that produces an AdmissionResponse containing // the patch, if any, to apply to the pod (proxy sidecar and eventually the // init container to set it up)