diff --git a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp index 14a5b077c..18e60d4cd 100644 --- a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp +++ b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp @@ -1509,7 +1509,7 @@ class platform::kubernetes::master::rootca::trustbothcas::runtime } # Restart kubelet to truct both certs -> exec { 'restart_kubelet': - command => '/usr/bin/systemctl restart kubelet', + command => '/usr/local/sbin/pmon-restart kubelet', } } @@ -1540,7 +1540,7 @@ class platform::kubernetes::worker::rootca::trustbothcas::runtime } # Restart kubelet to trust both certs -> exec { 'restart_kubelet': - command => '/usr/bin/systemctl restart kubelet', + command => '/usr/local/sbin/pmon-restart kubelet', } } @@ -1619,7 +1619,7 @@ class platform::kubernetes::master::rootca::trustnewca::runtime } # Restart kubelet to trust only the new cert -> exec { 'restart_kubelet': - command => '/usr/bin/systemctl restart kubelet', + command => '/usr/local/sbin/pmon-restart kubelet', } # Remove the new cert file -> exec { 'remove_new_cert_file': @@ -1653,7 +1653,7 @@ class platform::kubernetes::worker::rootca::trustnewca::runtime } # Restart kubelet to trust only the new cert -> exec { 'restart_kubelet': - command => '/usr/bin/systemctl restart kubelet', + command => '/usr/local/sbin/pmon-restart kubelet', } } @@ -2001,21 +2001,8 @@ class platform::kubernetes::update_kubelet_config::runtime timeout => 60, } - # Temporary workaround for pmon-restart failures - # TODO(kdhokte) Replace with pmon-restart once pmon issue is fixed - # Ensure that kubelet is only managed by systemd when it is restarted - - -> exec { 'temporarily stop kubelet being monitored by pmon': - command => '/usr/local/sbin/pmon-stop kubelet', - } - -> exec { 'restart kubelet': - command => '/usr/bin/systemctl restart kubelet.service', - logoutput => true, - } - - -> exec { 'start monitoring kubelet by pmon again': - command => '/usr/local/sbin/pmon-start kubelet', + command => '/usr/local/sbin/pmon-restart kubelet', } }