@@ -469,12 +469,11 @@ func serverJoin(cluster *shared.Cluster,
469469 serverLeaderIP , token , version , channel , newExternalIP , newPrivateIP string ) error {
470470 if cluster .NodeOS == "slemicro" {
471471 return serverJoinSlemicro (cluster , awsClient , serverLeaderIP , token , version , channel , newExternalIP , newPrivateIP )
472- } else {
473- joinStepsErr := joinSteps (cluster , serverLeaderIP , token , version , channel ,
474- newExternalIP , newPrivateIP , "both" )
475- if joinStepsErr != nil {
476- return shared .ReturnLogError ("error joining node %w\n " , joinStepsErr )
477- }
472+ }
473+ joinStepsErr := joinSteps (cluster , serverLeaderIP , token , version , channel ,
474+ newExternalIP , newPrivateIP , "both" )
475+ if joinStepsErr != nil {
476+ return shared .ReturnLogError ("error joining node %w\n " , joinStepsErr )
478477 }
479478
480479 return nil
@@ -626,16 +625,15 @@ func joinAgent(cluster *shared.Cluster, awsClient *aws.Client,
626625 serverIp , token , version , channel , selfExternalIp , selfPrivateIp string ) error {
627626 if cluster .NodeOS == "slemicro" {
628627 return joinAgentSlemicro (cluster , awsClient , serverIp , token , version , channel , selfExternalIp , selfPrivateIp )
629- } else {
630- cmd , parseErr := buildJoinCmd (cluster , agent , serverIp , token , version ,
631- channel , selfExternalIp , selfPrivateIp , "both" )
632- if parseErr != nil {
633- return shared .ReturnLogError ("error parsing join(both) commands: %w\n " , parseErr )
634- }
628+ }
629+ cmd , parseErr := buildJoinCmd (cluster , agent , serverIp , token , version ,
630+ channel , selfExternalIp , selfPrivateIp , "both" )
631+ if parseErr != nil {
632+ return shared .ReturnLogError ("error parsing join(both) commands: %w\n " , parseErr )
633+ }
635634
636- if joinErr := executeJoinCmd (cmd , selfExternalIp , true ); joinErr != nil {
637- return shared .ReturnLogError ("error on step join(both) on agent node: %w\n " , joinErr )
638- }
635+ if joinErr := executeJoinCmd (cmd , selfExternalIp , true ); joinErr != nil {
636+ return shared .ReturnLogError ("error on step join(both) on agent node: %w\n " , joinErr )
639637 }
640638
641639 return nil
0 commit comments