From 4d560df99c04b2224807cf3e48a35ee217df74cb Mon Sep 17 00:00:00 2001 From: Artiom Diomin Date: Mon, 13 May 2019 16:53:51 +0300 Subject: [PATCH 1/2] Fix setenforce in case if it's already disabled Signed-off-by: Artiom Diomin --- pkg/installer/installation/prerequisites.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/installer/installation/prerequisites.go b/pkg/installer/installation/prerequisites.go index 6e9d3d4e7..2f735a3cc 100644 --- a/pkg/installer/installation/prerequisites.go +++ b/pkg/installer/installation/prerequisites.go @@ -214,7 +214,7 @@ sudo apt-mark hold docker-ce kubelet kubeadm kubectl kubernetes-cni const kubeadmCentOSCommand = ` sudo swapoff -a sudo sed -i '/.*swap.*/d' /etc/fstab -sudo setenforce 0 +sudo setenforce 0 || true sudo sed -i s/SELINUX=enforcing/SELINUX=permissive/g /etc/sysconfig/selinux source /etc/kubeone/proxy-env From 69f81b61636e8d762350316925637d6e40779cc8 Mon Sep 17 00:00:00 2001 From: Artiom Diomin Date: Mon, 13 May 2019 17:11:41 +0300 Subject: [PATCH 2/2] Use id -u and id -g to identify remote user Signed-off-by: Artiom Diomin --- pkg/certificate/ca.go | 2 +- pkg/installer/installation/kubeconfig.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/certificate/ca.go b/pkg/certificate/ca.go index c64a62393..b76712f0d 100644 --- a/pkg/certificate/ca.go +++ b/pkg/certificate/ca.go @@ -37,7 +37,7 @@ sudo cp /etc/kubernetes/pki/front-proxy-ca.crt ./{{ .WORK_DIR }}/pki/ sudo cp /etc/kubernetes/pki/front-proxy-ca.key ./{{ .WORK_DIR }}/pki/ sudo cp /etc/kubernetes/pki/etcd/ca.{crt,key} ./{{ .WORK_DIR }}/pki/etcd/ -sudo chown -R "$USER:$USER" ./{{ .WORK_DIR }} +sudo chown -R "$(id -u):$(id -g)" ./{{ .WORK_DIR }} `, util.TemplateVariables{ "WORK_DIR": ctx.WorkDir, }) diff --git a/pkg/installer/installation/kubeconfig.go b/pkg/installer/installation/kubeconfig.go index c568fc0ef..3e4a61381 100644 --- a/pkg/installer/installation/kubeconfig.go +++ b/pkg/installer/installation/kubeconfig.go @@ -34,7 +34,7 @@ func copyKubeconfig(ctx *util.Context) error { _, _, err := ctx.Runner.Run(` mkdir -p $HOME/.kube/ sudo cp /etc/kubernetes/admin.conf $HOME/.kube/config -sudo chown $(id -u):$(id -u) $HOME/.kube/config +sudo chown $(id -u):$(id -g) $HOME/.kube/config `, util.TemplateVariables{}) if err != nil { return err