Remove Name/Namespace fields from upstream default (#11456)

The UpstreamConfig.Defaults field does not support setting Name or
Namespace because the purpose is to apply defaults to all upstreams.
I think this was just missed in the docs since those fields would
error if set under Defaults.

i.e. this is not supported:

```
UpstreamConfig {
  Defaults {
    Name = "foo"
    Namespace = "bar"
    # Defaults config here
  }
}
```
This commit is contained in:
Luke Kysow 2021-11-02 14:21:15 -07:00 committed by GitHub
parent 27227c0fd2
commit 6131a207cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 16 deletions

View File

@ -230,6 +230,7 @@ spec:
} }
} }
``` ```
</CodeTabs> </CodeTabs>
</Tab> </Tab>
@ -338,8 +339,7 @@ spec:
name: 'Protocol', name: 'Protocol',
type: 'string: ""', type: 'string: ""',
description: description:
`The protocol for the upstream listener. `The protocol for the upstream listener.<br><br>
NOTE: The protocol of a service should ideally be configured via the NOTE: The protocol of a service should ideally be configured via the
[\`protocol\`](/docs/connect/config-entries/service-defaults#protocol) [\`protocol\`](/docs/connect/config-entries/service-defaults#protocol)
field of a field of a
@ -454,18 +454,8 @@ spec:
{ {
name: 'Defaults', name: 'Defaults',
type: 'UpstreamConfig: <optional>', type: 'UpstreamConfig: <optional>',
description: `Default configuration that applies to all upstreams of the given service.`, description: `Default configuration that applies to all upstreams of this service.`,
children: [ children: [
{
name: 'Name',
type: 'string: ""',
description: 'The upstream name to apply the configuration to.',
},
{
name: 'Namespace',
type: 'string: ""',
description: 'The namespace of the upstream.',
},
{ {
name: 'Protocol', name: 'Protocol',
type: 'string: ""', type: 'string: ""',
@ -697,7 +687,7 @@ spec:
], ],
}, },
], ],
}, }
]} ]}
/> />