Skip to content

Commit 4eb2a6c

Browse files
Backport of docs: Fix example service registration for built-in proxy into release/1.17.x (#20350)
backport of commit d500571 Co-authored-by: Blake Covarrubias <[email protected]>
1 parent 4d180ca commit 4eb2a6c

File tree

2 files changed

+28
-24
lines changed

2 files changed

+28
-24
lines changed

ui/packages/consul-ui/mock-api/v1/agent/services

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@
1212
"ModifyIndex": 0,
1313
"ProxyDestination": "",
1414
"Connect": {
15-
"Proxy": {
16-
"ExecMode": "daemon",
17-
"Command": [
18-
"/bin/consul",
19-
"connect",
20-
"proxy"
21-
],
22-
"Config": null
15+
"SidecarService": {
16+
"Proxy": {
17+
"ExecMode": "daemon",
18+
"Command": [
19+
"/bin/consul",
20+
"connect",
21+
"proxy"
22+
],
23+
"Config": null
24+
}
2325
}
2426
}
2527
},

website/content/docs/connect/proxies/built-in.mdx

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,25 @@ for the built-in proxy.
2424
"service": {
2525
"name": "example-service",
2626
"connect": {
27-
"proxy": {
28-
"config": {
29-
"bind_address": "0.0.0.0",
30-
"bind_port": 20000,
31-
"local_service_address": "127.0.0.1:1234",
32-
"local_connect_timeout_ms": 1000,
33-
"handshake_timeout_ms": 10000,
34-
"upstreams": []
35-
},
36-
"upstreams": [
37-
{
38-
"destination_name": "example-upstream",
39-
"config": {
40-
"connect_timeout_ms": 1000
27+
"sidecar_service": {
28+
"proxy": {
29+
"config": {
30+
"bind_address": "0.0.0.0",
31+
"bind_port": 20000,
32+
"local_service_address": "127.0.0.1:1234",
33+
"local_connect_timeout_ms": 1000,
34+
"handshake_timeout_ms": 10000,
35+
"upstreams": []
36+
},
37+
"upstreams": [
38+
{
39+
"destination_name": "example-upstream",
40+
"config": {
41+
"connect_timeout_ms": 1000
42+
}
4143
}
42-
}
43-
]
44+
]
45+
}
4446
}
4547
}
4648
}

0 commit comments

Comments
 (0)