From 6131a207cfe67c78a27f0473e9da0c61546618ee Mon Sep 17 00:00:00 2001
From: Luke Kysow <1034429+lkysow@users.noreply.github.com>
Date: Tue, 2 Nov 2021 14:21:15 -0700
Subject: [PATCH] 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
  }
}
```
---
 .../config-entries/service-defaults.mdx       | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/website/content/docs/connect/config-entries/service-defaults.mdx b/website/content/docs/connect/config-entries/service-defaults.mdx
index 5d5a9f91f..8a5b64779 100644
--- a/website/content/docs/connect/config-entries/service-defaults.mdx
+++ b/website/content/docs/connect/config-entries/service-defaults.mdx
@@ -230,6 +230,7 @@ spec:
   }
 }
 ```
+
 </CodeTabs>
 
 </Tab>
@@ -338,14 +339,13 @@ spec:
                 name: 'Protocol',
                 type: 'string: ""',
                 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
                     [\`protocol\`](/docs/connect/config-entries/service-defaults#protocol)
                     field of a
                     [\`service-defaults\`](/docs/connect/config-entries/service-defaults)
                     config entry for the upstream destination service. Configuring it in a
-                    proxy upstream config will not fully enable some 
+                    proxy upstream config will not fully enable some
                     [L7 features](/docs/connect/l7-traffic-management).
                     It is supported here for backwards compatibility with Consul versions prior to 1.6.0.
                   `,
@@ -375,7 +375,7 @@ spec:
                       It is supported here for backwards compatibility with Consul versions prior to 1.6.0.
                 `,
                 },
-              }, 
+              },
               {
                 name: 'MeshGateway',
                 type: 'MeshGatewayConfig: <optional>',
@@ -454,18 +454,8 @@ spec:
         {
           name: 'Defaults',
           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: [
-            {
-              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',
               type: 'string: ""',
@@ -697,7 +687,7 @@ spec:
           ],
         },
       ],
-    },
+    }
   ]}
 />