Merge pull request #249 from md2k/docker_bump

[Require more tests] Bump Docker and Kubelet to eliminate CVE-2019-5736
xetys · Feb 23, 2019 · 2f1368c · 2f1368c
2 parents 08d252f + bd9206d
commit 2f1368c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/pkg/clustermanager/cluster.go b/pkg/clustermanager/cluster.go
@@ -336,7 +336,6 @@ func (manager *Manager) InstallWorkers(nodes []Node) error {
 	if err != nil {
 		return err
 	}
-	joinCommand = fmt.Sprintf("%s --cri-socket /var/run/docker/containerd/docker-containerd.sock", strings.TrimRight(joinCommand, "\n"))
 
 	errChan := make(chan error)
 	trueChan := make(chan bool)

diff --git a/pkg/clustermanager/configs.go b/pkg/clustermanager/configs.go
@@ -24,7 +24,6 @@ apiEndpoint:
   advertiseAddress: %s
   bindPort: 6443
 nodeRegistration:
-  criSocket: /var/run/docker/containerd/docker-containerd.sock
   taints:
   - effect: NoSchedule
     key: node-role.kubernetes.io/master

diff --git a/pkg/clustermanager/configs_test.go b/pkg/clustermanager/configs_test.go
@@ -26,7 +26,6 @@ apiEndpoint:
   advertiseAddress: 10.0.0.1
   bindPort: 6443
 nodeRegistration:
-  criSocket: /var/run/docker/containerd/docker-containerd.sock
   taints:
   - effect: NoSchedule
     key: node-role.kubernetes.io/master
@@ -56,7 +55,6 @@ apiEndpoint:
   advertiseAddress: 10.0.0.1
   bindPort: 6443
 nodeRegistration:
-  criSocket: /var/run/docker/containerd/docker-containerd.sock
   taints:
   - effect: NoSchedule
     key: node-role.kubernetes.io/master

diff --git a/pkg/clustermanager/provision_node.go b/pkg/clustermanager/provision_node.go
@@ -11,7 +11,7 @@ import (
 const maxErrors = 3
 
 // K8sVersion is the version that will be used to install kubernetes
-var K8sVersion = flag.String("k8s-version", "1.13.2-00", "The version of the k8s debian packages that will be used during provisioning")
+var K8sVersion = flag.String("k8s-version", "1.13.3-00", "The version of the k8s debian packages that will be used during provisioning")
 
 // NodeProvisioner provisions all basic packages to install docker, kubernetes and wireguard
 type NodeProvisioner struct {
@@ -206,7 +206,7 @@ func (provisioner *NodeProvisioner) prepareDocker() error {
 	// docker-ce
 	aptPreferencesDocker := `
 Package: docker-ce
-Pin: version 18.06.0~ce~3-0~ubuntu
+Pin: version 18.09.2~3-0~ubuntu-bionic
 Pin-Priority: 1000
 	`
 	err := provisioner.communicator.WriteFile(provisioner.node, "/etc/apt/preferences.d/docker-ce", aptPreferencesDocker, false)