docs: clarify service defaults example (#16043)

This commit is contained in:
Jared Kirschner 2023-01-23 19:34:28 -05:00 committed by GitHub
parent 248c186cab
commit b43faf9f3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 19 deletions

View File

@ -56,14 +56,14 @@ spec:
<Tab heading="Consul OSS"> <Tab heading="Consul OSS">
Set default connection limits and mesh gateway mode across all upstreams Set default connection limits and mesh gateway mode across all upstreams
of "counting", and also override the mesh gateway mode used when dialing of "dashboard", and also override the mesh gateway mode used when dialing
the "dashboard" service. its upstream "counting" service.
<CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}> <CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
```hcl ```hcl
Kind = "service-defaults" Kind = "service-defaults"
Name = "counting" Name = "dashboard"
UpstreamConfig = { UpstreamConfig = {
Defaults = { Defaults = {
@ -79,7 +79,7 @@ UpstreamConfig = {
Overrides = [ Overrides = [
{ {
Name = "dashboard" Name = "counting"
MeshGateway = { MeshGateway = {
Mode = "remote" Mode = "remote"
} }
@ -92,7 +92,7 @@ UpstreamConfig = {
apiVersion: consul.hashicorp.com/v1alpha1 apiVersion: consul.hashicorp.com/v1alpha1
kind: ServiceDefaults kind: ServiceDefaults
metadata: metadata:
name: counting name: dashboard
spec: spec:
upstreamConfig: upstreamConfig:
defaults: defaults:
@ -103,7 +103,7 @@ spec:
maxPendingRequests: 512 maxPendingRequests: 512
maxConcurrentRequests: 512 maxConcurrentRequests: 512
overrides: overrides:
- name: dashboard - name: counting
meshGateway: meshGateway:
mode: remote mode: remote
``` ```
@ -111,7 +111,7 @@ spec:
```json ```json
{ {
"Kind": "service-defaults", "Kind": "service-defaults",
"Name": "counting", "Name": "dashboard",
"UpstreamConfig": { "UpstreamConfig": {
"Defaults": { "Defaults": {
"MeshGateway": { "MeshGateway": {
@ -125,7 +125,7 @@ spec:
}, },
"Overrides": [ "Overrides": [
{ {
"Name": "dashboard", "Name": "counting",
"MeshGateway": { "MeshGateway": {
"Mode": "remote" "Mode": "remote"
} }
@ -141,14 +141,15 @@ spec:
<Tab heading="Consul Enterprise"> <Tab heading="Consul Enterprise">
Set default connection limits and mesh gateway mode across all upstreams Set default connection limits and mesh gateway mode across all upstreams
of "counting" and also override the mesh gateway mode used when dialing of "dashboard" in the "product" namespace,
the "dashboard" service in the "frontend" namespace. and also override the mesh gateway mode used when dialing
its upstream "counting" service in the "backend" namespace.
<CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}> <CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
```hcl ```hcl
Kind = "service-defaults" Kind = "service-defaults"
Name = "counting" Name = "dashboard"
Namespace = "product" Namespace = "product"
UpstreamConfig = { UpstreamConfig = {
@ -165,8 +166,8 @@ UpstreamConfig = {
Overrides = [ Overrides = [
{ {
Name = "dashboard" Name = "counting"
Namespace = "frontend" Namespace = "backend"
MeshGateway = { MeshGateway = {
Mode = "remote" Mode = "remote"
} }
@ -179,7 +180,7 @@ UpstreamConfig = {
apiVersion: consul.hashicorp.com/v1alpha1 apiVersion: consul.hashicorp.com/v1alpha1
kind: ServiceDefaults kind: ServiceDefaults
metadata: metadata:
name: counting name: dashboard
namespace: product namespace: product
spec: spec:
upstreamConfig: upstreamConfig:
@ -191,8 +192,8 @@ spec:
maxPendingRequests: 512 maxPendingRequests: 512
maxConcurrentRequests: 512 maxConcurrentRequests: 512
overrides: overrides:
- name: dashboard - name: counting
namespace: frontend namespace: backend
meshGateway: meshGateway:
mode: remote mode: remote
``` ```
@ -200,7 +201,7 @@ spec:
```json ```json
{ {
"Kind": "service-defaults", "Kind": "service-defaults",
"Name": "counting", "Name": "dashboard",
"Namespace": "product", "Namespace": "product",
"UpstreamConfig": { "UpstreamConfig": {
"Defaults": { "Defaults": {
@ -215,8 +216,8 @@ spec:
}, },
"Overrides": [ "Overrides": [
{ {
"Name": "dashboard", "Name": "counting",
"Namespace": "frontend", "Namespace": "backend",
"MeshGateway": { "MeshGateway": {
"Mode": "remote" "Mode": "remote"
} }