diff --git a/modules/mesh-conditions/cmd/mesh-conditions/hold.go b/modules/mesh-conditions/cmd/mesh-conditions/hold.go index c95d106f..97be8fed 100644 --- a/modules/mesh-conditions/cmd/mesh-conditions/hold.go +++ b/modules/mesh-conditions/cmd/mesh-conditions/hold.go @@ -23,22 +23,15 @@ import ( "git.novox.be/novox/mesh-sdk/go/health" ) -// The modules whose delivery holds what they serve beyond their own findings (Limits 12). -const ( - controllerModule = "mesh-controller" - runtimeModule = "node-tools" -) - -// controllerServes are the sources of what the controller serves while it is delivered: its listening, its lease, its -// writes and its facts (ADR 0505 ยง2 (a)), matched to mesh-controller whatever its key names. -var controllerServes = map[string]bool{"S4": true, "S7": true, "S12": true, "S13": true, "S14": true, "S25": true} +// The module whose delivery holds what it serves beyond their own findings (Limits 12). +const runtimeModule = "node-tools" // about is a node and a module a finding or a condition is about, for the hold. type about struct{ Node, Module string } // aboutOf are the modules on nodes a condition's subject is about (Limits 12): a module on a machine, a provider on its -// node, a seat of the same name as its module on a machine, the controller's own work wherever mesh-controller is -// delivered, and every module's tools on a machine whose tool runner is delivered. Never the machine itself. +// node, a seat of the same name as its module on a machine, and every module's tools on a machine whose tool +// runner is delivered. Never the machine itself. func (k *Keeper) aboutOf(kind, source string, s health.Subject) []about { var out []about parts := strings.Split(s.ID, ".") @@ -72,13 +65,6 @@ func (k *Keeper) aboutOf(kind, source string, s health.Subject) []about { } return out } - if controllerServes[source] || (s.Scope == health.ScopeCore && strings.HasPrefix(s.ID, "controller")) { - for hk := range k.wants { - if node, module := splitNodeModule(hk); module == controllerModule { - out = append(out, about{Node: node, Module: module}) - } - } - } if s.Machine != "" && s.Scope != health.ScopeMachine { out = append(out, about{Node: s.Machine, Module: runtimeModule}) }