Extract newHostPathType to public HostPathTypePtr utility function

Signed-off-by: Karthik Vetrivel <[email protected]>

Author: karthikvetrivel

internal/state/driver_test.go

@@ -703,7 +703,7 @@ func getSampleAdditionalConfigs() *additionalConfigs {
 				VolumeSource: corev1.VolumeSource{
 					HostPath: &corev1.HostPathVolumeSource{
 						Path: "/opt/config/test-host-path",
-						Type: newHostPathType(corev1.HostPathDirectoryOrCreate),
+						Type: utils.HostPathTypePtr(corev1.HostPathDirectoryOrCreate),
 					},
 				},
 			},
@@ -712,7 +712,7 @@ func getSampleAdditionalConfigs() *additionalConfigs {
 				VolumeSource: corev1.VolumeSource{
 					HostPath: &corev1.HostPathVolumeSource{
 						Path: "/opt/config/test-host-path-ro",
-						Type: newHostPathType(corev1.HostPathDirectoryOrCreate),
+						Type: utils.HostPathTypePtr(corev1.HostPathDirectoryOrCreate),
 					},
 				},
 			},

internal/state/driver_volumes.go

@@ -27,6 +27,7 @@ import (
 	"github.com/NVIDIA/gpu-operator/api/nvidia/v1alpha1"
 	"github.com/NVIDIA/gpu-operator/controllers/clusterinfo"
 	"github.com/NVIDIA/gpu-operator/internal/consts"
+	"github.com/NVIDIA/gpu-operator/internal/utils"
 )
 
 // RepoConfigPathMap indicates standard OS specific paths for repository configuration files
@@ -60,79 +61,72 @@ var SubscriptionPathMap = map[string]MountPathToVolumeSource{
 		"/run/secrets/etc-pki-entitlement": corev1.VolumeSource{
 			HostPath: &corev1.HostPathVolumeSource{
 				Path: "/etc/pki/entitlement",
-				Type: newHostPathType(corev1.HostPathDirectory),
+				Type: utils.HostPathTypePtr(corev1.HostPathDirectory),
 			},
 		},
 		"/run/secrets/redhat.repo": corev1.VolumeSource{
 			HostPath: &corev1.HostPathVolumeSource{
 				Path: "/etc/yum.repos.d/redhat.repo",
-				Type: newHostPathType(corev1.HostPathFile),
+				Type: utils.HostPathTypePtr(corev1.HostPathFile),
 			},
 		},
 		"/run/secrets/rhsm": corev1.VolumeSource{
 			HostPath: &corev1.HostPathVolumeSource{
 				Path: "/etc/rhsm",
-				Type: newHostPathType(corev1.HostPathDirectory),
+				Type: utils.HostPathTypePtr(corev1.HostPathDirectory),
 			},
 		},
 	},
 	"rhcos": {
 		"/run/secrets/etc-pki-entitlement": corev1.VolumeSource{
 			HostPath: &corev1.HostPathVolumeSource{
 				Path: "/etc/pki/entitlement",
-				Type: newHostPathType(corev1.HostPathDirectory),
+				Type: utils.HostPathTypePtr(corev1.HostPathDirectory),
 			},
 		},
 		"/run/secrets/redhat.repo": corev1.VolumeSource{
 			HostPath: &corev1.HostPathVolumeSource{
 				Path: "/etc/yum.repos.d/redhat.repo",
-				Type: newHostPathType(corev1.HostPathFile),
+				Type: utils.HostPathTypePtr(corev1.HostPathFile),
 			},
 		},
 		"/run/secrets/rhsm": corev1.VolumeSource{
 			HostPath: &corev1.HostPathVolumeSource{
 				Path: "/etc/rhsm",
-				Type: newHostPathType(corev1.HostPathDirectory),
+				Type: utils.HostPathTypePtr(corev1.HostPathDirectory),
 			},
 		},
 	},
 	"sles": {
 		"/etc/zypp/credentials.d": corev1.VolumeSource{
 			HostPath: &corev1.HostPathVolumeSource{
 				Path: "/etc/zypp/credentials.d",
-				Type: newHostPathType(corev1.HostPathDirectory),
+				Type: utils.HostPathTypePtr(corev1.HostPathDirectory),
 			},
 		},
 		"/etc/SUSEConnect": corev1.VolumeSource{
 			HostPath: &corev1.HostPathVolumeSource{
 				Path: "/etc/SUSEConnect",
-				Type: newHostPathType(corev1.HostPathFileOrCreate),
+				Type: utils.HostPathTypePtr(corev1.HostPathFileOrCreate),
 			},
 		},
 	},
 	"sl-micro": {
 		"/etc/zypp/credentials.d": corev1.VolumeSource{
 			HostPath: &corev1.HostPathVolumeSource{
 				Path: "/etc/zypp/credentials.d",
-				Type: newHostPathType(corev1.HostPathDirectory),
+				Type: utils.HostPathTypePtr(corev1.HostPathDirectory),
 			},
 		},
 		"/etc/SUSEConnect": corev1.VolumeSource{
 			HostPath: &corev1.HostPathVolumeSource{
 				Path: "/etc/SUSEConnect",
-				Type: newHostPathType(corev1.HostPathFileOrCreate),
+				Type: utils.HostPathTypePtr(corev1.HostPathFileOrCreate),
 			},
 		},
 	},
 }
 
-// TODO: make this a public utils method
-func newHostPathType(pathType corev1.HostPathType) *corev1.HostPathType {
-	hostPathType := new(corev1.HostPathType)
-	*hostPathType = pathType
-	return hostPathType
-}
-
 func (s *stateDriver) getDriverAdditionalConfigs(ctx context.Context, cr *v1alpha1.NVIDIADriver, info clusterinfo.Interface, pool nodePool) (*additionalConfigs, error) {
 	logger := log.FromContext(ctx, "method", "getDriverAdditionalConfigs")
 

internal/utils/utils.go

@@ -24,6 +24,7 @@ import (
 	"strings"
 
 	"github.com/davecgh/go-spew/spew"
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/rand"
 )
 
@@ -67,6 +68,11 @@ func Int64Ptr(v int64) *int64 {
 	return &v
 }
 
+// HostPathTypePtr returns a pointer to the HostPathType passed in.
+func HostPathTypePtr(v corev1.HostPathType) *corev1.HostPathType {
+	return &v
+}
+
 // GetObjectHash invokes Sum32 Hash function to return hash value of an unstructured Object
 func GetObjectHash(obj interface{}) string {
 	hasher := fnv.New32a()