From 753940e964dac97c25bf3ed68a4854382cfeccf0 Mon Sep 17 00:00:00 2001
From: Keisuke Ishigami <k.130.email@gmail.com>
Date: Thu, 21 Nov 2024 00:58:27 +0900
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=9D=20output=20log=20when=20server=20s?=
 =?UTF-8?q?hutdown=20is=20failed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Kubernetes-commit: dd1300df98682f524a2f028e3b296b3e8783a711
---
 pkg/server/secure_serving.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkg/server/secure_serving.go b/pkg/server/secure_serving.go
index 0a4fdc693..21225d2a8 100644
--- a/pkg/server/secure_serving.go
+++ b/pkg/server/secure_serving.go
@@ -236,8 +236,11 @@ func RunServer(
 		defer close(serverShutdownCh)
 		<-stopCh
 		ctx, cancel := context.WithTimeout(context.Background(), shutDownTimeout)
-		server.Shutdown(ctx)
-		cancel()
+		defer cancel()
+		err := server.Shutdown(ctx)
+		if err != nil {
+			klog.Errorf("Failed to shutdown server: %v", err)
+		}
 	}()
 
 	go func() {