1. docker
  2. Commit 16c4b3377407e7be8064f3aefba9e07c64ca1be3
Browse code

Update the CLI docs to display whether a root rotation is in progress when viewing system info, and TLS info when displaying node info.

Signed-off-by: Ying Li <ying.li@docker.com>

Ying Li authored on 2017/05/11 05:32:47
Showing 3 changed files
docs/reference/commandline/info.md
History View file @ 16c4b33
... ... 
@@ -145,6 +145,7 @@ Swarm: active
145 145 
   Heartbeat Period: 5 seconds
146 146 
  CA Configuration:
147 147 
   Expiry Duration: 3 months
148 
+ Root Rotation In Progress: false
148 149 
  Node Address: 172.16.66.128 172.16.66.129
149 150 
  Manager Addresses:
150 151 
   172.16.66.128:2477
docs/reference/commandline/node_inspect.md
History View file @ 16c4b33
... ... 
@@ -47,8 +47,8 @@ $ docker node inspect swarm-manager
47 47 
     "Version": {
48 48 
         "Index": 10
49 49 
     },
50 
-    "CreatedAt": "2016-06-16T22:52:44.9910662Z",
51 
-    "UpdatedAt": "2016-06-16T22:52:45.230878043Z",
50 
+    "CreatedAt": "2017-05-16T22:52:44.9910662Z",
51 
+    "UpdatedAt": "2017-05-16T22:52:45.230878043Z",
52 52 
     "Spec": {
53 53 
         "Role": "manager",
54 54 
         "Availability": "active"
... ... 
@@ -64,7 +64,7 @@ $ docker node inspect swarm-manager
64 64 
             "MemoryBytes": 1039843328
65 65 
         },
66 66 
         "Engine": {
67 
-            "EngineVersion": "1.12.0",
67 
+            "EngineVersion": "17.06.0-ce",
68 68 
             "Plugins": [
69 69 
                 {
70 70 
                     "Type": "Volume",
... ... 
@@ -91,6 +91,11 @@ $ docker node inspect swarm-manager
91 91 
                     "Name": "overlay"
92 92 
                 }
93 93 
             ]
94 
+        },
95 
+        "TLSInfo": {
96 
+            "TrustRoot": "-----BEGIN CERTIFICATE-----\nMIIBazCCARCgAwIBAgIUOzgqU4tA2q5Yv1HnkzhSIwGyIBswCgYIKoZIzj0EAwIw\nEzERMA8GA1UEAxMIc3dhcm0tY2EwHhcNMTcwNTAyMDAyNDAwWhcNMzcwNDI3MDAy\nNDAwWjATMREwDwYDVQQDEwhzd2FybS1jYTBZMBMGByqGSM49AgEGCCqGSM49AwEH\nA0IABMbiAmET+HZyve35ujrnL2kOLBEQhFDZ5MhxAuYs96n796sFlfxTxC1lM/2g\nAh8DI34pm3JmHgZxeBPKUURJHKWjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMB\nAf8EBTADAQH/MB0GA1UdDgQWBBS3sjTJOcXdkls6WSY2rTx1KIJueTAKBggqhkjO\nPQQDAgNJADBGAiEAoeVWkaXgSUAucQmZ3Yhmx22N/cq1EPBgYHOBZmHt0NkCIQC3\nzONcJ/+WA21OXtb+vcijpUOXtNjyHfcox0N8wsLDqQ==\n-----END CERTIFICATE-----\n",
97 
+            "CertIssuerSubject": "MBMxETAPBgNVBAMTCHN3YXJtLWNh",
98 
+            "CertIssuerPublicKey": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAExuICYRP4dnK97fm6OucvaQ4sERCEUNnkyHEC5iz3qfv3qwWV/FPELWUz/aACHwMjfimbcmYeBnF4E8pRREkcpQ=="
94 99 
         }
95 100 
     },
96 101 
     "Status": {
... ... 
@@ -116,7 +121,7 @@ false
116 116 
 $ docker node inspect --pretty self
117 117 
 ID:                     e216jshn25ckzbvmwlnh5jr3g
118 118 
 Hostname:               swarm-manager
119 
-Joined at:              2016-06-16 22:52:44.9910662 +0000 utc
119 
+Joined at:              2017-05-16 22:52:44.9910662 +0000 utc
120 120 
 Status:
121 121 
  State:                 Ready
122 122 
  Availability:          Active
... ... 
@@ -134,7 +139,22 @@ Resources:
134 134 
 Plugins:
135 135 
   Network:              overlay, bridge, null, host, overlay
136 136 
   Volume:               local
137 
-Engine Version:         1.12.0
137 
+Engine Version:         17.06.0-ce
138 
+TLS Info:
139 
+ TrustRoot:
140 
+-----BEGIN CERTIFICATE-----
141 
+MIIBazCCARCgAwIBAgIUOzgqU4tA2q5Yv1HnkzhSIwGyIBswCgYIKoZIzj0EAwIw
142 
+EzERMA8GA1UEAxMIc3dhcm0tY2EwHhcNMTcwNTAyMDAyNDAwWhcNMzcwNDI3MDAy
143 
+NDAwWjATMREwDwYDVQQDEwhzd2FybS1jYTBZMBMGByqGSM49AgEGCCqGSM49AwEH
144 
+A0IABMbiAmET+HZyve35ujrnL2kOLBEQhFDZ5MhxAuYs96n796sFlfxTxC1lM/2g
145 
+Ah8DI34pm3JmHgZxeBPKUURJHKWjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMB
146 
+Af8EBTADAQH/MB0GA1UdDgQWBBS3sjTJOcXdkls6WSY2rTx1KIJueTAKBggqhkjO
147 
+PQQDAgNJADBGAiEAoeVWkaXgSUAucQmZ3Yhmx22N/cq1EPBgYHOBZmHt0NkCIQC3
148 
+zONcJ/+WA21OXtb+vcijpUOXtNjyHfcox0N8wsLDqQ==
149 
+-----END CERTIFICATE-----
150 
+
151 
+ Issuer Public Key:	MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAExuICYRP4dnK97fm6OucvaQ4sERCEUNnkyHEC5iz3qfv3qwWV/FPELWUz/aACHwMjfimbcmYeBnF4E8pRREkcpQ==
152 
+ Issuer Subject:	MBMxETAPBgNVBAMTCHN3YXJtLWNh
138 153 
 ```
139 154
140 155 
 ## Related commands
docs/reference/commandline/node_ls.md
History View file @ 16c4b33
... ... 
@@ -145,17 +145,19 @@ Placeholder      | Description
145 145 
 `.Status`        | Node status
146 146 
 `.Availability`  | Node availability ("active", "pause", or "drain")
147 147 
 `.ManagerStatus` | Manager status of the node
148 
+`.TLSStatus`     | TLS status of the node ("Ready", or "Needs Rotation" has TLS certificate signed by an old CA)
148 149
149 150 
 When using the `--format` option, the `node ls` command will either
150 151 
 output the data exactly as the template declares or, when using the
151 152 
 `table` directive, includes column headers as well.
152 153
153 154 
 The following example uses a template without headers and outputs the
154 
-`ID` and `Hostname` entries separated by a colon for all nodes:
155 
+`ID`, `Hostname`, and `TLS Status` entries separated by a colon for all nodes:
155 156
156 157 
 ```bash
157 
-$ docker node ls --format "{{.ID}}: {{.Hostname}}"
158 
-e216jshn25ckzbvmwlnh5jr3g: swarm-manager1
158 
+$ docker node ls --format "{{.ID}}: {{.Hostname}} {{.TLSStatus}}"
159 
+e216jshn25ckzbvmwlnh5jr3g: swarm-manager1 Ready
160 
+35o6tiywb700jesrt3dmllaza: swarm-worker1 Needs Rotation
159 161 
 ``
160 162
161 163