opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-11-29 09:37:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27340 from axel7083/feature/quadlet/kube-support-multiple-yaml

Browse Source 
feat(quadlet: kube): support multiple Yaml entries
This commit is contained in:
openshift-merge-bot[bot]
2025-10-22 20:32:58 +00:00
committed by GitHub
parent 998a8a0de4 f957852e4a
commit bc3b910276
5 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/quadlet/multiple-yaml-set-working-dir-yaml.kube Normal file
View File

@@ -0,0 +1,7 @@
## assert-failed
## assert-stderr-contains "SetWorkingDirectory=yaml is only supported when a single Yaml key is provided"
[Kube]
Yaml=foo.yml
Yaml=bar.yml
SetWorkingDirectory=yaml

10
test/e2e/quadlet/multiple-yaml.kube Normal file
View File

@@ -0,0 +1,10 @@
## assert-podman-args "kube"
## assert-podman-args "play"
## assert-podman-final-args-regex .*/podman-e2e-.*/subtest-.*/quadlet/foo.yml .*/podman-e2e-.*/subtest-.*/quadlet/bar.yml
## assert-podman-stop-post-args "kube"
## assert-podman-stop-post-args "down"
## assert-podman-stop-post-final-args-regex .*/podman-e2e-.*/subtest-.*/quadlet/foo.yml .*/podman-e2e-.*/subtest-.*/quadlet/bar.yml
[Kube]
Yaml=foo.yml
Yaml=bar.yml

2
test/e2e/quadlet_test.go
View File

@@ -996,6 +996,7 @@ BOGUS=foo
Entry("Kube - Working Directory YAML Absolute Path", "workingdir-yaml-abs.kube"),
Entry("Kube - Working Directory YAML Relative Path", "workingdir-yaml-rel.kube"),
Entry("Kube - Working Directory Unit", "workingdir-unit.kube"),
Entry("Kube - Multiple YAML entries", "multiple-yaml.kube"),
Entry("Kube - Working Directory already in Service", "workingdir-service.kube"),
Entry("Kube - global args", "globalargs.kube"),
Entry("Kube - Containers Conf Modules", "containersconfmodule.kube"),
@@ -1139,6 +1140,7 @@ BOGUS=foo
Entry("Volume - Quadlet image (.image) not found", "image-not-found.quadlet.volume", "converting \"image-not-found.quadlet.volume\": requested Quadlet image not-found.image was not found"),
Entry("Kube - User Remap Manual", "remap-manual.kube", "converting \"remap-manual.kube\": RemapUsers=manual is not supported"),
Entry("Kube - Multiple Yaml and SetWorkingDir=yaml", "multiple-yaml-set-working-dir-yaml.kube", "converting \"multiple-yaml-set-working-dir-yaml.kube\": SetWorkingDirectory=yaml is only supported when a single Yaml key is provided"),
Entry("Network - Gateway not enough Subnet", "gateway.less-subnet.network", "converting \"gateway.less-subnet.network\": cannot set more gateways than subnets"),
Entry("Network - Gateway without Subnet", "gateway.no-subnet.network", "converting \"gateway.no-subnet.network\": cannot set gateway or range without subnet"),