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

Merge pull request #16971 from ygalblum/quadlet-network-depend

Browse Source 
Quadlet Network - Fix the name of the required network service
This commit is contained in:
OpenShift Merge Robot
2023-01-03 10:17:25 -05:00
committed by GitHub
parent 66ec8aa5d4 a061d793df
commit a4edd0d310
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -821,13 +821,13 @@ func addNetworks(quadletUnitFile *parser.UnitFile, groupName string, serviceUnit
networks := quadletUnitFile.LookupAll(groupName, KeyNetwork) networks := quadletUnitFile.LookupAll(groupName, KeyNetwork)
for _, network := range networks { for _, network := range networks {
if len(network) > 0 { if len(network) > 0 {
networkName, options, found := strings.Cut(network, ":") quadletNetworkName, options, found := strings.Cut(network, ":")
if strings.HasSuffix(networkName, ".network") { if strings.HasSuffix(quadletNetworkName, ".network") {
// the podman network name is systemd-$name // the podman network name is systemd-$name
networkName = replaceExtension(networkName, "", "systemd-", "") networkName := replaceExtension(quadletNetworkName, "", "systemd-", "")
// the systemd unit name is $name-network.service // the systemd unit name is $name-network.service
networkServiceName := replaceExtension(networkName, ".service", "", "-network") networkServiceName := replaceExtension(quadletNetworkName, ".service", "", "-network")
serviceUnitFile.Add(UnitGroup, "Requires", networkServiceName) serviceUnitFile.Add(UnitGroup, "Requires", networkServiceName)
serviceUnitFile.Add(UnitGroup, "After", networkServiceName) serviceUnitFile.Add(UnitGroup, "After", networkServiceName)

4
test/e2e/quadlet/network.quadlet.container
View File

@ -1,6 +1,6 @@
## assert-podman-args "--network=systemd-basic" ## assert-podman-args "--network=systemd-basic"
## assert-key-is "Unit" "Requires" "systemd-basic-network.service" ## assert-key-is "Unit" "Requires" "basic-network.service"
## assert-key-is "Unit" "After" "systemd-basic-network.service" ## assert-key-is "Unit" "After" "basic-network.service"
[Container] [Container]
Image=localhost/imagename Image=localhost/imagename

4
test/e2e/quadlet/network.quadlet.kube
View File

@ -1,6 +1,6 @@
## assert-podman-args "--network=systemd-basic" ## assert-podman-args "--network=systemd-basic"
## assert-key-is "Unit" "Requires" "systemd-basic-network.service" ## assert-key-is "Unit" "Requires" "basic-network.service"
## assert-key-is "Unit" "After" "systemd-basic-network.service" ## assert-key-is "Unit" "After" "basic-network.service"
[Kube] [Kube]