fix: initContainer restart policy overridden by pod

Restart policy of initContainers should not be overriden by pod and the restart policy should always be "no". See #16343 Signed-off-by: Tony Duan <[email protected]>
containers · May 5, 2023 · 5322071 · 5322071
1 parent f4d2d17
commit 5322071
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go
@@ -560,7 +560,7 @@ func createContainerOptions(rt *libpod.Runtime, s *specgen.SpecGenerator, pod *l
 		retries       uint
 	)
 	// 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()
 		if podConfig.RestartRetries != nil {
 			retries = *podConfig.RestartRetries

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