mirror of
https://github.com/containers/podman.git
synced 2025-12-01 18:49:18 +08:00
fix an overriding logic and load config problem
Fix an overriding logic in Inhearit function. Alos, ToSpecGen function doesn't load the cgroup/image volume config from containers.conf. Signed-off-by: karta0807913 <karta0807913@gmail.com>
This commit is contained in:
12
test/e2e/config/containers-cgroup.conf
Normal file
12
test/e2e/config/containers-cgroup.conf
Normal file
@@ -0,0 +1,12 @@
|
||||
[containers]
|
||||
netns="host"
|
||||
userns="host"
|
||||
ipcns="host"
|
||||
utsns="host"
|
||||
cgroupns="host"
|
||||
cgroups="disabled"
|
||||
log_driver = "k8s-file"
|
||||
[engine]
|
||||
cgroup_manager = "cgroupfs"
|
||||
events_logger="file"
|
||||
runtime="crun"
|
||||
@@ -175,8 +175,19 @@ spec:
|
||||
volumes:
|
||||
- name: foo
|
||||
secret:
|
||||
secretName: oldsecret
|
||||
`
|
||||
secretName: oldsecret`
|
||||
|
||||
var simplePodYaml = `
|
||||
apiVersion: v1
|
||||
kind: Pod
|
||||
metadata:
|
||||
name: libpod-test
|
||||
spec:
|
||||
containers:
|
||||
- image: quay.io/libpod/alpine_nginx:latest
|
||||
command:
|
||||
- sleep
|
||||
- "3600"`
|
||||
|
||||
var unknownKindYaml = `
|
||||
apiVersion: v1
|
||||
@@ -4376,4 +4387,13 @@ ENV OPENJ9_JAVA_OPTIONS=%q
|
||||
deleteAndTestSecret(podmanTest, "newsecret")
|
||||
})
|
||||
|
||||
It("podman play kube with disabled cgroup", func() {
|
||||
os.Setenv("CONTAINERS_CONF", "config/containers-cgroup.conf")
|
||||
err := writeYaml(simplePodYaml, kubeYaml)
|
||||
Expect(err).To(BeNil())
|
||||
|
||||
kube := podmanTest.Podman([]string{"play", "kube", kubeYaml})
|
||||
kube.WaitWithDefaultTimeout()
|
||||
Expect(kube).Should(Exit(0))
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user