From fbbbc9dc655996ffec75ece5167c59c7ad5c5529 Mon Sep 17 00:00:00 2001
From: Ivo Radkov <ivo.radkov@sap.com>
Date: Wed, 5 Feb 2025 16:33:40 +0200
Subject: [PATCH 1/3] Adjust the way the gardenHealthCheckRootFS is selected

---
 initializer/initializer.go      | 8 +-------
 initializer/initializer_test.go | 6 +++---
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/initializer/initializer.go b/initializer/initializer.go
index 777f2074..cb02b401 100644
--- a/initializer/initializer.go
+++ b/initializer/initializer.go
@@ -163,6 +163,7 @@ func Initialize(
 	cellID string,
 	zone string,
 	rootFSes map[string]string,
+	gardenHealthcheckRootFS string,
 	metronClient loggingclient.IngressClient,
 	clock clock.Clock,
 ) (
@@ -171,13 +172,6 @@ func Initialize(
 	grouper.Members,
 	error,
 ) {
-
-	var gardenHealthcheckRootFS string
-	for _, rootFSPath := range rootFSes {
-		gardenHealthcheckRootFS = rootFSPath
-		break
-	}
-
 	postSetupHook, err := shlex.Split(config.PostSetupHook)
 	if err != nil {
 		logger.Error("failed-to-parse-post-setup-hook", err)
diff --git a/initializer/initializer_test.go b/initializer/initializer_test.go
index 2d1abad0..aa2a2e0d 100644
--- a/initializer/initializer_test.go
+++ b/initializer/initializer_test.go
@@ -131,7 +131,8 @@ var _ = Describe("Initializer", func() {
 		config.GardenNetwork = "tcp"
 		go func() {
 			rootFSes := map[string]string{}
-			_, _, _, err := initializer.Initialize(logger, config, "cell-id", "some-zone", rootFSes, fakeMetronClient, fakeClock)
+			sidecarFS := "some-fs"
+			_, _, _, err := initializer.Initialize(logger, config, "cell-id", "some-zone", rootFSes, sidecarFS, fakeMetronClient, fakeClock)
 			errCh <- err
 			close(done)
 		}()
@@ -194,7 +195,7 @@ var _ = Describe("Initializer", func() {
 					if r.FormValue(healthcheckTagQueryParam) == gardenhealth.HealthcheckTagValue {
 						ghttp.RespondWithJSONEncoded(http.StatusOK, struct{}{})(w, r)
 					} else {
-						ghttp.RespondWithJSONEncoded(http.StatusOK, map[string][]string{"handles": []string{"cnr1", "cnr2"}})(w, r)
+						ghttp.RespondWithJSONEncoded(http.StatusOK, map[string][]string{"handles": {"cnr1", "cnr2"}})(w, r)
 					}
 				},
 			)
@@ -718,7 +719,6 @@ var _ = Describe("Initializer", func() {
 				config.CachePath = ""
 
 				fakeCertPoolRetriever.SystemCertsReturns(x509.NewCertPool(), nil)
-
 			})
 			It("returns an error", func() {
 				certBytes, err := os.ReadFile(config.PathToTLSCACert)

From b7e1fd8fb8f79e989bcf7fd618d49f4c0c87152b Mon Sep 17 00:00:00 2001
From: Ivo Radkov <ivo.radkov@sap.com>
Date: Fri, 7 Feb 2025 11:47:04 +0200
Subject: [PATCH 2/3] add validation to sidecarRootFS selection

---
 initializer/initializer.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/initializer/initializer.go b/initializer/initializer.go
index cb02b401..3f2a129d 100644
--- a/initializer/initializer.go
+++ b/initializer/initializer.go
@@ -163,7 +163,7 @@ func Initialize(
 	cellID string,
 	zone string,
 	rootFSes map[string]string,
-	gardenHealthcheckRootFS string,
+	sidecarRootFSPath string,
 	metronClient loggingclient.IngressClient,
 	clock clock.Clock,
 ) (
@@ -172,6 +172,17 @@ func Initialize(
 	grouper.Members,
 	error,
 ) {
+	var gardenHealthcheckRootFS string
+	if sidecarRootFSPath == "" {
+		for _, rootFSPath := range rootFSes {
+			gardenHealthcheckRootFS = rootFSPath
+			break
+		}
+	} else {
+		gardenHealthcheckRootFS = sidecarRootFSPath
+	}
+	logger.Info("garden-healthcheck-rootfs", lager.Data{"rootfs": gardenHealthcheckRootFS})
+
 	postSetupHook, err := shlex.Split(config.PostSetupHook)
 	if err != nil {
 		logger.Error("failed-to-parse-post-setup-hook", err)

From c5fa034d2877e122d3b7d115266cd62add2324c6 Mon Sep 17 00:00:00 2001
From: Ivo Radkov <ivo.radkov@sap.com>
Date: Fri, 7 Feb 2025 14:46:30 +0200
Subject: [PATCH 3/3] Improve test

---
 initializer/initializer_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/initializer/initializer_test.go b/initializer/initializer_test.go
index aa2a2e0d..74c27218 100644
--- a/initializer/initializer_test.go
+++ b/initializer/initializer_test.go
@@ -131,8 +131,8 @@ var _ = Describe("Initializer", func() {
 		config.GardenNetwork = "tcp"
 		go func() {
 			rootFSes := map[string]string{}
-			sidecarFS := "some-fs"
-			_, _, _, err := initializer.Initialize(logger, config, "cell-id", "some-zone", rootFSes, sidecarFS, fakeMetronClient, fakeClock)
+			sidecarRootFSPath := ""
+			_, _, _, err := initializer.Initialize(logger, config, "cell-id", "some-zone", rootFSes, sidecarRootFSPath, fakeMetronClient, fakeClock)
 			errCh <- err
 			close(done)
 		}()