From 4b35404d6a03c4bfe6ea12e176d8624710a10b2c Mon Sep 17 00:00:00 2001 From: Don Penney Date: Thu, 21 Feb 2019 11:33:30 -0500 Subject: [PATCH] Ignore error on k8s taint removal from puppet There are cases where the kubernetes taint is not present on, or has already been removed from, a newly configured standby controller. This causes the taint removal command run by the puppet manifest to fail. This failure can be safely ignored, so the command is updated by this commit to always return success. Change-Id: Icdb55738e052c65a28e44582e345038b0de83c37 Closes-Bug: 1815795 Signed-off-by: Don Penney --- puppet-manifests/src/modules/platform/manifests/kubernetes.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp index 97bc539674..9f75b8ee1e 100644 --- a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp +++ b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp @@ -124,7 +124,7 @@ class platform::kubernetes::master::init # Remove the taint from the master node -> exec { 'remove taint from master node': - command => "kubectl --kubeconfig=/etc/kubernetes/admin.conf taint node ${::platform::params::hostname} node-role.kubernetes.io/master-", # lint:ignore:140chars + command => "kubectl --kubeconfig=/etc/kubernetes/admin.conf taint node ${::platform::params::hostname} node-role.kubernetes.io/master- || true", # lint:ignore:140chars logoutput => true, } @@ -230,7 +230,7 @@ class platform::kubernetes::master::init # Remove the taint from the master node -> exec { 'remove taint from master node': - command => "kubectl --kubeconfig=/etc/kubernetes/admin.conf taint node ${::platform::params::hostname} node-role.kubernetes.io/master-", # lint:ignore:140chars + command => "kubectl --kubeconfig=/etc/kubernetes/admin.conf taint node ${::platform::params::hostname} node-role.kubernetes.io/master- || true", # lint:ignore:140chars logoutput => true, }