Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion job-runner.policy.hcl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# See https://developer.hashicorp.com/nomad/tutorials/access-control/access-control-policies for ACL Policy details

namespace "default" {
capabilities = ["list-jobs", "read-job", "submit-job"]
capabilities = ["list-jobs", "read-job", "submit-job", "alloc-lifecycle"]
}

node {
Expand Down
15 changes: 10 additions & 5 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ func main() {
Environment: pulumi.StringMap{
"LC_ACL_TOKEN": aclTokenSecret,
},
Create: pulumi.String("nomad acl policy apply -address=https://localhost:4646 -ca-cert=/etc/nomad.d/nomad-agent-ca.pem -token=\"$LC_ACL_TOKEN\" -description=\"For running jobs and reading Node status in CI workflows\" job-runner /etc/nomad.d/job-runner.policy.hcl"),
Create: pulumi.String("nomad acl policy apply -address=https://localhost:4646 -ca-cert=/etc/nomad.d/nomad-agent-ca.pem -token=\"$LC_ACL_TOKEN\" -description=\"For running jobs, reading Node status, and cancelling allocations in CI workflows\" job-runner /etc/nomad.d/job-runner.policy.hcl"),
Triggers: pulumi.Array{
copyJobRunnerPolicy.ID(),
aclBootstrap.ID(),
Expand All @@ -274,18 +274,23 @@ func main() {
}

influxDBTokenSecret := cfg.RequireSecret("influxDBToken")
unytDurableObjectsURL := cfg.Require("unytDurableObjectsURL")
unytDurableObjectsURL := pulumi.String(cfg.Require("unytDurableObjectsURL"))
unytDurableObjectsSecret := cfg.RequireSecret("unytDurableObjectsSecret")
_, err = remote.NewCommand(ctx, "add-nomad-jobs-vars", &remote.CommandArgs{
Connection: conn,
Environment: pulumi.StringMap{
"LC_ACL_TOKEN": aclTokenSecret,
"LC_INFLUX_TOKEN": influxDBTokenSecret,
"LC_UNYT_DURABLE_OBJECTS_URL": pulumi.String(unytDurableObjectsURL),
"LC_UNYT_DURABLE_OBJECTS_URL": unytDurableObjectsURL,
"LC_UNYT_DURABLE_OBJECTS_SECRET": unytDurableObjectsSecret,
},
Create: pulumi.String("nomad var put -address=https://localhost:4646 -ca-cert=/etc/nomad.d/nomad-agent-ca.pem -token=\"$LC_ACL_TOKEN\" nomad/jobs INFLUX_TOKEN=\"$LC_INFLUX_TOKEN\" UNYT_DURABLE_OBJECTS_URL=\"$LC_UNYT_DURABLE_OBJECTS_URL\" UNYT_DURABLE_OBJECTS_SECRET=\"$LC_UNYT_DURABLE_OBJECTS_SECRET\""),
Triggers: pulumi.Array{influxDBTokenSecret, droplet.ID()},
Create: pulumi.String("nomad var put -address=https://localhost:4646 -ca-cert=/etc/nomad.d/nomad-agent-ca.pem -token=\"$LC_ACL_TOKEN\" nomad/jobs INFLUX_TOKEN=\"$LC_INFLUX_TOKEN\" UNYT_DURABLE_OBJECTS_URL=\"$LC_UNYT_DURABLE_OBJECTS_URL\" UNYT_DURABLE_OBJECTS_SECRET=\"$LC_UNYT_DURABLE_OBJECTS_SECRET\""),
Triggers: pulumi.Array{
influxDBTokenSecret,
unytDurableObjectsURL,
unytDurableObjectsSecret,
droplet.ID(),
},
}, pulumi.DependsOn([]pulumi.Resource{aclBootstrap}))
if err != nil {
return err
Expand Down
4 changes: 2 additions & 2 deletions nomad.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ acl {
}

advertise {
http = "{{ GetPublicIP }}"
rpc = "{{ GetPublicIP }}"
http = "nomad-server-01.holochain.org"
rpc = "nomad-server-01.holochain.org"
}

server {
Expand Down
Loading