From 1ea8db948ccd55eb5b1ceb76944a778fd81a4b16 Mon Sep 17 00:00:00 2001
From: Spyros Trigazis <strigazi@gmail.com>
Date: Tue, 14 Apr 2020 13:45:01 +0000
Subject: [PATCH] fcos-kubelet: Add rpc-statd dependency

To mount nfs volumes with the embedded volume
pkg [0], rpc-statd is required and should be
started by mount.nfs. When running kubelet
in a chroot this fails. With atomic containers
it used to work.

[0] https://github.com/kubernetes/kubernetes/tree/master/pkg/volume/nfs

story: 2005201
task: 39403

Change-Id: Ib64efe7ecbe9a24e86fa9d9a35a4d90c0e8bbf2e
Signed-off-by: Spyros Trigazis <strigazi@gmail.com>
---
 .../fragments/configure-kubernetes-master.sh           |  2 ++
 .../fragments/configure-kubernetes-minion.sh           |  2 ++
 releasenotes/notes/kubelet-nfs-b51e572adfb56378.yaml   | 10 ++++++++++
 3 files changed, 14 insertions(+)
 create mode 100644 releasenotes/notes/kubelet-nfs-b51e572adfb56378.yaml

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 7811ac52ce..016c814125 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
@@ -172,6 +172,8 @@ EOF
     cat > /etc/systemd/system/kubelet.service <<EOF
 [Unit]
 Description=Kubelet via Hyperkube (System Container)
+Wants=rpc-statd.service
+
 [Service]
 EnvironmentFile=/etc/sysconfig/heat-params
 EnvironmentFile=/etc/kubernetes/config
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 92b821cee1..e1750763c4 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
@@ -65,6 +65,8 @@ if [ "$(echo $USE_PODMAN | tr '[:upper:]' '[:lower:]')" == "true" ]; then
     cat > /etc/systemd/system/kubelet.service <<EOF
 [Unit]
 Description=Kubelet via Hyperkube (System Container)
+Wants=rpc-statd.service
+
 [Service]
 EnvironmentFile=/etc/sysconfig/heat-params
 EnvironmentFile=/etc/kubernetes/config
diff --git a/releasenotes/notes/kubelet-nfs-b51e572adfb56378.yaml b/releasenotes/notes/kubelet-nfs-b51e572adfb56378.yaml
new file mode 100644
index 0000000000..f5880a6fe4
--- /dev/null
+++ b/releasenotes/notes/kubelet-nfs-b51e572adfb56378.yaml
@@ -0,0 +1,10 @@
+---
+fixes:
+  - |
+    For fcos-kubelet, add rpc-statd dependency.
+    To mount nfs volumes with the embedded volume
+    pkg [0], rpc-statd is required and should be
+    started by mount.nfs. When running kubelet
+    in a chroot this fails. With atomic containers
+    it used to work.
+    [0] https://github.com/kubernetes/kubernetes/tree/master/pkg/volume/nfs