From ea0b0e8cad57691bc764c76f2d4beb520db6ecbe Mon Sep 17 00:00:00 2001
From: Oleksandr Babiychuk <32580729+alexemc@users.noreply.github.com>
Date: Wed, 4 Sep 2024 07:44:34 -0400
Subject: [PATCH] Fixed k8s client unit test panic when running on a machine
 without kube config.

---
 k8s/client.go      | 8 ++------
 k8s/client_test.go | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/k8s/client.go b/k8s/client.go
index 31e724f1f..7ad13f2bc 100644
--- a/k8s/client.go
+++ b/k8s/client.go
@@ -14,7 +14,6 @@ package k8s
 
 import (
 	"k8s.io/apimachinery/pkg/version"
-	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/kubernetes"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 
@@ -43,14 +42,11 @@ var GetClientSetWrapper = func() (kubernetes.Interface, error) {
 
 // GetKubeAPIServerVersion returns version of the k8s/openshift cluster
 func GetKubeAPIServerVersion() (*version.Info, error) {
-	// Get a config to talk to the apiserver
-	cfg, err := config.GetConfig()
-	// Create the discoveryClient
-	discoveryClient, err := discovery.NewDiscoveryClientForConfig(cfg)
+	k8sClientSet, err := GetClientSetWrapper()
 	if err != nil {
 		return nil, err
 	}
-	sv, err := discoveryClient.ServerVersion()
+	sv, err := k8sClientSet.Discovery().ServerVersion()
 	if err != nil {
 		return nil, err
 	}
diff --git a/k8s/client_test.go b/k8s/client_test.go
index 7c2819d72..db6ebbb80 100644
--- a/k8s/client_test.go
+++ b/k8s/client_test.go
@@ -14,7 +14,6 @@ package k8s
 
 import (
 	"errors"
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -166,7 +165,8 @@ func Test_GetVersion(t *testing.T) {
 				assert.Error(t, err)
 			} else {
 				assert.NoError(t, err)
-				assert.Equal(t, out, fmt.Sprintf("%s.%s", major, minor))
+				assert.Equal(t, major, out.Major)
+				assert.Equal(t, minor, out.Minor)
 			}
 		})
 	}