core-podman: Mount os-release properly

To display the node OS-IMAGE in k8s properly
we need to mount /usr/lib/os-release,
/ets/os-release is just a symlink.

story: 2006459
task: 38505

Change-Id: I0c850126c7299cb7a4fe201efee311d76bc14ce6
Signed-off-by: Spyros Trigazis <spyridon.trigazis@cern.ch>
This commit is contained in:
Spyros Trigazis 2020-01-29 09:24:41 +01:00
parent 454b0f55ec
commit e731a7cb5e
3 changed files with 7 additions and 2 deletions

View File

@ -189,7 +189,7 @@ ExecStart=/bin/bash -c '/usr/bin/podman run --name kubelet \\
--entrypoint /hyperkube \\
--volume /etc/cni/net.d:/etc/cni/net.d:ro,z \\
--volume /etc/kubernetes:/etc/kubernetes:ro,z \\
--volume /usr/lib/os-release:/etc/os-release:ro \\
--volume /usr/lib/os-release:/usr/lib/os-release:ro \\
--volume /etc/ssl/certs:/etc/ssl/certs:ro \\
--volume /lib/modules:/lib/modules:ro \\
--volume /run:/run \\

View File

@ -83,7 +83,7 @@ ExecStart=/bin/bash -c '/usr/bin/podman run --name kubelet \\
--entrypoint /hyperkube \\
--volume /etc/cni/net.d:/etc/cni/net.d:ro,z \\
--volume /etc/kubernetes:/etc/kubernetes:ro,z \\
--volume /usr/lib/os-release:/etc/os-release:ro \\
--volume /usr/lib/os-release:/usr/lib/os-release:ro \\
--volume /etc/ssl/certs:/etc/ssl/certs:ro \\
--volume /lib/modules:/lib/modules:ro \\
--volume /run:/run \\

View File

@ -15,3 +15,8 @@ features:
k8s_fedora_atomic_v1 driver, you need to set use_podman=true. This is
necessary since v1.16 dropped the --containerized flag in kubelet.
https://github.com/kubernetes/kubernetes/pull/80043/files
fixes:
- |
core-podman Mount os-release properly To display the node OS-IMAGE in k8s
properly we need to mount /usr/lib/os-release, /ets/os-release is just a
symlink.