From e731a7cb5e5a6fbb7099170607d801bae2f576ef Mon Sep 17 00:00:00 2001 From: Spyros Trigazis Date: Wed, 29 Jan 2020 09:24:41 +0100 Subject: [PATCH] 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 --- .../kubernetes/fragments/configure-kubernetes-master.sh | 2 +- .../kubernetes/fragments/configure-kubernetes-minion.sh | 2 +- releasenotes/notes/use_podman-39532143be2296c2.yaml | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh index 02f05a4a6e..27aef1af84 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh @@ -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 \\ diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh index 8049f83c1d..589ded7c70 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh @@ -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 \\ diff --git a/releasenotes/notes/use_podman-39532143be2296c2.yaml b/releasenotes/notes/use_podman-39532143be2296c2.yaml index c3d9fbaed2..10cc9e8fcb 100644 --- a/releasenotes/notes/use_podman-39532143be2296c2.yaml +++ b/releasenotes/notes/use_podman-39532143be2296c2.yaml @@ -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.