From c367a9d696b86d0a3c06853e3ffea6db0f70a19d Mon Sep 17 00:00:00 2001
From: Matt Moore <mattomata@gmail.com>
Date: Fri, 30 Jul 2021 18:05:05 -0700
Subject: [PATCH] Drop Client as it is only used in tests (#2203)

---
 webhook/admission_integration_test.go  | 5 +++--
 webhook/conversion_integration_test.go | 5 +++--
 webhook/webhook.go                     | 7 +------
 webhook/webhook_integration_test.go    | 4 ++--
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/webhook/admission_integration_test.go b/webhook/admission_integration_test.go
index d49bbf60e..e0dff8c8e 100644
--- a/webhook/admission_integration_test.go
+++ b/webhook/admission_integration_test.go
@@ -33,6 +33,7 @@ import (
 	admissionv1 "k8s.io/api/admission/v1"
 	authenticationv1 "k8s.io/api/authentication/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	kubeclient "knative.dev/pkg/client/injection/kube/client/fake"
 	"knative.dev/pkg/metrics/metricstest"
 	_ "knative.dev/pkg/metrics/testing"
 )
@@ -84,7 +85,7 @@ func TestAdmissionValidResponseForResource(t *testing.T) {
 	if pollErr != nil {
 		t.Fatal("waitForServerAvailable() =", err)
 	}
-	tlsClient, err := createSecureTLSClient(t, wh.Client, &wh.Options)
+	tlsClient, err := createSecureTLSClient(t, kubeclient.Get(ctx), &wh.Options)
 	if err != nil {
 		t.Fatal("createSecureTLSClient() =", err)
 	}
@@ -214,7 +215,7 @@ func TestAdmissionInvalidResponseForResource(t *testing.T) {
 	if pollErr != nil {
 		t.Fatal("waitForServerAvailable() =", err)
 	}
-	tlsClient, err := createSecureTLSClient(t, wh.Client, &wh.Options)
+	tlsClient, err := createSecureTLSClient(t, kubeclient.Get(ctx), &wh.Options)
 	if err != nil {
 		t.Fatal("createSecureTLSClient() =", err)
 	}
diff --git a/webhook/conversion_integration_test.go b/webhook/conversion_integration_test.go
index 278289d68..56aeb4f66 100644
--- a/webhook/conversion_integration_test.go
+++ b/webhook/conversion_integration_test.go
@@ -31,6 +31,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
+	kubeclient "knative.dev/pkg/client/injection/kube/client/fake"
 )
 
 type fixedConversionController struct {
@@ -82,7 +83,7 @@ func TestConversionValidResponse(t *testing.T) {
 	if pollErr != nil {
 		t.Fatal("waitForServerAvailable() =", err)
 	}
-	tlsClient, err := createSecureTLSClient(t, wh.Client, &wh.Options)
+	tlsClient, err := createSecureTLSClient(t, kubeclient.Get(ctx), &wh.Options)
 	if err != nil {
 		t.Fatal("createSecureTLSClient() =", err)
 	}
@@ -171,7 +172,7 @@ func TestConversionInvalidResponse(t *testing.T) {
 	if pollErr != nil {
 		t.Fatal("waitForServerAvailable() =", err)
 	}
-	tlsClient, err := createSecureTLSClient(t, wh.Client, &wh.Options)
+	tlsClient, err := createSecureTLSClient(t, kubeclient.Get(ctx), &wh.Options)
 	if err != nil {
 		t.Fatal("createSecureTLSClient() =", err)
 	}
diff --git a/webhook/webhook.go b/webhook/webhook.go
index ab54e36b5..f4e212618 100644
--- a/webhook/webhook.go
+++ b/webhook/webhook.go
@@ -26,14 +26,13 @@ import (
 	"time"
 
 	// Injection stuff
-	kubeclient "knative.dev/pkg/client/injection/kube/client"
+
 	kubeinformerfactory "knative.dev/pkg/injection/clients/namespacedkube/informers/factory"
 	"knative.dev/pkg/network/handlers"
 
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
 	admissionv1 "k8s.io/api/admission/v1"
-	"k8s.io/client-go/kubernetes"
 	corelisters "k8s.io/client-go/listers/core/v1"
 	"knative.dev/pkg/logging"
 	"knative.dev/pkg/network"
@@ -78,7 +77,6 @@ const (
 // Webhook implements the external webhook for validation of
 // resources and configuration.
 type Webhook struct {
-	Client  kubernetes.Interface
 	Options Options
 	Logger  *zap.SugaredLogger
 
@@ -106,8 +104,6 @@ func New(
 		}
 	}()
 
-	client := kubeclient.Get(ctx)
-
 	// Injection is too aggressive for this case because by simply linking this
 	// library we force consumers to have secret access.  If we require that one
 	// of the admission controllers' informers *also* require the secret
@@ -132,7 +128,6 @@ func New(
 	syncCtx, cancel := context.WithCancel(context.Background())
 
 	webhook = &Webhook{
-		Client:       client,
 		Options:      *opts,
 		secretlister: secretInformer.Lister(),
 		Logger:       logger,
diff --git a/webhook/webhook_integration_test.go b/webhook/webhook_integration_test.go
index 46561a7bc..b64a4c654 100644
--- a/webhook/webhook_integration_test.go
+++ b/webhook/webhook_integration_test.go
@@ -71,7 +71,7 @@ func TestMissingContentType(t *testing.T) {
 		t.Fatal("waitForServerAvailable() =", err)
 	}
 
-	tlsClient, err := createSecureTLSClient(t, wh.Client, &wh.Options)
+	tlsClient, err := createSecureTLSClient(t, kubeclient.Get(ctx), &wh.Options)
 	if err != nil {
 		t.Fatal("createSecureTLSClient() =", err)
 	}
@@ -125,7 +125,7 @@ func testEmptyRequestBody(t *testing.T, controller interface{}) {
 		t.Fatal("waitForServerAvailable() =", err)
 	}
 
-	tlsClient, err := createSecureTLSClient(t, wh.Client, &wh.Options)
+	tlsClient, err := createSecureTLSClient(t, kubeclient.Get(ctx), &wh.Options)
 	if err != nil {
 		t.Fatal("createSecureTLSClient() =", err)
 	}