From e7841e4dc27e5aae045fa2290522b3b78c5cd7d0 Mon Sep 17 00:00:00 2001 From: David May <49894298+wass3rw3rk@users.noreply.github.com> Date: Thu, 5 Oct 2023 14:49:29 -0500 Subject: [PATCH] chore: remove queue_addr refs (#381) --- content/installation/server/reference/_index.md | 4 ---- content/installation/worker/docker/_index.md | 2 -- content/installation/worker/kubernetes/_index.md | 3 --- content/installation/worker/reference/_index.md | 14 -------------- content/installation/worker/reference/executor.md | 1 - content/installation/worker/reference/queue.md | 2 -- content/installation/worker/reference/runtime.md | 2 -- 7 files changed, 28 deletions(-) diff --git a/content/installation/server/reference/_index.md b/content/installation/server/reference/_index.md index df1402a42..fdf8967ee 100644 --- a/content/installation/server/reference/_index.md +++ b/content/installation/server/reference/_index.md @@ -49,10 +49,6 @@ This variable sets a fully qualified URL to the queue instance for pushing workl The variable should be provided as a `string`. -{{% alert title="Note:" color="primary" %}} -This variable should match [the `VELA_QUEUE_ADDR` variable](/docs/installation/worker/reference/#vela_queue_addr) provided to the worker. -{{% /alert %}} - ### VELA_QUEUE_DRIVER This configuration variable is used by the [queue component](/docs/installation/server/reference/queue/) for the server. diff --git a/content/installation/worker/docker/_index.md b/content/installation/worker/docker/_index.md index c3b80d1ed..1064e963a 100644 --- a/content/installation/worker/docker/_index.md +++ b/content/installation/worker/docker/_index.md @@ -60,7 +60,6 @@ The token is non-expiring and exists within the container environment. Once the $ docker run \ --detach=true \ --env=VELA_QUEUE_DRIVER=redis \ - --env=VELA_QUEUE_ADDR=redis://@:/ \ --env=VELA_SERVER_ADDR=https://vela-server.example.com \ --env=VELA_SERVER_SECRET= \ --env=VELA_WORKER_ADDR=https://vela-worker.example.com \ @@ -84,7 +83,6 @@ To start, launch the worker container: $ docker run \ --detach=true \ --env=VELA_QUEUE_DRIVER=redis \ - --env=VELA_QUEUE_ADDR=redis://@:/ \ --env=VELA_SERVER_ADDR=https://vela-server.example.com \ --env=VELA_WORKER_ADDR=https://vela-worker.example.com \ --name=worker \ diff --git a/content/installation/worker/kubernetes/_index.md b/content/installation/worker/kubernetes/_index.md index bc2a98215..591674055 100644 --- a/content/installation/worker/kubernetes/_index.md +++ b/content/installation/worker/kubernetes/_index.md @@ -48,9 +48,6 @@ data: # this value should only be specified if using the server-worker trusted symmetric token auth method. VELA_SERVER_SECRET: PHNoYXJlZC1zZWNyZXQ+ # VELA_SERVER_SECRET: - - VELA_QUEUE_ADDR: cmVkaXM6Ly88cGFzc3dvcmQ+QDxob3N0bmFtZT46PHBvcnQ+LzxkYXRhYmFzZT4= - # VELA_QUEUE_ADDR: redis://@:/ ``` Do not store any passwords in the `ConfigMap`. The `ConfigMap` is more convenient for everything else. diff --git a/content/installation/worker/reference/_index.md b/content/installation/worker/reference/_index.md index 9f25b56a5..aec9128fe 100644 --- a/content/installation/worker/reference/_index.md +++ b/content/installation/worker/reference/_index.md @@ -21,20 +21,6 @@ The worker is made up of several components, responsible for specific tasks, nec This section contains a list of all variables that must be provided to the worker. -### VELA_QUEUE_ADDR - -This configuration variable is used by the [queue component](/docs/installation/worker/reference/queue/) for the worker. - -Examples using this configuration variable are provided in the above reference documentation. - -This variable sets a fully qualified URL to the queue instance for pulling workloads provided by the [server](/docs/installation/server/). - -The variable should be provided as a `string`. - -{{% alert title="Note:" color="primary" %}} -This variable should match [the `VELA_QUEUE_ADDR` variable](/docs/installation/server/reference/#vela_queue_addr) provided to the server. -{{% /alert %}} - ### VELA_QUEUE_DRIVER This configuration variable is used by the [queue component](/docs/installation/worker/reference/queue/) for the worker. diff --git a/content/installation/worker/reference/executor.md b/content/installation/worker/reference/executor.md index 7a48a4d52..56c954a5c 100644 --- a/content/installation/worker/reference/executor.md +++ b/content/installation/worker/reference/executor.md @@ -45,7 +45,6 @@ $ docker run \ --detach=true \ + --env=VELA_EXECUTOR_DRIVER=linux \ --env=VELA_QUEUE_DRIVER=redis \ - --env=VELA_QUEUE_ADDR=redis://@:/ \ --env=VELA_SERVER_ADDR=https://vela-server.example.com \ --env=VELA_SERVER_SECRET= \ --env=VELA_WORKER_ADDR=https://vela-worker.example.com \ diff --git a/content/installation/worker/reference/queue.md b/content/installation/worker/reference/queue.md index ba3a7b8a1..8dab20f69 100644 --- a/content/installation/worker/reference/queue.md +++ b/content/installation/worker/reference/queue.md @@ -17,7 +17,6 @@ The following options are used to configure the component: | Name | Description | Required | Default | Environment Variables | | ------------------- | ------------------------------------------------- | -------- | ---------- | ----------------------------------------------- | -| `queue.addr` | full connection string to the queue | `true` | `N/A` | `QUEUE_ADDR`
`VELA_QUEUE_ADDR` | | `queue.cluster` | configures the client for a queue cluster | `false` | `false` | `QUEUE_CLUSTER`
`VELA_QUEUE_CLUSTER` | | `queue.driver` | type of client to control and operate queue | `true` | `N/A` | `QUEUE_DRIVER`
`VELA_QUEUE_DRIVER` | | `queue.pop.timeout` | timeout for requests that pop items off the queue | `true` | `60s` | `QUEUE_POP_TIMEOUT`
`VELA_QUEUE_POP_TIMEOUT` | @@ -47,7 +46,6 @@ The below configuration displays an example of starting the Vela worker that wil $ docker run \ --detach=true \ + --env=VELA_QUEUE_DRIVER=redis \ -+ --env=VELA_QUEUE_ADDR=redis://@:/ \ --env=VELA_SERVER_ADDR=https://vela-server.example.com \ --env=VELA_SERVER_SECRET= \ --env=VELA_WORKER_ADDR=https://vela-worker.example.com \ diff --git a/content/installation/worker/reference/runtime.md b/content/installation/worker/reference/runtime.md index 31b6618f1..f7abaf796 100644 --- a/content/installation/worker/reference/runtime.md +++ b/content/installation/worker/reference/runtime.md @@ -49,7 +49,6 @@ The below configuration displays an example of starting the Vela worker that wil $ docker run \ --detach=true \ --env=VELA_QUEUE_DRIVER=redis \ - --env=VELA_QUEUE_ADDR=redis://@:/ \ + --env=VELA_RUNTIME_DRIVER=docker \ --env=VELA_SERVER_ADDR=https://vela-server.example.com \ --env=VELA_SERVER_SECRET= \ @@ -78,7 +77,6 @@ The below configuration displays an example of starting the Vela worker that wil $ docker run \ --detach=true \ --env=VELA_QUEUE_DRIVER=redis \ - --env=VELA_QUEUE_ADDR=redis://@:/ \ + --env=VELA_RUNTIME_DRIVER=kubernetes \ + --env=VELA_RUNTIME_CONFIG=/root/.kube/config \ + --env=VELA_RUNTIME_NAMESPACE=vela \