opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-12 16:56:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24437 from lambinoo/feat-split-pod-container-start-24401

Browse Source 
Add key to control if a container can get started by its pod
This commit is contained in:
openshift-merge-bot[bot]
2024-11-05 15:04:16 +00:00
committed by GitHub
parent c8af2f2c1e 2597eeae70
commit a358d83ce9
7 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/systemd/quadlet/quadlet.go
View File

@ -154,6 +154,7 @@ const (
KeyServiceName = "ServiceName"
KeySetWorkingDirectory = "SetWorkingDirectory"
KeyShmSize = "ShmSize"
KeyStartWithPod = "StartWithPod"
KeyStopSignal = "StopSignal"
KeyStopTimeout = "StopTimeout"
KeySubGIDMap = "SubGIDMap"
@ -185,8 +186,8 @@ type UnitInfo struct {
ResourceName string
// For .pod units
// List of containers in a pod
Containers []string
// List of containers to start with the pod
ContainersToStart []string
}
var (
@ -267,6 +268,7 @@ var (
KeyServiceName: true,
KeyShmSize: true,
KeyStopSignal: true,
KeyStartWithPod: true,
KeyStopTimeout: true,
KeySubGIDMap: true,
KeySubUIDMap: true,
@ -1556,7 +1558,7 @@ func ConvertPod(podUnit *parser.UnitFile, name string, unitsInfoMap map[string]*
// Need the containers filesystem mounted to start podman
service.Add(UnitGroup, "RequiresMountsFor", "%t/containers")
for _, containerService := range unitInfo.Containers {
for _, containerService := range unitInfo.ContainersToStart {
service.Add(UnitGroup, "Wants", containerService)
service.Add(UnitGroup, "Before", containerService)
}
@ -2132,7 +2134,11 @@ func handlePod(quadletUnitFile, serviceUnitFile *parser.UnitFile, groupName stri
serviceUnitFile.Add(UnitGroup, "BindsTo", podServiceName)
serviceUnitFile.Add(UnitGroup, "After", podServiceName)
podInfo.Containers = append(podInfo.Containers, serviceUnitFile.Filename)
// If we want to start the container with the pod, we add it to this list.
// This creates corresponding Wants=/Before= statements in the pod service.
if quadletUnitFile.LookupBooleanWithDefault(groupName, KeyStartWithPod, true) {
podInfo.ContainersToStart = append(podInfo.ContainersToStart, serviceUnitFile.Filename)
}
}
return nil
}