feat(compose): plan compose deployment

This commit is contained in:
Pavel Sviderski
2025-03-15 20:43:30 +10:00
parent c7355afa3d
commit 34574e41fc
4 changed files with 87 additions and 20 deletions
+39 -10
View File
@@ -1,14 +1,43 @@
package client package client
import "github.com/compose-spec/compose-go/v2/types" import (
"context"
"fmt"
"github.com/compose-spec/compose-go/v2/graph"
"github.com/compose-spec/compose-go/v2/types"
"uncloud/internal/compose"
)
type ComposeDeployment struct { func PlanComposeDeployment(ctx context.Context, project *types.Project, cli *Client) (SequenceOperation, error) {
project *types.Project plan := SequenceOperation{}
err := graph.InDependencyOrder(ctx, project,
func(ctx context.Context, name string, service types.ServiceConfig) error {
spec, err := compose.ServiceSpecFromCompose(name, service)
if err != nil {
return fmt.Errorf("convert compose service '%s' to service spec: %w", name, err)
}
if spec, err = cli.PrepareDeploymentSpec(ctx, spec); err != nil {
return fmt.Errorf("prepare service '%s' spec ready for deployment: %w", name, err)
}
// TODO: properly handle dependency conditions in the service deployment plan as the first operation.
deploy, err := cli.NewDeployment(spec, nil)
if err != nil {
return fmt.Errorf("create deployment for service '%s': %w", name, err)
}
servicePlan, err := deploy.Plan(ctx)
if err != nil {
return fmt.Errorf("create deployment plan for service '%s': %w", name, err)
}
// Skip no-op (up-to-date) service plans.
if len(servicePlan.Operations) > 0 {
plan.Operations = append(plan.Operations, &servicePlan)
}
return nil
})
return plan, err
} }
func NewComposeDeployment(project *types.Project) *ComposeDeployment {
return &ComposeDeployment{project: project}
}
// TODO: implement Plan method to generate a deployment plan that consists of a sequence of operations with
// service Deployments.
+6 -8
View File
@@ -12,23 +12,21 @@ type PortsSource []string
// TransformServicesPortsExtension transforms the ports extension of all services in the project by replacing a string // TransformServicesPortsExtension transforms the ports extension of all services in the project by replacing a string
// representation of each port with a parsed PortSpec. // representation of each port with a parsed PortSpec.
func transformServicesPortsExtension(project *types.Project) error { func transformServicesPortsExtension(project *types.Project) (*types.Project, error) {
for name, service := range project.Services { return project.WithServicesTransform(func(name string, service types.ServiceConfig) (types.ServiceConfig, error) {
ports, ok := service.Extensions[PortsExtensionKey].(PortsSource) ports, ok := service.Extensions[PortsExtensionKey].(PortsSource)
if !ok { if !ok {
continue return service, nil
} }
specs, err := transformPortsExtension(ports) specs, err := transformPortsExtension(ports)
if err != nil { if err != nil {
return err return service, err
} }
service.Extensions[PortsExtensionKey] = specs service.Extensions[PortsExtensionKey] = specs
project.Services[name] = service return service, nil
} })
return nil
} }
func transformPortsExtension(ports PortsSource) ([]api.PortSpec, error) { func transformPortsExtension(ports PortsSource) ([]api.PortSpec, error) {
+2 -2
View File
@@ -18,7 +18,7 @@ func LoadProject(ctx context.Context, paths []string) (*types.Project, error) {
composecli.WithConfigFileEnv, composecli.WithConfigFileEnv,
// If none was selected, get default compose.yaml file from current dir or parent folders. // If none was selected, get default compose.yaml file from current dir or parent folders.
composecli.WithDefaultConfigPath, composecli.WithDefaultConfigPath,
composecli.WithExtension("x-ports", PortsSource{}), composecli.WithExtension(PortsExtensionKey, PortsSource{}),
) )
if err != nil { if err != nil {
return nil, fmt.Errorf("create compose parser options: %w", err) return nil, fmt.Errorf("create compose parser options: %w", err)
@@ -29,7 +29,7 @@ func LoadProject(ctx context.Context, paths []string) (*types.Project, error) {
return nil, err return nil, err
} }
if err = transformServicesPortsExtension(project); err != nil { if project, err = transformServicesPortsExtension(project); err != nil {
return nil, err return nil, err
} }
+40
View File
@@ -0,0 +1,40 @@
package compose
import (
"fmt"
"github.com/compose-spec/compose-go/v2/types"
"uncloud/internal/api"
)
func ServiceSpecFromCompose(name string, service types.ServiceConfig) (api.ServiceSpec, error) {
spec := api.ServiceSpec{
Container: api.ContainerSpec{
Command: service.Command,
Image: service.Image,
Init: service.Init,
// TODO: env
// TODO: volumes
},
Name: name,
}
if ports, ok := service.Extensions[PortsExtensionKey].([]api.PortSpec); ok {
spec.Ports = ports
}
if service.Deploy != nil {
switch service.Deploy.Mode {
case "global":
spec.Mode = api.ServiceModeGlobal
case "", "replicated":
spec.Mode = api.ServiceModeReplicated
if service.Deploy.Replicas != nil {
spec.Replicas = uint(*service.Deploy.Replicas)
}
default:
return spec, fmt.Errorf("unsupported deploy mode: %s", service.Deploy.Mode)
}
}
return spec, nil
}