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

Merge pull request #25844 from ygalblum/quadlet-network-delete

Browse Source 
Quadlet - allow deleting the network when stopping the service
This commit is contained in:
openshift-merge-bot[bot]
2025-04-14 17:57:45 +00:00
committed by GitHub
parent f64204f651 0d4a148ee6
commit 09c2546b27
5 changed files with 95 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,6 +126,7 @@ const (
KeyMount = "Mount"
KeyNetwork = "Network"
KeyNetworkAlias = "NetworkAlias"
KeyNetworkDeleteOnStop = "NetworkDeleteOnStop"
KeyNetworkName = "NetworkName"
KeyNoNewPrivileges = "NoNewPrivileges"
KeyNotify = "Notify"
@ -327,6 +328,7 @@ var (
KeyIPv6: true,
KeyInternal: true,
KeyNetworkName: true,
KeyNetworkDeleteOnStop: true,
KeyOptions: true,
KeyServiceName: true,
KeySubnet: true,
@ -948,6 +950,12 @@ func ConvertNetwork(network *parser.UnitFile, name string, unitsInfoMap map[stri
// Need the containers filesystem mounted to start podman
service.Add(UnitGroup, "RequiresMountsFor", "%t/containers")
if network.LookupBooleanWithDefault(NetworkGroup, KeyNetworkDeleteOnStop, false) {
serviceStopPostCmd := createBasePodmanCommand(network, NetworkGroup)
serviceStopPostCmd.add("network", "rm", networkName)
service.AddCmdline(ServiceGroup, "ExecStopPost", serviceStopPostCmd.Args)
}
podman := createBasePodmanCommand(network, NetworkGroup)
podman.add("network", "create", "--ignore")