diff --git a/cmd/vela-worker/run.go b/cmd/vela-worker/run.go index 76612fac..9b01f543 100644 --- a/cmd/vela-worker/run.go +++ b/cmd/vela-worker/run.go @@ -116,11 +116,12 @@ func run(c *cli.Context) error { }, // queue configuration Queue: &queue.Setup{ - Driver: c.String("queue.driver"), - Address: c.String("queue.addr"), - Cluster: c.Bool("queue.cluster"), - Routes: c.StringSlice("queue.routes"), - Timeout: c.Duration("queue.pop.timeout"), + Driver: c.String("queue.driver"), + Address: c.String("queue.addr"), + Cluster: c.Bool("queue.cluster"), + Routes: c.StringSlice("queue.routes"), + Timeout: c.Duration("queue.pop.timeout"), + PublicKey: c.String("queue.public-key"), }, // server configuration Server: &Server{ diff --git a/docker-compose.yml b/docker-compose.yml index a5abe138..80e0b31e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,6 +23,7 @@ services: EXECUTOR_DRIVER: linux QUEUE_DRIVER: redis QUEUE_ADDR: 'redis://redis:6379' + QUEUE_PUBLIC_KEY: 'DXsJkoTSkHlG26d75LyHJG+KQsXPr8VKPpmH/78zmko=' VELA_BUILD_LIMIT: 1 VELA_BUILD_TIMEOUT: 30m VELA_LOG_LEVEL: trace @@ -61,6 +62,7 @@ services: DATABASE_ENCRYPTION_KEY: 'C639A572E14D5075C526FDDD43E4ECF6' QUEUE_DRIVER: redis QUEUE_ADDR: 'redis://redis:6379' + QUEUE_PRIVATE_KEY: 'tCIevHOBq6DdN5SSBtteXUusjjd0fOqzk2eyi0DMq04NewmShNKQeUbbp3vkvIckb4pCxc+vxUo+mYf/vzOaSg==' SCM_DRIVER: github SCM_CONTEXT: 'continuous-integration/vela' SECRET_VAULT: 'true' diff --git a/go.mod b/go.mod index e761d907..bcab355b 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/docker/go-units v0.5.0 github.com/gin-gonic/gin v1.9.1 github.com/go-vela/sdk-go v0.20.2-0.20230824133536-0b0212b996f5 - github.com/go-vela/server v0.20.1 + github.com/go-vela/server v0.20.1-0.20230829140453-5df4993e51a1 github.com/go-vela/types v0.20.2-0.20230822144153-14b37585731d github.com/golang-jwt/jwt/v5 v5.0.0 github.com/google/go-cmp v0.5.9 diff --git a/go.sum b/go.sum index 50868e10..c802fa5e 100644 --- a/go.sum +++ b/go.sum @@ -147,8 +147,8 @@ github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QX github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-vela/sdk-go v0.20.2-0.20230824133536-0b0212b996f5 h1:PfGWo9Yzv6xfHYSYYArlsrWfs3cvOlBopCjHyHi/SPs= github.com/go-vela/sdk-go v0.20.2-0.20230824133536-0b0212b996f5/go.mod h1:j7DFviaUd+XArpFr9KoHLWwUXRyFYAiZvPPF42gktoA= -github.com/go-vela/server v0.20.1 h1:TsAhCj3wqm4kxfq9M6J8+3MmBKlDeJoTr4UGknT9yQw= -github.com/go-vela/server v0.20.1/go.mod h1:M4rSAg8arMhIQYXQpc/ZmMbNW73ur8yE88klMk0Dq9w= +github.com/go-vela/server v0.20.1-0.20230829140453-5df4993e51a1 h1:dYJ8FNJeyARCi7Ok2yET6H97wVKszl3lvMV6EwVpbug= +github.com/go-vela/server v0.20.1-0.20230829140453-5df4993e51a1/go.mod h1:MhGhkxKIAzFD+ThVay++Api7uW6XZzHqH0BnzCke5+w= github.com/go-vela/types v0.20.2-0.20230822144153-14b37585731d h1:ag6trc3Ev+7hzifeWy0M9rHHjrO9nFCYgW8dlKdZ4j4= github.com/go-vela/types v0.20.2-0.20230822144153-14b37585731d/go.mod h1:AXO4oQSygOBQ02fPapsKjQHkx2aQO3zTu7clpvVbXBY= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=