diff --git a/initializer/initializer.go b/initializer/initializer.go index 777f2074..3f2a129d 100644 --- a/initializer/initializer.go +++ b/initializer/initializer.go @@ -163,6 +163,7 @@ func Initialize( cellID string, zone string, rootFSes map[string]string, + sidecarRootFSPath string, metronClient loggingclient.IngressClient, clock clock.Clock, ) ( @@ -171,12 +172,16 @@ func Initialize( grouper.Members, error, ) { - var gardenHealthcheckRootFS string - for _, rootFSPath := range rootFSes { - gardenHealthcheckRootFS = rootFSPath - break + 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 { diff --git a/initializer/initializer_test.go b/initializer/initializer_test.go index 2d1abad0..74c27218 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) + sidecarRootFSPath := "" + _, _, _, err := initializer.Initialize(logger, config, "cell-id", "some-zone", rootFSes, sidecarRootFSPath, 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)