diff --git a/modules/mesh-provisioner-client/module.json b/modules/mesh-provisioner-client/module.json index 095128a8..8fca6444 100644 --- a/modules/mesh-provisioner-client/module.json +++ b/modules/mesh-provisioner-client/module.json @@ -7,6 +7,7 @@ "scope": "node" } ], + "core-credentials": true, "own-secrets": { "provisioner-broker": "${dir:state}/broker" }, diff --git a/modules/mesh-provisioner/cmd/mesh-provisioner/provisioner_test.go b/modules/mesh-provisioner/cmd/mesh-provisioner/provisioner_test.go index 1328bde9..c856a63b 100644 --- a/modules/mesh-provisioner/cmd/mesh-provisioner/provisioner_test.go +++ b/modules/mesh-provisioner/cmd/mesh-provisioner/provisioner_test.go @@ -295,11 +295,6 @@ func TestTheManifestDeclaresWhatTheCodeKeeps(t *testing.T) { if err := json.Unmarshal(raw, &m); err != nil { t.Fatal(err) } - // No "core-credentials" until the indexer whose judge knows the word runs (issue 774): the running judge refuses it, - // and a refused manifest holds the bus's user list, so the indexer that knows it is never granted. It comes back then. - if strings.Contains(string(raw), `"core-credentials"`) { - t.Error("the manifest says \"core-credentials\" before the judge that reads it runs") - } if m.Module != "mesh-provisioner" || m.RunsAs != "mesh-provisioner" || m.OwnSecrets["broker"] == "" { t.Errorf("an account of its own: module %q, runs-as %q, own secrets %v", m.Module, m.RunsAs, m.OwnSecrets) } diff --git a/modules/mesh-provisioner/module.json b/modules/mesh-provisioner/module.json index 12d4c27c..7b512a6f 100644 --- a/modules/mesh-provisioner/module.json +++ b/modules/mesh-provisioner/module.json @@ -46,6 +46,7 @@ "plans", "refused" ], + "core-credentials": true, "own-secrets": { "broker": "${dir:state}/broker" }, diff --git a/modules/nats/cmd/nats-tools/manifest_test.go b/modules/nats/cmd/nats-tools/manifest_test.go index 9ac143ba..57b4a3fc 100644 --- a/modules/nats/cmd/nats-tools/manifest_test.go +++ b/modules/nats/cmd/nats-tools/manifest_test.go @@ -43,11 +43,6 @@ func TestTheBussManifestMountsItsProgramsIntoTheUpstreamImage(t *testing.T) { if err := json.Unmarshal(raw, &m); err != nil { t.Fatal(err) } - // No "core-credentials" until the indexer whose judge knows the word runs (issue 774): the running judge refuses it, - // and a refused manifest holds the bus's user list, so the indexer that knows it is never granted. It comes back then. - if strings.Contains(string(raw), `"core-credentials"`) { - t.Error("the manifest says \"core-credentials\" before the judge that reads it runs") - } if m.Build.On != nil { t.Error("build.on is declared: nothing is built on a base image any more") } diff --git a/modules/nats/module.json b/modules/nats/module.json index f9083c93..93f518d7 100644 --- a/modules/nats/module.json +++ b/modules/nats/module.json @@ -21,6 +21,7 @@ } ], "bus-users": "/var/lib/nats-module/conf/accounts.conf", + "core-credentials": true, "own-secrets": { "broker": "${dir:mesh-state}/broker", "broker-nats-tools": "${dir:tools-secret}/broker-nats-tools"