From 79f21dcaa87516d7bc638fb62baca8895b3db89d Mon Sep 17 00:00:00 2001
From: Sean Sullivan <seans3@gmail.com>
Date: Sat, 2 Mar 2024 16:10:39 -0800
Subject: [PATCH] removes extra upgrade aware proxy logging; returns tunneling
 connection close error

Kubernetes-commit: e8bbb221d36f1adf4116752990c0c4f17a9e5deb
---
 tools/portforward/tunneling_connection.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/portforward/tunneling_connection.go b/tools/portforward/tunneling_connection.go
index 4c04531b..a9c9b18f 100644
--- a/tools/portforward/tunneling_connection.go
+++ b/tools/portforward/tunneling_connection.go
@@ -114,8 +114,13 @@ func (c *TunnelingConnection) Close() error {
 		klog.V(7).Infof("%s: tunneling connection Close()...", c.name)
 		// Signal other endpoint that websocket connection is closing; ignore error.
 		normalCloseMsg := gwebsocket.FormatCloseMessage(gwebsocket.CloseNormalClosure, "")
-		c.conn.WriteControl(gwebsocket.CloseMessage, normalCloseMsg, time.Now().Add(time.Second)) //nolint:errcheck
-		err = c.conn.Close()
+		writeControlErr := c.conn.WriteControl(gwebsocket.CloseMessage, normalCloseMsg, time.Now().Add(time.Second))
+		closeErr := c.conn.Close()
+		if closeErr != nil {
+			err = closeErr
+		} else if writeControlErr != nil {
+			err = writeControlErr
+		}
 	})
 	return err
 }