Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Require more tests] Bump Docker and Kubelet to eliminate CVE-2019-5736 #249

Merged
merged 2 commits into from
Feb 23, 2019
Merged

[Require more tests] Bump Docker and Kubelet to eliminate CVE-2019-5736 #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ae674c
set kube version to 1.13.3 , docker 18.09.2
md2k Feb 14, 2019
bd9206d
remove cri plugin entries
md2k Feb 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pkg/clustermanager/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion pkg/clustermanager/configs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions pkg/clustermanager/configs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/clustermanager/provision_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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)
Expand Down