From 66543493b5ddca41696c015c5217dfcad10668e1 Mon Sep 17 00:00:00 2001
From: mmetc <92726601+mmetc@users.noreply.github.com>
Date: Mon, 28 Nov 2022 11:55:08 +0100
Subject: [PATCH] fix nil dereference: check that httpServer is set before
 shutting down (#1893)

---
 pkg/apiserver/apiserver.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go
index 68a91e518..e020d3ed0 100644
--- a/pkg/apiserver/apiserver.go
+++ b/pkg/apiserver/apiserver.go
@@ -349,8 +349,10 @@ func (s *APIServer) Close() {
 
 func (s *APIServer) Shutdown() error {
 	s.Close()
-	if err := s.httpServer.Shutdown(context.TODO()); err != nil {
-		return err
+	if s.httpServer != nil {
+		if err := s.httpServer.Shutdown(context.TODO()); err != nil {
+			return err
+		}
 	}
 
 	//close io.writer logger given to gin