Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kubic-control for openSUSE:Factory checked in at 2021-11-22 23:03:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubic-control (Old) and /work/SRC/openSUSE:Factory/.kubic-control.new.1895 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kubic-control" Mon Nov 22 23:03:48 2021 rev:21 rq:932544 version:0.12.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kubic-control/kubic-control.changes 2021-09-20 23:31:56.351083591 +0200 +++ /work/SRC/openSUSE:Factory/.kubic-control.new.1895/kubic-control.changes 2021-11-22 23:04:01.265964845 +0100 @@ -1,0 +2,6 @@ +Fri Nov 19 13:48:45 UTC 2021 - Thorsten Kukuk <[email protected]> + +- Update to version 0.12.2 + - Disable transactional-update executor [bsc#1192619] + +------------------------------------------------------------------- Old: ---- kubic-control-0.12.1.tar.xz New: ---- kubic-control-0.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubic-control.spec ++++++ --- /var/tmp/diff_new_pack.pDQA54/_old 2021-11-22 23:04:01.885962764 +0100 +++ /var/tmp/diff_new_pack.pDQA54/_new 2021-11-22 23:04:01.885962764 +0100 @@ -17,7 +17,7 @@ Name: kubic-control -Version: 0.12.1 +Version: 0.12.2 Release: 0 Summary: Simple setup tool for kubernetes License: Apache-2.0 ++++++ kubic-control-0.12.1.tar.xz -> kubic-control-0.12.2.tar.xz ++++++ Binary files old/kubic-control-0.12.1/.git/index and new/kubic-control-0.12.2/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.12.1/.git/logs/HEAD new/kubic-control-0.12.2/.git/logs/HEAD --- old/kubic-control-0.12.1/.git/logs/HEAD 2021-09-14 10:22:27.492305163 +0200 +++ new/kubic-control-0.12.2/.git/logs/HEAD 2021-11-19 14:47:13.589384458 +0100 @@ -1 +1 @@ -0000000000000000000000000000000000000000 6e17f7aae29931c384a8f403d4a2b25c22232b47 Thorsten Kukuk <[email protected]> 1631607747 +0200 clone: from https://github.com/thkukuk/kubic-control +0000000000000000000000000000000000000000 78d1d99f13958b1924010f1d7c0d8a1f04a3b888 Thorsten Kukuk <[email protected]> 1637329633 +0100 clone: from https://github.com/thkukuk/kubic-control diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.12.1/.git/logs/refs/heads/master new/kubic-control-0.12.2/.git/logs/refs/heads/master --- old/kubic-control-0.12.1/.git/logs/refs/heads/master 2021-09-14 10:22:27.492305163 +0200 +++ new/kubic-control-0.12.2/.git/logs/refs/heads/master 2021-11-19 14:47:13.589384458 +0100 @@ -1 +1 @@ -0000000000000000000000000000000000000000 6e17f7aae29931c384a8f403d4a2b25c22232b47 Thorsten Kukuk <[email protected]> 1631607747 +0200 clone: from https://github.com/thkukuk/kubic-control +0000000000000000000000000000000000000000 78d1d99f13958b1924010f1d7c0d8a1f04a3b888 Thorsten Kukuk <[email protected]> 1637329633 +0100 clone: from https://github.com/thkukuk/kubic-control diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.12.1/.git/logs/refs/remotes/origin/HEAD new/kubic-control-0.12.2/.git/logs/refs/remotes/origin/HEAD --- old/kubic-control-0.12.1/.git/logs/refs/remotes/origin/HEAD 2021-09-14 10:22:27.488305130 +0200 +++ new/kubic-control-0.12.2/.git/logs/refs/remotes/origin/HEAD 2021-11-19 14:47:13.585384427 +0100 @@ -1 +1 @@ -0000000000000000000000000000000000000000 6e17f7aae29931c384a8f403d4a2b25c22232b47 Thorsten Kukuk <[email protected]> 1631607747 +0200 clone: from https://github.com/thkukuk/kubic-control +0000000000000000000000000000000000000000 78d1d99f13958b1924010f1d7c0d8a1f04a3b888 Thorsten Kukuk <[email protected]> 1637329633 +0100 clone: from https://github.com/thkukuk/kubic-control Binary files old/kubic-control-0.12.1/.git/objects/pack/pack-2a0f6cfb014a03b8590cb0d3cd8b724ce0cda2d1.idx and new/kubic-control-0.12.2/.git/objects/pack/pack-2a0f6cfb014a03b8590cb0d3cd8b724ce0cda2d1.idx differ Binary files old/kubic-control-0.12.1/.git/objects/pack/pack-2a0f6cfb014a03b8590cb0d3cd8b724ce0cda2d1.pack and new/kubic-control-0.12.2/.git/objects/pack/pack-2a0f6cfb014a03b8590cb0d3cd8b724ce0cda2d1.pack differ Binary files old/kubic-control-0.12.1/.git/objects/pack/pack-60bdadcd5d74c7f51c4872f9d4a4dfb10a05621e.idx and new/kubic-control-0.12.2/.git/objects/pack/pack-60bdadcd5d74c7f51c4872f9d4a4dfb10a05621e.idx differ Binary files old/kubic-control-0.12.1/.git/objects/pack/pack-60bdadcd5d74c7f51c4872f9d4a4dfb10a05621e.pack and new/kubic-control-0.12.2/.git/objects/pack/pack-60bdadcd5d74c7f51c4872f9d4a4dfb10a05621e.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.12.1/.git/packed-refs new/kubic-control-0.12.2/.git/packed-refs --- old/kubic-control-0.12.1/.git/packed-refs 2021-09-14 10:22:27.488305130 +0200 +++ new/kubic-control-0.12.2/.git/packed-refs 2021-11-19 14:47:13.585384427 +0100 @@ -1,5 +1,5 @@ # pack-refs with: peeled fully-peeled sorted -6e17f7aae29931c384a8f403d4a2b25c22232b47 refs/remotes/origin/master +78d1d99f13958b1924010f1d7c0d8a1f04a3b888 refs/remotes/origin/master b5d6fc06c3bc9a1a242ad8263a3d8e71eadf5521 refs/tags/0.7.0 11f0daf7e39c6c8ca826819b9fa230952c167fc4 refs/tags/v0.1.0 9057fe22abd1cae79b7de5bad967f3d09735820e refs/tags/v0.10.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.12.1/.git/refs/heads/master new/kubic-control-0.12.2/.git/refs/heads/master --- old/kubic-control-0.12.1/.git/refs/heads/master 2021-09-14 10:22:27.492305163 +0200 +++ new/kubic-control-0.12.2/.git/refs/heads/master 2021-11-19 14:47:13.589384458 +0100 @@ -1 +1 @@ -6e17f7aae29931c384a8f403d4a2b25c22232b47 +78d1d99f13958b1924010f1d7c0d8a1f04a3b888 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.12.1/pkg/kubeadm/addNode.go new/kubic-control-0.12.2/pkg/kubeadm/addNode.go --- old/kubic-control-0.12.1/pkg/kubeadm/addNode.go 2021-09-14 10:22:27.496305197 +0200 +++ new/kubic-control-0.12.2/pkg/kubeadm/addNode.go 2021-11-19 14:47:13.593384490 +0100 @@ -89,10 +89,10 @@ // Differentiate between 'name1,name2' and 'name[1,2]' if strings.Index(nodeNames, ",") >= 0 && strings.Index(nodeNames, "[") == -1 { - success, message = tools.ExecuteCmd("salt", "--out=txt", + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", "--out=txt", "-L", nodeNames, "test.ping") } else { - success, message = tools.ExecuteCmd("salt", "--out=txt", + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", "--out=txt", nodeNames, "test.ping") } if success != true { @@ -121,7 +121,7 @@ stream.Send(&pb.StatusReply{Success: true, Message: nodelist[i] + ": adding node..."}) - success, message := tools.ExecuteCmd("salt", nodelist[i], "service.start", "crio") + success, message := tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodelist[i], "service.start", "crio") if success != true { if err := stream.Send(&pb.StatusReply{Success: false, Message: nodelist[i] + ": " + message}); err != nil { log.Errorf("Send message failed: %s", err) @@ -129,7 +129,7 @@ failed++ return } - success, message = tools.ExecuteCmd("salt", nodelist[i], "service.enable", "crio") + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodelist[i], "service.enable", "crio") if success != true { if err := stream.Send(&pb.StatusReply{Success: false, Message: nodelist[i] + ": " + message}); err != nil { log.Errorf("Send message failed: %s", err) @@ -137,7 +137,7 @@ failed++ return } - success, message = tools.ExecuteCmd("salt", nodelist[i], "service.start", "kubelet") + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodelist[i], "service.start", "kubelet") if success != true { if err := stream.Send(&pb.StatusReply{Success: false, Message: nodelist[i] + ": " + message}); err != nil { log.Errorf("Send message failed: %s", err) @@ -145,7 +145,7 @@ failed++ return } - success, message = tools.ExecuteCmd("salt", nodelist[i], "service.enable", "kubelet") + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodelist[i], "service.enable", "kubelet") if success != true { if err := stream.Send(&pb.StatusReply{Success: false, Message: nodelist[i] + ": " + message}); err != nil { log.Errorf("Send message failed: %s", err) @@ -156,7 +156,7 @@ stream.Send(&pb.StatusReply{Success: true, Message: nodelist[i] + ": joining cluster..."}) - success, message = tools.ExecuteCmd("salt", nodelist[i], "cmd.run", "\""+joincmd+"\"") + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodelist[i], "cmd.run", "\""+joincmd+"\"") if success != true { if err := stream.Send(&pb.StatusReply{Success: false, Message: nodelist[i] + ": " + message}); err != nil { log.Errorf("Send message failed: %s", err) @@ -164,7 +164,7 @@ failed++ return } - success, message = tools.ExecuteCmd("salt", nodelist[i], "grains.append", "kubicd", "kubic-"+nodeType+"-node") + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodelist[i], "grains.append", "kubicd", "kubic-"+nodeType+"-node") if success != true { if err := stream.Send(&pb.StatusReply{Success: false, Message: nodelist[i] + ": " + message}); err != nil { log.Errorf("Send message failed: %s", err) @@ -173,7 +173,7 @@ return } // Configure transactinal-update - success, message = tools.ExecuteCmd("salt", nodelist[i], "cmd.run", "if [ -f /etc/transactional-update.conf ]; then grep -q ^REBOOT_METHOD= /etc/transactional-update.conf && sed -i -e 's|REBOOT_METHOD=.*|REBOOT_METHOD=kured|g' /etc/transactional-update.conf || echo REBOOT_METHOD=kured >> /etc/transactional-update.conf ; else echo REBOOT_METHOD=kured > /etc/transactional-update.conf ; fi") + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodelist[i], "cmd.run", "if [ -f /etc/transactional-update.conf ]; then grep -q ^REBOOT_METHOD= /etc/transactional-update.conf && sed -i -e 's|REBOOT_METHOD=.*|REBOOT_METHOD=kured|g' /etc/transactional-update.conf || echo REBOOT_METHOD=kured >> /etc/transactional-update.conf ; else echo REBOOT_METHOD=kured > /etc/transactional-update.conf ; fi") if success != true { if err := stream.Send(&pb.StatusReply{Success: false, Message: nodelist[i] + ": " + message}); err != nil { log.Errorf("Send message failed: %s", err) @@ -185,7 +185,7 @@ if len(haproxy_salt) > 0 { stream.Send(&pb.StatusReply{Success: true, Message: nodelist[i] + ": adding node to haproxy loadbalancer..."}) - success, message = tools.ExecuteCmd("salt", haproxy_salt, "cmd.run", "haproxycfg server add "+nodelist[i]) + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", haproxy_salt, "cmd.run", "haproxycfg server add "+nodelist[i]) if success != true { if err := stream.Send(&pb.StatusReply{Success: false, Message: nodelist[i] + ": " + message}); err != nil { log.Errorf("Send message failed: %s", err) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.12.1/pkg/kubeadm/initMaster.go new/kubic-control-0.12.2/pkg/kubeadm/initMaster.go --- old/kubic-control-0.12.1/pkg/kubeadm/initMaster.go 2021-09-14 10:22:27.496305197 +0200 +++ new/kubic-control-0.12.2/pkg/kubeadm/initMaster.go 2021-11-19 14:47:13.593384490 +0100 @@ -51,7 +51,7 @@ func executeCmdSalt(salt string, command string, arg ...string) (bool, string) { if len(salt) > 0 { - return tools.ExecuteCmd("salt", salt, "cmd.run", command+" "+strings.Join(arg[:], " ")) + return tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", salt, "cmd.run", command+" "+strings.Join(arg[:], " ")) } else { return tools.ExecuteCmd(command, arg...) } @@ -60,7 +60,7 @@ // exists returns whether the given file or directory exists func exists(path string, salt string) (bool, error) { if len(salt) > 0 { - success, message := tools.ExecuteCmd("salt", "--out=txt", salt, "file.access", path, "f") + success, message := tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", "--out=txt", salt, "file.access", path, "f") if success != true { return false, errors.New(message) } @@ -178,7 +178,7 @@ } return nil } - success, message = tools.ExecuteCmd("salt", in.Haproxy, "cmd.run", + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", in.Haproxy, "cmd.run", "\"haproxycfg init --force "+in.MultiMaster+" "+hostname+"\"") if success != true { if err := stream.Send(&pb.StatusReply{Success: false, Message: message}); err != nil { @@ -333,7 +333,7 @@ // Get kubernetes/admin.conf for kubectl calls tools.ExecuteCmd("mkdir", "/etc/kubernetes") log.Infof("Download /etc/kubernetes/admin.conf") - success, message = tools.ExecuteCmd("salt", "--out=newline_values_only", + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", "--out=newline_values_only", "--out-file=/etc/kubernetes/admin.conf", arg_salt, "cmd.run", "cat /etc/kubernetes/admin.conf") if success != true { @@ -391,7 +391,7 @@ return nil } if len(arg_salt) > 0 { - success, message = tools.ExecuteCmd("salt", arg_salt, "grains.append", "kubicd", "kubic-master-node") + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", arg_salt, "grains.append", "kubicd", "kubic-master-node") if success != true { if err := stream.Send(&pb.StatusReply{Success: success, Message: message}); err != nil { return err diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.12.1/pkg/kubeadm/rebootNode.go new/kubic-control-0.12.2/pkg/kubeadm/rebootNode.go --- old/kubic-control-0.12.1/pkg/kubeadm/rebootNode.go 2021-09-14 10:22:27.496305197 +0200 +++ new/kubic-control-0.12.2/pkg/kubeadm/rebootNode.go 2021-11-19 14:47:13.593384490 +0100 @@ -31,7 +31,7 @@ return success, message } - success, message = tools.ExecuteCmd("salt", nodeName, "system.reboot") + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodeName, "system.reboot") if success != true { return success, message } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.12.1/pkg/kubeadm/removeNode.go new/kubic-control-0.12.2/pkg/kubeadm/removeNode.go --- old/kubic-control-0.12.1/pkg/kubeadm/removeNode.go 2021-09-14 10:22:27.496305197 +0200 +++ new/kubic-control-0.12.2/pkg/kubeadm/removeNode.go 2021-11-19 14:47:13.593384490 +0100 @@ -46,9 +46,9 @@ var message string if strings.Index(in.NodeNames, ",") >= 0 && strings.Index(in.NodeNames, "[") == -1 { - success, message = tools.ExecuteCmd("salt", "--out=txt", "-L", in.NodeNames, "grains.get", "kubicd") + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", "--out=txt", "-L", in.NodeNames, "grains.get", "kubicd") } else { - success, message = tools.ExecuteCmd("salt", "--out=txt", in.NodeNames, "grains.get", "kubicd") + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", "--out=txt", in.NodeNames, "grains.get", "kubicd") } if success != true { if err := stream.Send(&pb.StatusReply{Success: false, Message: message}); err != nil { @@ -92,7 +92,7 @@ // If loadbalancer is known, remove from haproxy if len(haproxy_salt) > 0 { stream.Send(&pb.StatusReply{Success: true, Message: nodelist[i] + ": removing node from haproxy loadbalancer..."}) - success, message := tools.ExecuteCmd("salt", haproxy_salt, "cmd.run", "haproxycfg server remove "+nodelist[i]) + success, message := tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", haproxy_salt, "cmd.run", "haproxycfg server remove "+nodelist[i]) if success != true { if err := stream.Send(&pb.StatusReply{Success: false, Message: nodelist[i] + ": " + message}); err != nil { log.Errorf("Send message failed: %s", err) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.12.1/pkg/kubeadm/reset.go new/kubic-control-0.12.2/pkg/kubeadm/reset.go --- old/kubic-control-0.12.1/pkg/kubeadm/reset.go 2021-09-14 10:22:27.496305197 +0200 +++ new/kubic-control-0.12.2/pkg/kubeadm/reset.go 2021-11-19 14:47:13.593384490 +0100 @@ -101,7 +101,7 @@ /* reset the node. Even if this fails, continue cleanup, but report back */ send(true, nodeName+": reset node...") - success, message = tools.ExecuteCmd("salt", nodeName, + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodeName, "cmd.run", "kubeadm reset --force") if success != true { send(success, nodeName+": "+message+" (ignored)") @@ -110,18 +110,18 @@ send(true, nodeName+": cleanup after kubeadm...") /* Try some system cleanup, ignore if fails */ - tools.ExecuteCmd("salt", nodeName, "cmd.run", + tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodeName, "cmd.run", "sed -i -e 's|^REBOOT_METHOD=kured|REBOOT_METHOD=auto|g' /etc/transactional-update.conf") - tools.ExecuteCmd("salt", nodeName, "grains.delkey", "kubicd") - tools.ExecuteCmd("salt", nodeName, "cmd.run", + tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodeName, "grains.delkey", "kubicd") + tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodeName, "cmd.run", "\"iptables -F && iptables -t nat -F && iptables -t mangle -F && iptables -X\"") - tools.ExecuteCmd("salt", nodeName, "cmd.run", "\"rm -rf /var/lib/etcd/*\"") - tools.ExecuteCmd("salt", nodeName, "cmd.run", "\"rm -rf /var/lib/cni/*\"") - tools.ExecuteCmd("salt", nodeName, "cmd.run", "\"ip link delete cni0; ip link delete flannel.1\"") - tools.ExecuteCmd("salt", nodeName, "service.disable", "kubelet") - tools.ExecuteCmd("salt", nodeName, "service.stop", "kubelet") - tools.ExecuteCmd("salt", nodeName, "service.disable", "crio") - tools.ExecuteCmd("salt", nodeName, "service.stop", "crio") + tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodeName, "cmd.run", "\"rm -rf /var/lib/etcd/*\"") + tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodeName, "cmd.run", "\"rm -rf /var/lib/cni/*\"") + tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodeName, "cmd.run", "\"ip link delete cni0; ip link delete flannel.1\"") + tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodeName, "service.disable", "kubelet") + tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodeName, "service.stop", "kubelet") + tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodeName, "service.disable", "crio") + tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodeName, "service.stop", "crio") /* ignore if we cannot delete the node*/ send(true, nodeName+": final node deletion...") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.12.1/pkg/kubeadm/upgradeKubernetes.go new/kubic-control-0.12.2/pkg/kubeadm/upgradeKubernetes.go --- old/kubic-control-0.12.1/pkg/kubeadm/upgradeKubernetes.go 2021-09-14 10:22:27.496305197 +0200 +++ new/kubic-control-0.12.2/pkg/kubeadm/upgradeKubernetes.go 2021-11-19 14:47:13.597384521 +0100 @@ -139,18 +139,18 @@ // if draining fails, ignore tools.DrainNode(hostname, "") - success, message = tools.ExecuteCmd("salt", nodelist[i], "cmd.run", + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodelist[i], "cmd.run", "\"kubeadm upgrade node\"") if success != true { failedNodes = failedNodes + nodelist[i] + " (kubeadm), " } else { // Update kubelet - success, message = tools.ExecuteCmd("salt", nodelist[i], "cmd.run", + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodelist[i], "cmd.run", "\"sed -i s/KUBELET_VER=.*/KUBELET_VER="+kubelet_version+"/ /etc/sysconfig/kubelet\"") if success != true { failedNodes = failedNodes + nodelist[i] + " (kubelet_ver), " } else { - success, message = tools.ExecuteCmd("salt", nodelist[i], "service.restart", "kubelet") + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", nodelist[i], "service.restart", "kubelet") if success != true { failedNodes = failedNodes + nodelist[i] + " (kubelet), " } @@ -185,7 +185,7 @@ } // XXX Check if kuberadm is new enough on all nodes - // salt '*' --out=txt pkg.version kubernetes-kubeadm + // salt '*' --module-executors='[direct_call]' --out=txt pkg.version kubernetes-kubeadm if err := upgradeFirstMaster(in, stream, kubernetes_version); err != nil { return err diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.12.1/pkg/tools/getKubeadmVersion.go new/kubic-control-0.12.2/pkg/tools/getKubeadmVersion.go --- old/kubic-control-0.12.1/pkg/tools/getKubeadmVersion.go 2021-09-14 10:22:27.504305265 +0200 +++ new/kubic-control-0.12.2/pkg/tools/getKubeadmVersion.go 2021-11-19 14:47:13.597384521 +0100 @@ -23,7 +23,7 @@ var success bool var message string if len(salt) > 0 { - success, message = ExecuteCmd("salt", "--out=txt", salt, "cmd.run", "rpm -q --qf '%{VERSION}' kubernetes-kubeadm") + success, message = ExecuteCmd("salt", "--module-executors='[direct_call]'", "--out=txt", salt, "cmd.run", "rpm -q --qf '%{VERSION}' kubernetes-kubeadm") message = strings.Replace(message, "\n", "", -1) i := strings.Index(message, ":") + 1 message = strings.TrimSpace(message[i:]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.12.1/pkg/tools/getListOfNodes.go new/kubic-control-0.12.2/pkg/tools/getListOfNodes.go --- old/kubic-control-0.12.1/pkg/tools/getListOfNodes.go 2021-09-14 10:22:27.504305265 +0200 +++ new/kubic-control-0.12.2/pkg/tools/getListOfNodes.go 2021-11-19 14:47:13.597384521 +0100 @@ -25,7 +25,7 @@ } // Get list of all nodes of this role - success, message := ExecuteCmd("salt", "-G", "kubicd:kubic-"+role+"-node", "grains.get", "kubic-"+role+"-node") + success, message := ExecuteCmd("salt", "--module-executors='[direct_call]'", "-G", "kubicd:kubic-"+role+"-node", "grains.get", "kubic-"+role+"-node") if success != true { return success, message, nil } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.12.1/pkg/tools/getNodeName.go new/kubic-control-0.12.2/pkg/tools/getNodeName.go --- old/kubic-control-0.12.1/pkg/tools/getNodeName.go 2021-09-14 10:22:27.504305265 +0200 +++ new/kubic-control-0.12.2/pkg/tools/getNodeName.go 2021-11-19 14:47:13.597384521 +0100 @@ -23,7 +23,7 @@ // salt host names are not identical with kubernetes node name. // Output of hostname should be identical to node name - success, message := ExecuteCmd("salt", target, "network.get_hostname") + success, message := ExecuteCmd("salt", "--module-executors='[direct_call]'", target, "network.get_hostname") if success != true { return target, errors.New(message) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.12.1/pkg/yomi/install.go new/kubic-control-0.12.2/pkg/yomi/install.go --- old/kubic-control-0.12.1/pkg/yomi/install.go 2021-09-14 10:22:27.504305265 +0200 +++ new/kubic-control-0.12.2/pkg/yomi/install.go 2021-11-19 14:47:13.597384521 +0100 @@ -39,7 +39,7 @@ } // make sure latest modules are used on minion - success, message := tools.ExecuteCmd("salt", in.Saltnode, "saltutil.sync_all") + success, message := tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", in.Saltnode, "saltutil.sync_all") if success != true { if err := stream.Send(&pb.StatusReply{Success: false, Message: message}); err != nil { @@ -49,7 +49,7 @@ } // wipe harddisk, else salt will not re-create them - success, message = tools.ExecuteCmd("salt", in.Saltnode, "state.apply", "yomi.storage.wipe") + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", in.Saltnode, "state.apply", "yomi.storage.wipe") if success != true { if err := stream.Send(&pb.StatusReply{Success: false, Message: message}); err != nil { @@ -59,7 +59,7 @@ } // Do final installation - success, message = tools.ExecuteCmd("salt", in.Saltnode, "state.sls", "yomi.installer") + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", in.Saltnode, "state.sls", "yomi.installer") if success != true { if err := stream.Send(&pb.StatusReply{Success: false, Message: message}); err != nil { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kubic-control-0.12.1/pkg/yomi/prepareConfig.go new/kubic-control-0.12.2/pkg/yomi/prepareConfig.go --- old/kubic-control-0.12.1/pkg/yomi/prepareConfig.go 2021-09-14 10:22:27.504305265 +0200 +++ new/kubic-control-0.12.2/pkg/yomi/prepareConfig.go 2021-11-19 14:47:13.597384521 +0100 @@ -74,7 +74,7 @@ } // make sure latest modules are used on minion - success, message := tools.ExecuteCmd("salt", in.Saltnode, "saltutil.sync_all") + success, message := tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", in.Saltnode, "saltutil.sync_all") if success != true { if err := stream.Send(&pb.StatusReply{Success: false, Message: message}); err != nil { @@ -117,7 +117,7 @@ useEfi := false if in.Efi == 0 { // UEFI or BIOS? - success, message = tools.ExecuteCmd("salt", "--out=txt", in.Saltnode, "cmd.run", + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", "--out=txt", in.Saltnode, "cmd.run", "test -f /sys/firmware/efi/systab && echo true || echo false") if success != true { if err := stream.Send(&pb.StatusReply{Success: false, @@ -154,7 +154,7 @@ useBareMetal := false if in.Baremetal == 0 { // bare metal or virtualisation? - success, message = tools.ExecuteCmd("salt", "--out=txt", in.Saltnode, "cmd.run", "systemd-detect-virt") + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", "--out=txt", in.Saltnode, "cmd.run", "systemd-detect-virt") if success != true { if err := stream.Send(&pb.StatusReply{Success: false, Message: message}); err != nil { @@ -191,7 +191,7 @@ if len(in.Disk) > 0 { entry = "{% set disk = '" + in.Disk + "' %}\n" } else { - success, message = tools.ExecuteCmd("salt", "--out=json", in.Saltnode, "devices.hwinfo", "disk") + success, message = tools.ExecuteCmd("salt", "--module-executors='[direct_call]'", "--out=json", in.Saltnode, "devices.hwinfo", "disk") if success != true { if err := stream.Send(&pb.StatusReply{Success: false, Message: message}); err != nil {
