From a250ebaddd1e74b1c5f0fd7a2d937512474ab504 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Tue, 30 Apr 2024 17:41:07 +0200
Subject: [PATCH] Follow directory symlinks in auto deploying manifests (#9288)

Signed-off-by: Robert Rose <robert.rose@mailbox.org>
(cherry picked from commit 6886c0977f9d9305d983669d524b967b1dd224be)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
---
 pkg/deploy/controller.go | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkg/deploy/controller.go b/pkg/deploy/controller.go
index d26a88906aee..e4626134cb78 100644
--- a/pkg/deploy/controller.go
+++ b/pkg/deploy/controller.go
@@ -119,6 +119,26 @@ func (w *watcher) listFilesIn(base string, force bool) error {
 		if err != nil {
 			return err
 		}
+		// Descend into symlinked directories, however, only top-level links are followed
+		if info.Mode()&os.ModeSymlink != 0 {
+			linkInfo, err := os.Stat(path)
+			if err != nil {
+				return err
+			}
+			if linkInfo.IsDir() {
+				evalPath, err := filepath.EvalSymlinks(path)
+				if err != nil {
+					return err
+				}
+				filepath.Walk(evalPath, func(path string, info os.FileInfo, err error) error {
+					if err != nil {
+						return err
+					}
+					files[path] = info
+					return nil
+				})
+			}
+		}
 		files[path] = info
 		return nil
 	}); err != nil {