Use a single volumesToVolumeMounts method

Using single method to handle volumeMount object creation under specific directories Signed-off-by: Pradipta Banerjee <[email protected]>
confidential-containers · Mar 6, 2024 · f49b6ab · f49b6ab
1 parent 66fd3fd
commit f49b6ab
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/controllers/common.go b/controllers/common.go
@@ -41,6 +41,15 @@ const (
 
 	// Default KBS Resources Path
 	kbsResourcesPath = "/opt/confidential-containers/kbs/repository/default"
+
+	// Default KBS config path
+	kbsDefaultConfigPath = "/etc"
+
+	// Default AS config path
+	asDefaultConfigPath = "/etc"
+
+	// Default RVPS config path
+	rvpsDefaultConfigPath = "/etc"
 )
 
 func contains(list []string, s string) bool {

diff --git a/controllers/kbsconfig_controller.go b/controllers/kbsconfig_controller.go
@@ -323,15 +323,15 @@ func (r *KbsConfigReconciler) buildKbsVolumeMounts(ctx context.Context, volumes
 		return nil, nil, err
 	}
 	// All the above kbsVolumes gets mounted under "/etc" directory
-	volumeMounts := volumesToVolumeMounts(kbsEtcVolumes)
+	volumeMounts := volumesToVolumeMounts(kbsEtcVolumes, kbsDefaultConfigPath)
 	volumes = append(volumes, kbsEtcVolumes...)
 
 	kbsSecretResourceVolumes, err = r.processKbsSecretResources(ctx, kbsSecretResourceVolumes)
 	if err != nil {
 		return nil, nil, err
 	}
 	// Add the kbsSecretResourceVolumes to the volumesMounts
-	volumeMounts = append(volumeMounts, volumesToVolumeMountsCustom(kbsSecretResourceVolumes, kbsResourcesPath)...)
+	volumeMounts = append(volumeMounts, volumesToVolumeMounts(kbsSecretResourceVolumes, kbsResourcesPath)...)
 	volumes = append(volumes, kbsSecretResourceVolumes...)
 
 	return volumes, volumeMounts, nil
@@ -343,7 +343,7 @@ func (r *KbsConfigReconciler) buildAsVolumesMounts(ctx context.Context, volumes
 	if err != nil {
 		return nil, nil, err
 	}
-	volumeMounts := volumesToVolumeMounts(asVolumes)
+	volumeMounts := volumesToVolumeMounts(asVolumes, asDefaultConfigPath)
 	volumes = append(volumes, asVolumes...)
 	return volumes, volumeMounts, nil
 }
@@ -354,25 +354,13 @@ func (r *KbsConfigReconciler) buildRvpsVolumesMounts(ctx context.Context, volume
 	if err != nil {
 		return nil, nil, err
 	}
-	volumeMounts := volumesToVolumeMounts(rvpsVolumes)
+	volumeMounts := volumesToVolumeMounts(rvpsVolumes, rvpsDefaultConfigPath)
 	volumes = append(volumes, rvpsVolumes...)
 	return volumes, volumeMounts, nil
 }
 
-// Method to add volumeMounts for KBS under "/etc" directory
-func volumesToVolumeMounts(volumes []corev1.Volume) []corev1.VolumeMount {
-	volumeMounts := []corev1.VolumeMount{}
-	for _, volume := range volumes {
-		volumeMounts = append(volumeMounts, corev1.VolumeMount{
-			Name:      volume.Name,
-			MountPath: "/etc/" + volume.Name,
-		})
-	}
-	return volumeMounts
-}
-
 // Method to add volumeMounts for KBS under custom directory
-func volumesToVolumeMountsCustom(volumes []corev1.Volume, mountPath string) []corev1.VolumeMount {
+func volumesToVolumeMounts(volumes []corev1.Volume, mountPath string) []corev1.VolumeMount {
 	volumeMounts := []corev1.VolumeMount{}
 	for _, volume := range volumes {
 		// Create MountPath ensuring file path separators are handled correctly