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

Ubuntu 20 04 #336

Closed
wants to merge 4 commits into from
Closed

Ubuntu 20 04 #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb601ce
ubuntu 16.04 -> 20.04
tmemenga Jun 14, 2020
c30050c
FELIX_IGNORELOOSERPF=true workaround for ubuntu 20.04
tmemenga Jul 19, 2020
81c50e9
reformatting
tmemenga Jul 19, 2020
32871a4
reformatting
tmemenga Jul 19, 2020
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
4 changes: 2 additions & 2 deletions cmd/cluster_add_external_worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ An external server must meet the following requirements:
if err != nil {
return err
}
if !strings.Contains(issue, "Ubuntu 16.04") {
return errors.New("target server has no Ubuntu 16.04 installed")
if !strings.Contains(issue, "Ubuntu 20.04") {
return errors.New("target server has no Ubuntu 20.04 installed")
}

return nil
Expand Down
4 changes: 3 additions & 1 deletion pkg/clustermanager/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@ func (manager *Manager) InstallMasters(keepCerts KeepCerts) error {
{"kubeadm init", "kubectl version > /dev/null &> /dev/null || kubeadm init --ignore-preflight-errors=all --config /root/master-config.yaml"},
{"configure kubectl", "rm -rf $HOME/.kube && mkdir -p $HOME/.kube && cp -i /etc/kubernetes/admin.conf $HOME/.kube/config && chown $(id -u):$(id -g) $HOME/.kube/config"},
{"install canal", "kubectl apply -f https://docs.projectcalico.org/v3.10/manifests/canal.yaml"},
// fixes canal restarts, see https://github.com/xetys/hetzner-kube/issues/329#issuecomment-644137538
{"setting FELIX_IGNORELOOSERPF=true", "kubectl -n kube-system set env daemonset/canal FELIX_IGNORELOOSERPF=true"},
}

// inject custom commands
Expand Down Expand Up @@ -374,7 +376,7 @@ func (manager *Manager) InstallWorkers(nodes []Node) error {
manager.eventService.AddEvent(node.Name, "registering node")
_, err := manager.nodeCommunicator.RunCmd(
node,
"for i in ip_vs ip_vs_rr ip_vs_wrr ip_vs_sh nf_conntrack_ipv4; do modprobe $i; done"+
"for i in ip_vs ip_vs_rr ip_vs_wrr ip_vs_sh nf_conntrack; do modprobe $i; done"+
" && kubeadm reset -f && "+joinCommand)
if err != nil {
errChan <- err
Expand Down
2 changes: 1 addition & 1 deletion pkg/clustermanager/provision_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ func (provisioner *NodeProvisioner) prepareDocker() error {
// docker-ce
aptPreferencesDocker := `
Package: docker-ce
Pin: version 18.09.2~3-0~ubuntu-bionic
Pin: version 19.03.11~3-0~ubuntu-focal
Pin-Priority: 1000
`
err := provisioner.communicator.WriteFile(provisioner.node, "/etc/apt/preferences.d/docker-ce", aptPreferencesDocker, AllRead)
Expand Down
2 changes: 1 addition & 1 deletion pkg/hetzner/hetzner_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func (provider *Provider) CreateNodes(suffix string, template clustermanager.Nod
Name: template.Type,
},
Image: &hcloud.Image{
Name: "ubuntu-18.04",
Name: "ubuntu-20.04",
},
}

Expand Down