From d891e46409742006385c6551c155b90d084f7483 Mon Sep 17 00:00:00 2001
From: Abhinav Dahiya <abhinav.dahiya@redhat.com>
Date: Thu, 25 Oct 2018 12:20:36 -0700
Subject: [PATCH] templates: switch kubelet systemd unit to type notify

kubelet supports running as systemd unit and sends READY=1 signal when running.
https://github.com/kubernetes/kubernetes/blob/12cf5451952c8425a47334465f3e03d7ca181956/cmd/kubelet/app/server.go#L761-L762
---
 .../test_data/templates/aws/master/units/kubelet.service         | 1 +
 .../test_data/templates/aws/worker/units/kubelet.service         | 1 +
 .../test_data/templates/libvirt/master/units/kubelet.service     | 1 +
 .../test_data/templates/libvirt/worker/units/kubelet.service     | 1 +
 .../test_data/templates/openstack/master/units/kubelet.service   | 1 +
 .../test_data/templates/openstack/worker/units/kubelet.service   | 1 +
 templates/_base/master/units/kubelet.yaml                        | 1 +
 templates/_base/worker/units/kubelet.yaml                        | 1 +
 8 files changed, 8 insertions(+)

diff --git a/pkg/controller/template/test_data/templates/aws/master/units/kubelet.service b/pkg/controller/template/test_data/templates/aws/master/units/kubelet.service
index 5dbca9660c..7a55cafb88 100644
--- a/pkg/controller/template/test_data/templates/aws/master/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/aws/master/units/kubelet.service
@@ -4,6 +4,7 @@ contents: |
   Wants=rpc-statd.service
 
   [Service]
+  Type=notify
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env
diff --git a/pkg/controller/template/test_data/templates/aws/worker/units/kubelet.service b/pkg/controller/template/test_data/templates/aws/worker/units/kubelet.service
index 30f5bd7f22..fd23ed6931 100644
--- a/pkg/controller/template/test_data/templates/aws/worker/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/aws/worker/units/kubelet.service
@@ -4,6 +4,7 @@ contents: |
   Wants=rpc-statd.service
 
   [Service]
+  Type=notify
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env
diff --git a/pkg/controller/template/test_data/templates/libvirt/master/units/kubelet.service b/pkg/controller/template/test_data/templates/libvirt/master/units/kubelet.service
index d489f937a9..45abd5d904 100644
--- a/pkg/controller/template/test_data/templates/libvirt/master/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/libvirt/master/units/kubelet.service
@@ -4,6 +4,7 @@ contents: |
   Wants=rpc-statd.service
 
   [Service]
+  Type=notify
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env
diff --git a/pkg/controller/template/test_data/templates/libvirt/worker/units/kubelet.service b/pkg/controller/template/test_data/templates/libvirt/worker/units/kubelet.service
index 8d5b08c4b6..9f5bd33f73 100644
--- a/pkg/controller/template/test_data/templates/libvirt/worker/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/libvirt/worker/units/kubelet.service
@@ -4,6 +4,7 @@ contents: |
   Wants=rpc-statd.service
 
   [Service]
+  Type=notify
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env
diff --git a/pkg/controller/template/test_data/templates/openstack/master/units/kubelet.service b/pkg/controller/template/test_data/templates/openstack/master/units/kubelet.service
index 7032ed8d7e..da02502c58 100644
--- a/pkg/controller/template/test_data/templates/openstack/master/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/openstack/master/units/kubelet.service
@@ -4,6 +4,7 @@ contents: |
   Wants=rpc-statd.service
 
   [Service]
+  Type=notify
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env
diff --git a/pkg/controller/template/test_data/templates/openstack/worker/units/kubelet.service b/pkg/controller/template/test_data/templates/openstack/worker/units/kubelet.service
index 68f122eddf..2326ec6aa1 100644
--- a/pkg/controller/template/test_data/templates/openstack/worker/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/openstack/worker/units/kubelet.service
@@ -4,6 +4,7 @@ contents: |
   Wants=rpc-statd.service
 
   [Service]
+  Type=notify
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env
diff --git a/templates/_base/master/units/kubelet.yaml b/templates/_base/master/units/kubelet.yaml
index 874e2c00e9..83eab51ae4 100644
--- a/templates/_base/master/units/kubelet.yaml
+++ b/templates/_base/master/units/kubelet.yaml
@@ -6,6 +6,7 @@ contents: |
   Wants=rpc-statd.service
 
   [Service]
+  Type=notify
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env
diff --git a/templates/_base/worker/units/kubelet.yaml b/templates/_base/worker/units/kubelet.yaml
index 587f2dfd32..3383699f40 100644
--- a/templates/_base/worker/units/kubelet.yaml
+++ b/templates/_base/worker/units/kubelet.yaml
@@ -6,6 +6,7 @@ contents: |
   Wants=rpc-statd.service
 
   [Service]
+  Type=notify
   ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
   EnvironmentFile=-/etc/kubernetes/kubelet-workaround
   EnvironmentFile=-/etc/kubernetes/kubelet-env