Skip to content

Commit d6f914d

Browse files
committed
fix ci commands
1 parent 1079277 commit d6f914d

File tree

8 files changed

+18
-9
lines changed

8 files changed

+18
-9
lines changed

.ci/xdp/integration-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
ports:
3535
- containerPort: 7777
3636
hostPort: 7777
37-
args: ["proxy", "--to", "${server_ip}:8078", "--service.udp.xdp"]
37+
args: ["--service.udp", "--provider.static.endpoints", "${server_ip}:8078", "--service.udp.xdp"]
3838
securityContext:
3939
capabilities:
4040
add:

.ci/xdp/veth-integ-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ echo "Adding dummy program"
4646
ip -n cs link set veth-cs xdpgeneric obj "$ROOT/crates/xdp/bin/dummy.bin" sec xdp
4747

4848
ip netns exec cs fortio udp-echo&
49-
ip netns exec proxy ./target/debug/quilkin --service.udp --service.qcmp proxy --to $OUTSIDE_IP:8078 --service.udp.xdp --service.udp.xdp.network-interface veth-proxy&
49+
ip netns exec proxy ./target/debug/quilkin --service.udp --service.qcmp --provider.static.endpoints $OUTSIDE_IP:8078 --service.udp.xdp --service.udp.xdp.network-interface veth-proxy&
5050

5151
echo "::notice file=$source,line=$LINENO::Launching client"
5252
ip netns exec cs fortio load -n 10 udp://$PROXY_IP:7777 2> ./target/logs.txt

cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ steps:
5858
entrypoint: bash
5959
args:
6060
- "-c"
61-
- 'timeout --signal=INT --preserve-status 5s docker run -v /tmp:/etc/quilkin/ --rm ${_REPOSITORY}quilkin:$(make version) proxy --to="127.0.0.1:0"'
61+
- 'timeout --signal=INT --preserve-status 5s docker run -v /tmp:/etc/quilkin/ --rm ${_REPOSITORY}quilkin:$(make version) proxy --provider.static.endpoints="127.0.0.1:0"'
6262
id: test-quilkin-image-command-line
6363
waitFor:
6464
- build

crates/agones/src/pod.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,13 @@ mod tests {
3131
let client = Client::new().await;
3232

3333
let pods: Api<Pod> = client.namespaced_api();
34-
let cmds = ["proxy", "--to", "127.0.0.1:0"].map(String::from).to_vec();
34+
let cmds = [
35+
"--service.udp",
36+
"--provider.static.endpoints",
37+
"127.0.0.1:0",
38+
]
39+
.map(String::from)
40+
.to_vec();
3541
let pod = Pod {
3642
metadata: ObjectMeta {
3743
generate_name: Some("quilkin-".into()),

docs/src/deployment/quickstarts/netcat.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Next let's configure Quilkin in proxy mode, with a static configuration that poi
2525
UDP echo service we just started.
2626

2727
```shell
28-
quilkin proxy --to 127.0.0.1:8080
28+
quilkin --service.udp --provider.static.endpoints 127.0.0.1:8080
2929
```
3030

3131
This configuration will start Quilkin on the [default proxy port](../../services/proxy.md), and it will

docs/src/services/proxy/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ endpoint configuration to specify two endpoints with `token` metadata attached t
2222
{{#include ../../../../examples/proxy.yaml:17:100}}
2323
```
2424

25-
This is a great use of a static configuration file, as we only get a singular `--to` endpoint address via the
25+
This is a great use of a static configuration file, as we only get a singular `--provider.static.endpoints` endpoint address via the
2626
command line arguments.
2727

2828
We can also configure [Filters](./filters.md) via the configuration file. See that section for documentation.

examples/agones-xonotic-sidecar/sidecar.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ spec:
4242
image: us-docker.pkg.dev/agones-images/examples/xonotic-example:1.2
4343
- name: quilkin
4444
image: us-docker.pkg.dev/quilkin/release/quilkin:0.9.0
45-
args: ["proxy", "--port", "26001", "--to", "127.0.0.1:26000"]
45+
args:
46+
- --service.udp
47+
- --service.udp.port=26001
48+
- --provider.static.endpoints=127.0.0.1:26000
4649
livenessProbe:
4750
httpGet:
4851
path: /live

src/config/providersv2.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ pub struct Providers {
140140
env = "QUILKIN_PROVIDERS_STATIC_ENDPOINTS"
141141
)]
142142
endpoints: Vec<SocketAddr>,
143-
/// Assigns dynamic tokens to each address in the `--to` argument
143+
/// Assigns dynamic tokens to each address in the `provider.static.endpoints` argument
144144
///
145145
/// Format is `<number of unique tokens>:<length of token suffix for each packet>`
146146
#[clap(
@@ -247,7 +247,7 @@ impl Providers {
247247
.as_ref()
248248
.map(|tt| {
249249
let Some((count, length)) = tt.split_once(':') else {
250-
eyre::bail!("--to-tokens `{tt}` is invalid, it must have a `:` separator")
250+
eyre::bail!("provider.static.endpoint_tokens: `{tt}` is invalid, it must have a `:` separator")
251251
};
252252

253253
let count: usize = count.parse()?;

0 commit comments

Comments
 (0)