From 8c8306d838d0877ca1c4af41099a1108fd53ec8f Mon Sep 17 00:00:00 2001
From: Brad Davidson <brad.davidson@rancher.com>
Date: Fri, 15 Mar 2024 16:02:27 +0000
Subject: [PATCH] Properly handle files and sockets in extra mounts

Also allows manually specifying HostPathType, in case an unhandled type is needed

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
---
 pkg/staticpod/staticpod.go | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/pkg/staticpod/staticpod.go b/pkg/staticpod/staticpod.go
index e78e91f4ca..5ff901eb94 100644
--- a/pkg/staticpod/staticpod.go
+++ b/pkg/staticpod/staticpod.go
@@ -321,9 +321,7 @@ func addVolumes(p *v1.Pod, src []string, dir bool) {
 }
 
 func addExtraMounts(p *v1.Pod, extraMounts []string) {
-	var (
-		sourceType = v1.HostPathDirectoryOrCreate
-	)
+	var sourceType v1.HostPathType
 
 	for i, rawMount := range extraMounts {
 		mount := strings.Split(rawMount, ":")
@@ -337,14 +335,37 @@ func addExtraMounts(p *v1.Pod, extraMounts []string) {
 			case "rw":
 				ro = false
 			default:
-				logrus.Errorf("unknown mount option: %s encountered in extra mount %s for pod %s", mount[2], rawMount, p.Name)
+				logrus.Errorf("Unknown mount option: %s encountered in extra mount %s for pod %s", mount[2], rawMount, p.Name)
 				continue
 			}
+		case 4:
+			sourceType = v1.HostPathType(mount[3])
 		default:
-			logrus.Errorf("mount for pod %s %s was not valid", p.Name, rawMount)
+			logrus.Errorf("Extra mount for pod %s %s was not valid", p.Name, rawMount)
 			continue
 		}
 
+		// If the source type was not specified, try to auto-detect.
+		// Paths that cannot be stat-ed are handled as DirectoryOrCreate.
+		// Only sockets, directories, and files are supported for auto-detection.
+		if sourceType == v1.HostPathUnset {
+			if info, err := os.Stat(mount[0]); err != nil {
+				if !os.IsNotExist(err) {
+					logrus.Warnf("Failed to stat mount for pod %s %s: %v", p.Name, mount[0], err)
+				}
+				sourceType = v1.HostPathDirectoryOrCreate
+			} else {
+				switch {
+				case info.Mode().Type() == fs.ModeSocket:
+					sourceType = v1.HostPathSocket
+				case info.IsDir():
+					sourceType = v1.HostPathDirectory
+				default:
+					sourceType = v1.HostPathFile
+				}
+			}
+		}
+
 		name := fmt.Sprintf("%s-%d", extraMountPrefix, i)
 		p.Spec.Volumes = append(p.Spec.Volumes, v1.Volume{
 			Name: name,