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

Merge pull request #18481 from tony84727/fix/initctr-restart-policy-overridden

Browse Source 
fix: initContainer restart policy overridden by pod
This commit is contained in:
OpenShift Merge Robot
2023-05-12 09:09:21 -04:00
committed by GitHub
parent 189b09d82e 74a5b92b3a
commit 2783651005
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/specgen/generate/container_create.go
View File

@ -560,7 +560,7 @@ func createContainerOptions(rt *libpod.Runtime, s *specgen.SpecGenerator, pod *l
retries uint retries uint
) )
// If the container is running in a pod, use the pod's restart policy for all the containers // If the container is running in a pod, use the pod's restart policy for all the containers
if pod != nil { if pod != nil && !s.IsInitContainer() {
podConfig := pod.ConfigNoCopy() podConfig := pod.ConfigNoCopy()
if podConfig.RestartRetries != nil { if podConfig.RestartRetries != nil {
retries = *podConfig.RestartRetries retries = *podConfig.RestartRetries

4
pkg/specgen/specgen.go
View File

@ -586,6 +586,10 @@ func (s *SpecGenerator) GetImage() (*libimage.Image, string) {
return s.image, s.resolvedImageName return s.image, s.resolvedImageName
} }
func (s *SpecGenerator) IsInitContainer() bool {
return len(s.InitContainerType) != 0
}
type Secret struct { type Secret struct {
Source string Source string
Target string Target string

6
test/e2e/play_kube_test.go
View File

@ -2234,6 +2234,12 @@ var _ = Describe("Podman play kube", func() {
Expect(inspect).Should(Exit(0)) Expect(inspect).Should(Exit(0))
Expect(inspect.OutputToString()).To(ContainSubstring("running")) Expect(inspect.OutputToString()).To(ContainSubstring("running"))
// Init containers should not be restarted
inspect = podmanTest.Podman([]string{"inspect", "--format", "{{ .HostConfig.RestartPolicy.Name }}", "testPod-" + defaultCtrName})
inspect.WaitWithDefaultTimeout()
Expect(inspect).Should(Exit(0))
Expect(inspect.OutputToString()).To(ContainSubstring(define.RestartPolicyNo))
// Init containers need environment too! #18384 // Init containers need environment too! #18384
logs := podmanTest.Podman([]string{"logs", "testPod-init-test"}) logs := podmanTest.Podman([]string{"logs", "testPod-init-test"})
logs.WaitWithDefaultTimeout() logs.WaitWithDefaultTimeout()