Skip to content

Commit

Permalink
chore: remove queue_addr refs (#381)
Browse files Browse the repository at this point in the history
  • Loading branch information
wass3rw3rk authored Oct 5, 2023
1 parent 5cc053b commit e7841e4
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 28 deletions.
4 changes: 0 additions & 4 deletions content/installation/server/reference/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions content/installation/worker/docker/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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://<password>@<hostname>:<port>/<database> \
--env=VELA_SERVER_ADDR=https://vela-server.example.com \
--env=VELA_SERVER_SECRET=<shared-secret> \
--env=VELA_WORKER_ADDR=https://vela-worker.example.com \
Expand All @@ -84,7 +83,6 @@ To start, launch the worker container:
$ docker run \
--detach=true \
--env=VELA_QUEUE_DRIVER=redis \
--env=VELA_QUEUE_ADDR=redis://<password>@<hostname>:<port>/<database> \
--env=VELA_SERVER_ADDR=https://vela-server.example.com \
--env=VELA_WORKER_ADDR=https://vela-worker.example.com \
--name=worker \
Expand Down
3 changes: 0 additions & 3 deletions content/installation/worker/kubernetes/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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: <shared-secret>

VELA_QUEUE_ADDR: cmVkaXM6Ly88cGFzc3dvcmQ+QDxob3N0bmFtZT46PHBvcnQ+LzxkYXRhYmFzZT4=
# VELA_QUEUE_ADDR: redis://<password>@<hostname>:<port>/<database>
```

Do not store any passwords in the `ConfigMap`. The `ConfigMap` is more convenient for everything else.
Expand Down
14 changes: 0 additions & 14 deletions content/installation/worker/reference/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion content/installation/worker/reference/executor.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ $ docker run \
--detach=true \
+ --env=VELA_EXECUTOR_DRIVER=linux \
--env=VELA_QUEUE_DRIVER=redis \
--env=VELA_QUEUE_ADDR=redis://<password>@<hostname>:<port>/<database> \
--env=VELA_SERVER_ADDR=https://vela-server.example.com \
--env=VELA_SERVER_SECRET=<shared-secret> \
--env=VELA_WORKER_ADDR=https://vela-worker.example.com \
Expand Down
2 changes: 0 additions & 2 deletions content/installation/worker/reference/queue.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`<br>`VELA_QUEUE_ADDR` |
| `queue.cluster` | configures the client for a queue cluster | `false` | `false` | `QUEUE_CLUSTER`<br>`VELA_QUEUE_CLUSTER` |
| `queue.driver` | type of client to control and operate queue | `true` | `N/A` | `QUEUE_DRIVER`<br>`VELA_QUEUE_DRIVER` |
| `queue.pop.timeout` | timeout for requests that pop items off the queue | `true` | `60s` | `QUEUE_POP_TIMEOUT`<br>`VELA_QUEUE_POP_TIMEOUT` |
Expand Down Expand Up @@ -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://<password>@<hostname>:<port>/<database> \
--env=VELA_SERVER_ADDR=https://vela-server.example.com \
--env=VELA_SERVER_SECRET=<shared-secret> \
--env=VELA_WORKER_ADDR=https://vela-worker.example.com \
Expand Down
2 changes: 0 additions & 2 deletions content/installation/worker/reference/runtime.md
Original file line number Diff line number Diff line change
Expand Up @@ -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://<password>@<hostname>:<port>/<database> \
+ --env=VELA_RUNTIME_DRIVER=docker \
--env=VELA_SERVER_ADDR=https://vela-server.example.com \
--env=VELA_SERVER_SECRET=<shared-secret> \
Expand Down Expand Up @@ -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://<password>@<hostname>:<port>/<database> \
+ --env=VELA_RUNTIME_DRIVER=kubernetes \
+ --env=VELA_RUNTIME_CONFIG=/root/.kube/config \
+ --env=VELA_RUNTIME_NAMESPACE=vela \
Expand Down

0 comments on commit e7841e4

Please sign in to comment.