Skip to content

Adjust the way the gardenHealthCheckRootFS is selected #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ameowlia merged 3 commits into from
Feb 20, 2025
Merged

Adjust the way the gardenHealthCheckRootFS is selected #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbbbc9d
Adjust the way the gardenHealthCheckRootFS is selected
ivo1116 Feb 5, 2025
b7e1fd8
add validation to sidecarRootFS selection
ivo1116 Feb 7, 2025
c5fa034
Improve test
ivo1116 Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions initializer/initializer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ func Initialize(
cellID string,
zone string,
rootFSes map[string]string,
sidecarRootFSPath string,
metronClient loggingclient.IngressClient,
clock clock.Clock,
) (
Expand All @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions initializer/initializer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}()
Expand Down Expand Up @@ -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)
}
},
)
Expand Down Expand Up @@ -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)
Expand Down