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

fix external worker flow #330

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix external worker flow #330

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c562d5c
fix external worker flow
xetys Jun 25, 2020
4bc8009
Merge branch 'master' into fix-external-worker
xetys Mar 16, 2021
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
84 changes: 43 additions & 41 deletions cmd/cluster_add_external_worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var clusterAddExternalWorkerCmd = &cobra.Command{
Long: `This lets you add an external server to your cluster.

An external server must meet the following requirements:
- ubuntu 16.04
- ubuntu 18.04
- a unique hostname, that doesn't collide with an existing node name
- accessible with the same SSH key as used for the cluster`,
PreRunE: func(cmd *cobra.Command, args []string) error {
Expand Down Expand Up @@ -48,34 +48,6 @@ An external server must meet the following requirements:
return errors.New("your cluster has no nodes, no idea how this was possible")
}

externalNode := clustermanager.Node{
IPAddress: ipAddress,
SSHKeyName: cluster.Nodes[0].SSHKeyName,
}

// check the host name
hostname, err := AppConf.SSHClient.RunCmd(externalNode, "hostname -s")
hostname = strings.TrimSpace(hostname)
// this also implies the check that SSH is working
if err != nil {
return err
}

for _, node := range cluster.Nodes {
if node.Name == hostname {
return fmt.Errorf("there is already a node with the name '%s'", hostname)
}
}

// check ubuntu 16.04
issue, err := AppConf.SSHClient.RunCmd(externalNode, "cat /etc/issue | xargs")
if err != nil {
return err
}
if !strings.Contains(issue, "Ubuntu 16.04") {
return errors.New("target server has no Ubuntu 16.04 installed")
}

return nil
},
Run: func(cmd *cobra.Command, args []string) {
Expand Down Expand Up @@ -104,10 +76,31 @@ An external server must meet the following requirements:
SSHKeyName: sshKeyName,
}

sshClient := AppConf.SSHClient
hostname, err := sshClient.RunCmd(externalNode, "hostname -s")
// check the host name
hostname, err := AppConf.SSHClient.RunCmd(externalNode, "hostname -s")
hostname = strings.TrimSpace(hostname)
FatalOnError(err)
// this also implies the check that SSH is working
if err != nil {
log.Fatal(err)
}

for _, node := range cluster.Nodes {
if node.Name == hostname {
log.Fatal(fmt.Errorf("there is already a node with the name '%s'", hostname))

}
}

// check ubuntu 18.04
issue, err := AppConf.SSHClient.RunCmd(externalNode, "cat /etc/issue | xargs")
if err != nil {
log.Fatal(err)
}
if !strings.Contains(issue, "Ubuntu 18.04") {
log.Fatal(errors.New("target server has no Ubuntu 18.04 installed"))
}

sshClient := AppConf.SSHClient
externalNode.Name = hostname

cidrPrefix, err := clustermanager.PrivateIPPrefix(cluster.NodeCIDR)
Expand All @@ -116,18 +109,26 @@ An external server must meet the following requirements:
}

// render internal IP address
nextNode := 21
outer:
for {
for _, node := range cluster.Nodes {
if node.PrivateIPAddress == fmt.Sprintf("%s.%d", cidrPrefix, nextNode) {
nextNode++
continue outer
internalIpAddress, _ := cmd.Flags().GetString("internal-ip")
if internalIpAddress > "" {
externalNode.PrivateIPAddress = internalIpAddress
} else {
nextNode := 21
outer:
for {
for _, node := range cluster.Nodes {
if node.PrivateIPAddress == fmt.Sprintf("%s.%d", cidrPrefix, nextNode) {
nextNode++
continue outer
}
}
break
}
break
externalNode.PrivateIPAddress = fmt.Sprintf("%s.%d", cidrPrefix, nextNode)
}
externalNode.PrivateIPAddress = fmt.Sprintf("%s.%d", cidrPrefix, nextNode)

// some info before stuff gets serious
fmt.Printf("Creating node %s (%s external, %s internal)...\n", hostname, externalNode.IPAddress, externalNode.PrivateIPAddress)
coordinator := pkg.NewProgressCoordinator()
hetznerProvider := hetzner.NewHetznerProvider(AppConf.Context, AppConf.Client, *cluster, AppConf.CurrentContext.Token)
clusterManager := clustermanager.NewClusterManagerFromCluster(*cluster, hetznerProvider, sshClient, coordinator)
Expand Down Expand Up @@ -177,4 +178,5 @@ func init() {

clusterAddExternalWorkerCmd.Flags().StringP("name", "n", "", "Name of the cluster to add the workers to")
clusterAddExternalWorkerCmd.Flags().StringP("ip", "i", "", "The IP address of the external node")
clusterAddExternalWorkerCmd.Flags().StringP("internal-ip", "p", "", "The internal IP address of the external node")
}
2 changes: 1 addition & 1 deletion pkg/clustermanager/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,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"+
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line wasn't working on a bare-metal node for some reason. Anyone knows why we need this?

"for i in ip_vs ip_vs_rr ip_vs_wrr ip_vs_sh ; do modprobe $i; done"+
" && kubeadm reset -f && "+joinCommand)
if err != nil {
errChan <- err
Expand Down