From dc616fd3a0e7ec193d284aad86ebeb3f86ebfce7 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Sat, 4 Sep 2021 21:19:34 +0200 Subject: [PATCH] refactor: drop swarm checking code for now Part of https://git.coopcloud.tech/coop-cloud/go-abra/issues/57. --- client/stack/stack.go | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/client/stack/stack.go b/client/stack/stack.go index fc582af4..8577f114 100644 --- a/client/stack/stack.go +++ b/client/stack/stack.go @@ -93,32 +93,6 @@ func GetAllDeployedServices(contextName string) StackStatus { return StackStatus{services, nil} } -func checkDaemonIsSwarmManager(contextName string) error { - cl, err := abraClient.NewClientWithContext(contextName) - if err != nil { - return err - } - info, err := cl.Info(context.Background()) - if err != nil { - return err - } - if !info.Swarm.ControlAvailable { - return errors.New("this server is not a swarm manager. Did you run \"abra server init\"?") - } - return nil -} - -func checkDaemonIsSwarmManagerViaClient(ctx context.Context, cl *dockerclient.Client) error { - info, err := cl.Info(ctx) - if err != nil { - return err - } - if !info.Swarm.ControlAvailable { - return errors.New("this node is not a swarm manager. Use \"docker swarm init\" or \"docker swarm join\" to connect this node to swarm and try again") - } - return nil -} - // validateStackName checks if the provided string is a valid stack name (namespace). // It currently only does a rudimentary check if the string is empty, or consists // of only whitespace and quoting characters. @@ -185,10 +159,6 @@ func validateResolveImageFlag(opts *Deploy) error { } func deployCompose(ctx context.Context, cl *dockerclient.Client, opts Deploy, config *composetypes.Config) error { - if err := checkDaemonIsSwarmManagerViaClient(ctx, cl); err != nil { - return err - } - namespace := convert.NewNamespace(opts.Namespace) if opts.Prune {