fix run command, support 1 replica and global mode

This commit is contained in:
Pavel Sviderski
2024-12-05 16:24:04 +10:00
parent 3ac166e6cb
commit 3ce9c8be04
2 changed files with 52 additions and 35 deletions
+52 -24
View File
@@ -4,61 +4,89 @@ import (
"context"
"fmt"
"github.com/spf13/cobra"
"uncloud/internal/api"
"uncloud/internal/cli"
"uncloud/internal/cli/client"
"uncloud/internal/service"
)
type runOptions struct {
command []string
image string
machine string
mode string
name string
publish []string
cluster string
}
func NewRunCommand() *cobra.Command {
var (
cluster string
opts client.ServiceOptions
)
opts := runOptions{}
cmd := &cobra.Command{
Use: "run IMAGE",
Use: "run IMAGE [COMMAND...]",
Short: "Run a service.",
Args: cobra.ExactArgs(1),
Args: cobra.MinimumNArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
uncli := cmd.Context().Value("cli").(*cli.CLI)
opts.Image = args[0]
return runRun(cmd.Context(), uncli, cluster, &opts)
opts.image = args[0]
if len(args) > 1 {
opts.command = args[1:]
}
return runRun(cmd.Context(), uncli, opts)
},
}
cmd.Flags().StringVarP(&opts.Name, "name", "n", "",
"Assign a name to the service. A random name is generated if not specified.")
cmd.Flags().StringVarP(
&opts.Machine, "machine", "m", "",
"Name or ID of the machine to run the service on. (default is first available)",
)
cmd.Flags().StringVar(&opts.Mode, "mode", service.ModeReplicated,
// TODO: implement placement constraints and translate --machine to a constraint.
//cmd.Flags().StringVarP(
// &opts.machine, "machine", "m", "",
// "Name or ID of the machine to run the service on. (default is first available)",
//)
cmd.Flags().StringVar(&opts.mode, "mode", api.ServiceModeReplicated,
fmt.Sprintf("Replication mode of the service: either %q (a specified number of containers across "+
"the machines) or %q (one container on every machine).",
service.ModeReplicated, service.ModeGlobal))
cmd.Flags().StringSliceVarP(&opts.Publish, "publish", "p", nil,
api.ServiceModeReplicated, api.ServiceModeGlobal))
cmd.Flags().StringVarP(&opts.name, "name", "n", "",
"Assign a name to the service. A random name is generated if not specified.")
cmd.Flags().StringSliceVarP(&opts.publish, "publish", "p", nil,
"Publish a service port to make it accessible outside the cluster. Can be specified multiple times. "+
"Format: [load_balancer_port:]container_port[/protocol]")
cmd.Flags().StringVarP(
&cluster, "cluster", "c", "",
&opts.cluster, "cluster", "c", "",
"Name of the cluster to run the service in. (default is the current cluster)",
)
return cmd
}
func runRun(ctx context.Context, uncli *cli.CLI, clusterName string, opts *client.ServiceOptions) error {
c, err := uncli.ConnectCluster(ctx, clusterName)
func runRun(ctx context.Context, uncli *cli.CLI, opts runOptions) error {
switch opts.mode {
case "", api.ServiceModeReplicated, api.ServiceModeGlobal:
default:
return fmt.Errorf("invalid replication mode: %q", opts.mode)
}
c, err := uncli.ConnectCluster(ctx, opts.cluster)
if err != nil {
return fmt.Errorf("connect to cluster: %w", err)
}
defer c.Close()
resp, err := c.RunService(ctx, opts)
spec := api.ServiceSpec{
Container: api.ContainerSpec{
Command: opts.command,
Image: opts.image,
},
Mode: opts.mode,
Name: opts.name,
}
resp, err := c.RunService(ctx, spec)
if err != nil {
return fmt.Errorf("run service: %w", err)
}
fmt.Printf("Service %q started on machine %q.\n", resp.Name, resp.MachineName)
fmt.Printf("Service %q started.\n", resp.Name)
return nil
}