openstack
/
magnum
Code Issues Proposed changes

Merge "core-podman: Mount os-release properly"

This commit is contained in:
Zuul 2020-02-21 02:05:33 +00:00 committed by Gerrit Code Review
parent b11b1f3178 e731a7cb5e
commit 73b894a671
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
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 \\

2
magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
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 \\

5
releasenotes/notes/use_podman-39532143be2296c2.yaml
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.