feat(caddystorage): integrate CaddyStorage gRPC service in machine API

This commit is contained in:
Pasha Sviderski committed 2026-09-07 10:44:08 +10:00
1 parent 5e01db5e20
commit c6d0371f15
4 files changed
+195 -8

No files matched your search

+11 -1
View File
@@ -29,6 +29,7 @@ import (
"github.com/psviderski/uncloud/internal/journal"
apiproxy "github.com/psviderski/uncloud/internal/machine/api/proxy"
"github.com/psviderski/uncloud/internal/machine/caddyconfig"
"github.com/psviderski/uncloud/internal/machine/caddystorage"
"github.com/psviderski/uncloud/internal/machine/cluster"
"github.com/psviderski/uncloud/internal/machine/constants"
"github.com/psviderski/uncloud/internal/machine/corromigrate"
@@ -307,8 +308,15 @@ func NewMachine(config *Config) (*Machine, error) {
WaitForNetworkReady: m.WaitForNetworkReady,
})
caddyServer := caddyconfig.NewServer(caddyconfig.NewService(config.CaddyConfigDir))
caddyStore, err := corroStore.Keyspace(caddystorage.Namespace)
if err != nil {
return nil, fmt.Errorf("create namespaced cluster store for Caddy storage: %w", err)
}
caddyStorageServer := caddystorage.NewServer(caddyStore)
leaseServer := distlockgrpc.NewServer(distlock.NewMemoryStore())
m.localMachineServer = newGRPCServer(m, c, m.dockerServer, caddyServer, leaseServer)
m.localMachineServer = newGRPCServer(m, c, m.dockerServer, caddyServer, caddyStorageServer, leaseServer)
if m.Initialised() {
close(m.initialised)
@@ -322,6 +330,7 @@ func newGRPCServer(
c pb.ClusterServer,
d pb.DockerServer,
caddy pb.CaddyServer,
caddyStorage pb.CaddyStorageServer,
lease distlockgrpc.LeaseServer,
) *grpc.Server {
s := grpc.NewServer()
@@ -329,6 +338,7 @@ func newGRPCServer(
pb.RegisterClusterServer(s, c)
pb.RegisterDockerServer(s, d)
pb.RegisterCaddyServer(s, caddy)
pb.RegisterCaddyStorageServer(s, caddyStorage)
distlockgrpc.RegisterLeaseServer(s, lease)
return s
}