Kubernetes Operator for Tangled Spindles

still try and fix duplicate logs

evan.jarrett.net 790d6b80 0d4695be

verified
+6 -19
+1 -1
Makefile
··· 50 50 # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. 51 51 OPERATOR_SDK_VERSION ?= v1.41.1 52 52 # Image URL to use all building/pushing image targets 53 - IMG ?= controller:latest 53 + IMG ?= atcr.io/evan.jarrett.net/loom:latest 54 54 55 55 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) 56 56 ifeq (,$(shell go env GOBIN))
+1 -1
config/manager/manager.yaml
··· 58 58 - /manager 59 59 args: 60 60 - --health-probe-bind-address=:8081 61 - image: controller:latest 61 + image: atcr.io/evan.jarrett.net/loom:latest 62 62 imagePullPolicy: Always 63 63 name: manager 64 64 env:
+4 -17
internal/engine/kubernetes_engine.go
··· 475 475 continue 476 476 } 477 477 478 - step := workflow.Steps[event.StepID] 479 - 480 478 switch event.Kind { 481 479 case "control": 482 - // Write control events from runner JSON 483 - var status models.StepStatus 484 - if event.Event == "start" { 485 - status = models.StepStatusStart 486 - } else if event.Event == "end" { 487 - status = models.StepStatusEnd 488 - // Write the end event 489 - controlWriter := wfLogger.ControlWriter(event.StepID, step, status) 490 - controlWriter.Write([]byte{}) 480 + // Use control events from runner for flow control only 481 + // Don't write them - the core spindle engine writes control events 482 + if event.Event == "end" { 491 483 // Step is done, return 492 484 return nil 493 - } else { 494 - continue // Unknown control event 495 485 } 496 - 497 - // Write start event 498 - controlWriter := wfLogger.ControlWriter(event.StepID, step, status) 499 - controlWriter.Write([]byte{}) 486 + // For "start" events, just continue reading 500 487 501 488 case "data": 502 489 // Log output from step