util: moved GetNodeLabels() under internal/util/k8s

Signed-off-by: Praveen M <m.praveen@ibm.com>

internal/util/k8s/client.go

@@ -25,8 +25,14 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 )
 
+var kubeclient *kubernetes.Clientset
+
 // NewK8sClient create kubernetes client.
 func NewK8sClient() (*kubernetes.Clientset, error) {
+	if kubeclient != nil {
+		return kubeclient, nil
+	}
+
 	var cfg *rest.Config
 	var err error
 	cPath := os.Getenv("KUBERNETES_CONFIG_PATH")
@@ -46,5 +52,7 @@ func NewK8sClient() (*kubernetes.Clientset, error) {
 		return nil, fmt.Errorf("failed to create client: %w", err)
 	}
 
+	kubeclient = client
+
 	return client, nil
 }

internal/util/k8s/node.go

@@ -0,0 +1,39 @@
+/*
+Copyright 2023 The CephCSI Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package k8s
+
+import (
+	"context"
+	"fmt"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func GetNodeLabels(nodeName string) (map[string]string, error) {
+	client, err := NewK8sClient()
+	if err != nil {
+		return nil, fmt.Errorf("can not get node %q information, failed "+
+			"to connect to Kubernetes: %w", nodeName, err)
+	}
+
+	node, err := client.CoreV1().Nodes().Get(context.TODO(), nodeName, metav1.GetOptions{})
+	if err != nil {
+		return nil, fmt.Errorf("failed to get node %q information: %w", nodeName, err)
+	}
+
+	return node.GetLabels(), nil
+}

internal/util/topology.go

@@ -17,16 +17,14 @@ limitations under the License.
 package util
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"strings"
 
+	"github.com/container-storage-interface/spec/lib/go/csi"
+
 	"github.com/ceph/ceph-csi/internal/util/k8s"
 	"github.com/ceph/ceph-csi/internal/util/log"
-
-	"github.com/container-storage-interface/spec/lib/go/csi"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 const (
@@ -34,21 +32,6 @@ const (
 	labelSeparator string = ","
 )
 
-func k8sGetNodeLabels(nodeName string) (map[string]string, error) {
-	client, err := k8s.NewK8sClient()
-	if err != nil {
-		return nil, fmt.Errorf("can not get node %q information, failed "+
-			"to connect to Kubernetes: %w", nodeName, err)
-	}
-
-	node, err := client.CoreV1().Nodes().Get(context.TODO(), nodeName, metav1.GetOptions{})
-	if err != nil {
-		return nil, fmt.Errorf("failed to get node %q information: %w", nodeName, err)
-	}
-
-	return node.GetLabels(), nil
-}
-
 // GetTopologyFromDomainLabels returns the CSI topology map, determined from
 // the domain labels and their values from the CO system
 // Expects domainLabels in arg to be in the format "[prefix/]<name>,[prefix/]<name>,...",.
@@ -82,7 +65,7 @@ func GetTopologyFromDomainLabels(domainLabels, nodeName, driverName string) (map
 		labelCount++
 	}
 
-	nodeLabels, err := k8sGetNodeLabels(nodeName)
+	nodeLabels, err := k8s.GetNodeLabels(nodeName)
 	if err != nil {
 		return nil, err
 	}