fixes due to rebase

This commit is contained in:
Matthew R Kasun
2022-01-20 15:41:06 -05:00
parent 639f129407
commit b15a5112fc
9 changed files with 32 additions and 47 deletions

View File

@@ -26,7 +26,7 @@ const KUBERNETES_LISTEN_PORT = 31821
const KUBERNETES_SERVER_MTU = 1024
// ServerJoin - responsible for joining a server to a network
func ServerJoin(networkSettings *models.Network, serverID string) error {
func ServerJoin(networkSettings *models.Network) error {
if networkSettings == nil || networkSettings.NetID == "" {
return errors.New("no network provided")