From 2977dad56ad04264c41a9a7eb1af37c4460e961c Mon Sep 17 00:00:00 2001 From: Seongmin Lee Date: Fri, 12 Dec 2025 17:04:15 +0900 Subject: [PATCH] wip: make spindle work in my machine Signed-off-by: Seongmin Lee --- appview/pipelines/pipelines.go | 8 ++++---- appview/state/knotstream.go | 2 +- appview/state/spindlestream.go | 2 +- nix/vm.nix | 3 ++- spindle/models/clone.go | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/appview/pipelines/pipelines.go b/appview/pipelines/pipelines.go index 8194354e..6017942a 100644 --- a/appview/pipelines/pipelines.go +++ b/appview/pipelines/pipelines.go @@ -219,9 +219,9 @@ func (p *Pipelines) Logs(w http.ResponseWriter, r *http.Request) { } scheme := "wss" - if p.config.Core.Dev { - scheme = "ws" - } + // if p.config.Core.Dev { + // scheme = "ws" + // } url := scheme + "://" + strings.Join([]string{spindle, "logs", knot, rkey, workflow}, "/") l = l.With("url", url) @@ -378,7 +378,7 @@ func (p *Pipelines) Cancel(w http.ResponseWriter, r *http.Request) { r, oauth.WithService(f.Spindle), oauth.WithLxm(tangled.PipelineCancelPipelineNSID), - oauth.WithDev(p.config.Core.Dev), + oauth.WithDev(false), oauth.WithTimeout(time.Second*30), // workflow cleanup usually takes time ) diff --git a/appview/state/knotstream.go b/appview/state/knotstream.go index 3166cb77..9a37c566 100644 --- a/appview/state/knotstream.go +++ b/appview/state/knotstream.go @@ -53,7 +53,7 @@ func Knotstream(ctx context.Context, c *config.Config, d *db.DB, enforcer *rbac. WorkerCount: c.Knotstream.WorkerCount, QueueSize: c.Knotstream.QueueSize, Logger: logger, - Dev: c.Core.Dev, + Dev: false, CursorStore: &cursorStore, } diff --git a/appview/state/spindlestream.go b/appview/state/spindlestream.go index 985a1b43..96490898 100644 --- a/appview/state/spindlestream.go +++ b/appview/state/spindlestream.go @@ -53,7 +53,7 @@ func Spindlestream(ctx context.Context, c *config.Config, d *db.DB, enforcer *rb WorkerCount: c.Spindlestream.WorkerCount, QueueSize: c.Spindlestream.QueueSize, Logger: logger, - Dev: c.Core.Dev, + Dev: false, CursorStore: &cursorStore, } diff --git a/nix/vm.nix b/nix/vm.nix index 9724b076..509fa585 100644 --- a/nix/vm.nix +++ b/nix/vm.nix @@ -131,6 +131,7 @@ in plcUrl = plcUrl; jetstreamEndpoint = jetstream; listenAddr = "0.0.0.0:6444"; + dev = true; }; }; services.tangled.spindle = { @@ -141,7 +142,7 @@ in hostname = envVarOr "TANGLED_VM_SPINDLE_HOST" "localhost:6555"; plcUrl = plcUrl; listenAddr = "0.0.0.0:6555"; - dev = true; + dev = false; queueSize = 100; maxJobCount = 2; secrets = { diff --git a/spindle/models/clone.go b/spindle/models/clone.go index 2fe8753c..191cc6b8 100644 --- a/spindle/models/clone.go +++ b/spindle/models/clone.go @@ -69,7 +69,7 @@ func BuildCloneStep(twf tangled.Pipeline_Workflow, tr tangled.Pipeline_TriggerMe commands: []string{ "git init", fmt.Sprintf("git remote add origin %s", repoURL), - fmt.Sprintf("git fetch %s", strings.Join(fetchArgs, " ")), + fmt.Sprintf("GIT_SSL_NO_VERIFY=true git -c http.sslVerify=false fetch %s", strings.Join(fetchArgs, " ")), "git checkout FETCH_HEAD", }, } -- 2.51.2