Skip to content

Modern Docker Management, Designed for Everyone

fix: umable to initialize new swarm cluster

Kyle Mendell073b9d385363
diff --git a/backend/internal/services/swarm_service.go b/backend/internal/services/swarm_service.go
index 29fa360cd..918d097fb 100644
--- a/backend/internal/services/swarm_service.go
+++ b/backend/internal/services/swarm_service.go
@@ -1,6 +1,7 @@
package services
import (
+ "bytes"
"context"
"encoding/json"
"errors"
@@ -36,6 +37,7 @@ var ErrSwarmManagerRequired = errors.New("swarm manager access required")
const swarmNodeIdentityProbeConcurrency = 5
const KVKeySwarmEnabled = "swarm.enabled"
+const defaultSwarmListenAddr = "0.0.0.0:2377"
// SwarmService provides Docker Swarm related operations.
type SwarmService struct {
@@ -867,6 +869,11 @@ func (s *SwarmService) InitSwarm(ctx context.Context, req swarmtypes.SwarmInitRe
return nil, fmt.Errorf("failed to connect to Docker: %w", err)
}
+ spec, err := decodeSwarmSpecInternal(req.Spec)
+ if err != nil {
+ return nil, err
+ }
+
defaultAddrPool := make([]netip.Prefix, 0, len(req.DefaultAddrPool))
for _, raw := range req.DefaultAddrPool {
prefix, err := netip.ParsePrefix(raw)
@@ -877,12 +884,12 @@ func (s *SwarmService) InitSwarm(ctx context.Context, req swarmtypes.SwarmInitRe
}
initResult, err := dockerClient.SwarmInit(ctx, dockerclient.SwarmInitOptions{
- ListenAddr: req.ListenAddr,
+ ListenAddr: defaultSwarmListenAddrInternal(req.ListenAddr),
AdvertiseAddr: req.AdvertiseAddr,
DataPathAddr: req.DataPathAddr,
DataPathPort: req.DataPathPort,
ForceNewCluster: req.ForceNewCluster,
- Spec: req.Spec,
+ Spec: spec,
AutoLockManagers: req.AutoLockManagers,
Availability: req.Availability,
DefaultAddrPool: defaultAddrPool,
@@ -904,7 +911,7 @@ func (s *SwarmService) JoinSwarm(ctx context.Context, req swarmtypes.SwarmJoinRe
}
if _, err := dockerClient.SwarmJoin(ctx, dockerclient.SwarmJoinOptions{
- ListenAddr: req.ListenAddr,
+ ListenAddr: defaultSwarmListenAddrInternal(req.ListenAddr),
AdvertiseAddr: req.AdvertiseAddr,
DataPathAddr: req.DataPathAddr,
RemoteAddrs: req.RemoteAddrs,
@@ -1047,9 +1054,14 @@ func (s *SwarmService) UpdateSwarmSpec(ctx context.Context, req swarmtypes.Swarm
version = infoResult.Swarm.Version.Index
}
+ spec, err := decodeSwarmSpecInternal(req.Spec)
+ if err != nil {
+ return err
+ }
+
if _, err := dockerClient.SwarmUpdate(ctx, dockerclient.SwarmUpdateOptions{
Version: swarm.Version{Index: version},
- Spec: req.Spec,
+ Spec: spec,
RotateWorkerToken: req.RotateWorkerToken,
RotateManagerToken: req.RotateManagerToken,
RotateManagerUnlockKey: req.RotateManagerUnlockKey,
@@ -1832,6 +1844,33 @@ func decodeConfigSpecInternal(raw json.RawMessage) (swarm.ConfigSpec, error) {
return spec, nil
}
+func decodeSwarmSpecInternal(raw json.RawMessage) (swarm.Spec, error) {
+ trimmed := bytes.TrimSpace(raw)
+ if len(trimmed) == 0 || bytes.Equal(trimmed, []byte("null")) {
+ return swarm.Spec{}, errors.New("swarm spec is required")
+ }
+
+ var spec swarm.Spec
+ if err := json.Unmarshal(trimmed, &spec); err != nil {
+ return swarm.Spec{}, fmt.Errorf("failed to parse swarm spec: %w", err)
+ }
+
+ if spec.Labels == nil {
+ spec.Labels = map[string]string{}
+ }
+
+ return spec, nil
+}
+
+func defaultSwarmListenAddrInternal(listenAddr string) string {
+ trimmed := strings.TrimSpace(listenAddr)
+ if trimmed == "" {
+ return defaultSwarmListenAddr
+ }
+
+ return trimmed
+}
+
func decodeSecretSpecInternal(raw json.RawMessage) (swarm.SecretSpec, error) {
if len(raw) == 0 || strings.TrimSpace(string(raw)) == "" || strings.TrimSpace(string(raw)) == "null" {
return swarm.SecretSpec{}, errors.New("secret spec is required")
diff --git a/backend/internal/services/swarm_service_test.go b/backend/internal/services/swarm_service_test.go
index 7b3c68c0e..74fd5f5c5 100644
--- a/backend/internal/services/swarm_service_test.go
+++ b/backend/internal/services/swarm_service_test.go
@@ -2,6 +2,7 @@ package services
import (
"context"
+ "encoding/json"
"net/http"
"net/http/httptest"
"testing"
@@ -10,6 +11,24 @@ import (
"github.com/stretchr/testify/require"
)
+func TestDecodeSwarmSpecInternal_AllowsEmptyObject(t *testing.T) {
+ spec, err := decodeSwarmSpecInternal(json.RawMessage(`{}`))
+ require.NoError(t, err)
+ require.NotNil(t, spec.Labels)
+ require.Empty(t, spec.Labels)
+}
+
+func TestDecodeSwarmSpecInternal_RejectsNull(t *testing.T) {
+ _, err := decodeSwarmSpecInternal(json.RawMessage(`null`))
+ require.EqualError(t, err, "swarm spec is required")
+}
+
+func TestDefaultSwarmListenAddrInternal(t *testing.T) {
+ require.Equal(t, defaultSwarmListenAddr, defaultSwarmListenAddrInternal(""))
+ require.Equal(t, defaultSwarmListenAddr, defaultSwarmListenAddrInternal(" "))
+ require.Equal(t, "eth0:2377", defaultSwarmListenAddrInternal(" eth0:2377 "))
+}
+
func TestSwarmService_FetchSwarmNodeIdentityViaEdgeInternal_UsesEnvironmentAccessToken(t *testing.T) {
ctx := context.Background()
db := setupEnvironmentServiceTestDB(t)
diff --git a/types/swarm/lifecycle.go b/types/swarm/lifecycle.go
index daf6eac1e..7cad4dc52 100644
--- a/types/swarm/lifecycle.go
+++ b/types/swarm/lifecycle.go
@@ -1,6 +1,8 @@
package swarm
import (
+ "encoding/json"
+
"github.com/moby/moby/api/types/swarm"
)
@@ -10,7 +12,7 @@ type SwarmInitRequest struct {
DataPathAddr string `json:"dataPathAddr,omitempty"`
DataPathPort uint32 `json:"dataPathPort,omitempty"`
ForceNewCluster bool `json:"forceNewCluster,omitempty"`
- Spec swarm.Spec `json:"spec"`
+ Spec json.RawMessage `json:"spec" doc:"Swarm specification"`
AutoLockManagers bool `json:"autoLockManagers,omitempty"`
Availability swarm.NodeAvailability `json:"availability,omitempty"`
DefaultAddrPool []string `json:"defaultAddrPool,omitempty"`
@@ -53,9 +55,9 @@ type SwarmRotateJoinTokensRequest struct {
}
type SwarmUpdateRequest struct {
- Version uint64 `json:"version,omitempty"`
- Spec swarm.Spec `json:"spec"`
- RotateWorkerToken bool `json:"rotateWorkerToken,omitempty"`
- RotateManagerToken bool `json:"rotateManagerToken,omitempty"`
- RotateManagerUnlockKey bool `json:"rotateManagerUnlockKey,omitempty"`
+ Version uint64 `json:"version,omitempty"`
+ Spec json.RawMessage `json:"spec" doc:"Updated swarm specification"`
+ RotateWorkerToken bool `json:"rotateWorkerToken,omitempty"`
+ RotateManagerToken bool `json:"rotateManagerToken,omitempty"`
+ RotateManagerUnlockKey bool `json:"rotateManagerUnlockKey,omitempty"`
}