refactor: embed ServiceSpecResolver into Deployment to handle spec only there

This commit is contained in:
Pavel Sviderski committed 2025-03-24 20:10:28 +10:00
1 parent 7a9d0cf9db
commit 3910101a88
17 files changed
+191 -148

No files matched your search

+1 -1
View File
@@ -136,7 +136,7 @@ func add(ctx context.Context, uncli *cli.CLI, remoteMachine cli.RemoteMachine, o
}
}
d, err := machineClient.NewCaddyDeployment(caddyImage, filter)
d, err := machineClient.NewCaddyDeployment(ctx, caddyImage, filter)
if err != nil {
return fmt.Errorf("create caddy deployment: %w", err)
}
+3 -3
View File
@@ -4,14 +4,14 @@ import (
"context"
"fmt"
"github.com/docker/compose/v2/pkg/progress"
"github.com/spf13/cobra"
"net/netip"
"github.com/psviderski/uncloud/cmd/uncloud/caddy"
"github.com/psviderski/uncloud/cmd/uncloud/dns"
"github.com/psviderski/uncloud/internal/cli"
"github.com/psviderski/uncloud/internal/cli/config"
"github.com/psviderski/uncloud/internal/machine/api/pb"
"github.com/psviderski/uncloud/internal/machine/cluster"
"github.com/spf13/cobra"
"net/netip"
)
type initOptions struct {
@@ -132,7 +132,7 @@ func initCluster(ctx context.Context, uncli *cli.CLI, remoteMachine *cli.RemoteM
}
if !opts.noCaddy {
d, err := client.NewCaddyDeployment("", nil)
d, err := client.NewCaddyDeployment(ctx, "", nil)
if err != nil {
return fmt.Errorf("create caddy deployment: %w", err)
}