From 72de3f8c226e2f07d783a81c7effaa032af93f29 Mon Sep 17 00:00:00 2001 From: 24sama Date: Fri, 23 Jul 2021 10:37:20 +0800 Subject: [PATCH] fix: use bash to exec set -o pipifail Signed-off-by: 24sama --- pkg/kubernetes/nodes.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kubernetes/nodes.go b/pkg/kubernetes/nodes.go index dff5a5ddd..2c4ff5a0d 100644 --- a/pkg/kubernetes/nodes.go +++ b/pkg/kubernetes/nodes.go @@ -169,7 +169,7 @@ func UpdateKubeletConfig(mgr *manager.Manager, node *kubekeyapiv1alpha1.HostCfg) // UpdateKubeproxyConfig is used to update kube-proxy configmap and restart tge kube-proxy pod. func UpdateKubeproxyConfig(mgr *manager.Manager, node *kubekeyapiv1alpha1.HostCfg) error { if mgr.Runner.Index == 0 { - if out, err := mgr.Runner.ExecuteCmd("sudo -E /bin/sh -c \"set -o pipefail && /usr/local/bin/kubectl --kubeconfig /etc/kubernetes/admin.conf get configmap kube-proxy -n kube-system -o yaml "+ + if out, err := mgr.Runner.ExecuteCmd("sudo -E /bin/bash -c \"set -o pipefail && /usr/local/bin/kubectl --kubeconfig /etc/kubernetes/admin.conf get configmap kube-proxy -n kube-system -o yaml "+ "| sed -n '/server:.*/p' \"", 1, false); err != nil { return errors.Wrap(errors.WithStack(err), "Failed to get kube-proxy config") } else { @@ -178,7 +178,7 @@ func UpdateKubeproxyConfig(mgr *manager.Manager, node *kubekeyapiv1alpha1.HostCf } } - if _, err := mgr.Runner.ExecuteCmd(fmt.Sprintf("sudo -E /bin/sh -c \"set -o pipefail && /usr/local/bin/kubectl --kubeconfig /etc/kubernetes/admin.conf get configmap kube-proxy -n kube-system -o yaml "+ + if _, err := mgr.Runner.ExecuteCmd(fmt.Sprintf("sudo -E /bin/bash -c \"set -o pipefail && /usr/local/bin/kubectl --kubeconfig /etc/kubernetes/admin.conf get configmap kube-proxy -n kube-system -o yaml "+ "| sed 's#server:.*#server: https://127.0.0.1:%s#g' "+ "| /usr/local/bin/kubectl --kubeconfig /etc/kubernetes/admin.conf replace -f -\"", strconv.Itoa(mgr.Cluster.ControlPlaneEndpoint.Port)), 3, false); err != nil { return errors.Wrap(errors.WithStack(err), "Failed to update kube-proxy config")