diff --git a/config/commands.yaml b/config/commands.yaml
index e79a51e..546b706 100644
--- a/config/commands.yaml
+++ b/config/commands.yaml
@@ -120,8 +120,6 @@ groups:
required: false
positional: true
description: |
- XXX
-
The name of the site resource.
If not specified, the name is that of the site
diff --git a/input/commands/connector-create.md b/input/commands/connector-create.md
index 61300ac..d80fd39 100644
--- a/input/commands/connector-create.md
+++ b/input/commands/connector-create.md
@@ -48,7 +48,7 @@ skupper connector create backend 8080 --output yaml
- name string, required
- The name of the listener resource.
+ The name of the connector resource.
| | |
|-|-|
@@ -113,7 +113,7 @@ skupper connector create backend 8080 --output yaml
|-|-|
| Platforms | Kubernetes, Docker |
-- tls-secret string, optional
+- --tls-secret string
The name of a Kubernetes secret containing the trusted
server certificate (typically a CA).
diff --git a/input/commands/connector-delete.md b/input/commands/connector-delete.md
index efabf83..a7df3e3 100644
--- a/input/commands/connector-delete.md
+++ b/input/commands/connector-delete.md
@@ -31,7 +31,7 @@ Connector "" is deleted.
- name string, required
- The name of the listener resource.
+ The name of the connector resource.
| | |
|-|-|
diff --git a/input/commands/link-create.md b/input/commands/link-create.md
index 9cb81dd..dfab1c8 100644
--- a/input/commands/link-create.md
+++ b/input/commands/link-create.md
@@ -28,13 +28,13 @@ Link "" is ready.
- name string, required
- The name of the listener resource.
+ The name of the link.
| | |
|-|-|
| Platforms | Kubernetes, Docker |
-- tls-secret string, optional
+- tls-secret string, required
The name of a Kubernetes secret containing TLS
credentials. The secret contains the trusted server
diff --git a/input/commands/link-delete.md b/input/commands/link-delete.md
index 2141461..de2c262 100644
--- a/input/commands/link-delete.md
+++ b/input/commands/link-delete.md
@@ -28,8 +28,6 @@ Link "" is deleted.
- name string, required
- The name of the listener resource.
-
| | |
|-|-|
| Platforms | Kubernetes, Docker |
diff --git a/input/commands/link-update.md b/input/commands/link-update.md
index 7f1bb37..8e6c63b 100644
--- a/input/commands/link-update.md
+++ b/input/commands/link-update.md
@@ -28,13 +28,11 @@ Link "" is updated.
- name string, required
- The name of the listener resource.
-
| | |
|-|-|
| Platforms | Kubernetes, Docker |
-- tls-secret string, optional
+- --tls-secret string
The name of a Kubernetes secret containing TLS
credentials. The secret contains the trusted server
diff --git a/input/commands/listener-create.md b/input/commands/listener-create.md
index 7a7debf..df60f01 100644
--- a/input/commands/listener-create.md
+++ b/input/commands/listener-create.md
@@ -88,7 +88,7 @@ skupper listener create backend 8080 --output yaml
| Default | _Value of name_ |
| Platforms | Kubernetes, Docker |
-- tls-secret string, optional
+- --tls-secret string
The name of a Kubernetes secret containing TLS
credentials. The secret contains the trusted server
diff --git a/input/commands/site-create.md b/input/commands/site-create.md
index 8ae65a5..9ac1d9e 100644
--- a/input/commands/site-create.md
+++ b/input/commands/site-create.md
@@ -42,7 +42,8 @@ skupper site create west --enable-link-access
- name string, required
- The name of the listener resource.
+ A name of your choice for the Skupper site. This name is
+ displayed in the console and CLI output.
| | |
|-|-|
diff --git a/input/commands/site-delete.md b/input/commands/site-delete.md
index 6f77804..8db8cc9 100644
--- a/input/commands/site-delete.md
+++ b/input/commands/site-delete.md
@@ -28,7 +28,10 @@ Site "" is deleted.
- name string, required
- The name of the listener resource.
+ The name of the site resource.
+
+ If not specified, the name is that of the site
+ associated with the current namespace.
| | |
|-|-|
diff --git a/input/commands/site-update.md b/input/commands/site-update.md
index 7006ed6..7452355 100644
--- a/input/commands/site-update.md
+++ b/input/commands/site-update.md
@@ -40,9 +40,12 @@ skupper site update --enable-link-access --service-account app1:alice
## Options
-- name string, required
+- name string, optional
- The name of the listener resource.
+ The name of the site resource.
+
+ If not specified, the name is that of the site
+ associated with the current namespace.
| | |
|-|-|
diff --git a/input/commands/token-issue.md b/input/commands/token-issue.md
index 915f0ba..ecdaa5f 100644
--- a/input/commands/token-issue.md
+++ b/input/commands/token-issue.md
@@ -60,7 +60,7 @@ skupper token issue ~/token.yaml --expiration-window 24h --redemptions-allowed 3
- file string, required
- The name of the token file to use.
+ The name of the token file to create.
| | |
|-|-|
diff --git a/python/commands.py b/python/commands.py
index 963fc31..19aebfa 100644
--- a/python/commands.py
+++ b/python/commands.py
@@ -259,7 +259,7 @@ def merge_option_data(self):
option_data = dict()
for name in option_names:
- option_data[name] = standard_option_data.get(name, {})
+ option_data[name] = dict(standard_option_data.get(name, {}))
option_data[name].update(specific_option_data.get(name, {}))
return option_data.values()
diff --git a/python/resources.py b/python/resources.py
index 00072d3..5fc1d4c 100644
--- a/python/resources.py
+++ b/python/resources.py
@@ -312,7 +312,7 @@ def merge_property_data(self, section):
prop_data = dict()
for name in prop_names:
- prop_data[name] = standard_prop_data.get(name, {})
+ prop_data[name] = dict(standard_prop_data.get(name, {}))
prop_data[name].update(specific_prop_data.get(name, {}))
return prop_data.values()