opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-26 21:07:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add comment for jsonMarshal command

Browse Source 
* also, change makeHealthCheck to the standard test command structure

Signed-off-by: Liang Chu-Xuan <karta0807913@gmail.com>
This commit is contained in:
Liang Chu-Xuan
2022-12-17 02:44:45 +00:00
parent 7bd1dbb756
commit 070b69205c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/specgen/generate/kube/kube.go
View File

@ -523,6 +523,7 @@ func probeToHealthConfig(probe *v1.Probe) (*manifest.Schema2HealthConfig, error)
// configure healthcheck on the basis of Handler Actions. // configure healthcheck on the basis of Handler Actions.
switch { switch {
case probeHandler.Exec != nil: case probeHandler.Exec != nil:
// `makeHealthCheck` function can accept a json array as the command.
cmd, err := json.Marshal(probeHandler.Exec.Command) cmd, err := json.Marshal(probeHandler.Exec.Command)
if err != nil { if err != nil {
return nil, err return nil, err
@ -618,6 +619,8 @@ func makeHealthCheck(inCmd string, interval int32, retries int32, timeout int32,
// ...otherwise pass it to "/bin/sh -c" inside the container // ...otherwise pass it to "/bin/sh -c" inside the container
cmd = []string{define.HealthConfigTestCmdShell} cmd = []string{define.HealthConfigTestCmdShell}
cmd = append(cmd, strings.Split(inCmd, " ")...) cmd = append(cmd, strings.Split(inCmd, " ")...)
} else {
cmd = append([]string{define.HealthConfigTestCmd}, cmd...)
} }
} }
hc := manifest.Schema2HealthConfig{ hc := manifest.Schema2HealthConfig{

2
test/e2e/play_kube_test.go
View File

@ -1754,7 +1754,7 @@ var _ = Describe("Podman play kube", func() {
inspect.WaitWithDefaultTimeout() inspect.WaitWithDefaultTimeout()
healthcheckcmd := inspect.OutputToString() healthcheckcmd := inspect.OutputToString()
// check if CMD-SHELL based equivalent health check is added to container // check if CMD-SHELL based equivalent health check is added to container
Expect(healthcheckcmd).To(ContainSubstring("[echo hello]")) Expect(healthcheckcmd).To(ContainSubstring("[CMD echo hello]"))
}) })
It("podman play kube liveness probe should fail", func() { It("podman play kube liveness probe should fail", func() {