Update spf13/cobra with recent commits.

This commit is contained in:
Brendan Burns
2015-03-23 15:09:20 -07:00
parent c66caa5336
commit a18ec3be88
7 changed files with 46 additions and 26 deletions

View File

@@ -11,6 +11,12 @@ Print available API versions.
kubectl apiversions
```
### Options
```
-h, --help=false: help for apiversions
```
### Options inherrited from parent commands
```
@@ -22,7 +28,6 @@ kubectl apiversions
--client-key="": Path to a client key file for TLS.
--cluster="": The name of the kubeconfig cluster to use
--context="": The name of the kubeconfig context to use
-h, --help=false: help for kubectl
--insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
--kubeconfig="": Path to the kubeconfig file to use for CLI requests.
--log_backtrace_at=:0: when logging hits line file:N, emit a stack trace

View File

@@ -31,11 +31,8 @@ $ kubectl expose streamer --port=4100 --protocol=udp --service-name=video-stream
--create-external-load-balancer=false: If true, create an external load balancer for this service. Implementation is cloud provider dependent. Default is 'false'.
--dry-run=false: If true, only print the object that would be sent, without creating it.
--generator="service/v1": The name of the API generator to use. Default is 'service/v1'.
<<<<<<< HEAD
-l, --labels="": Labels to apply to the service created by this call.
=======
-h, --help=false: help for expose
>>>>>>> Revert "Revert "Update cobra/pflag. Also update generated kubectl documentation.""
-l, --labels="": Labels to apply to the service created by this call.
--no-headers=false: When using the default output, don't print headers.
-o, --output="": Output format. One of: json|yaml|template|templatefile.
--output-version="": Output the formatted object with the given version (default api-version).

View File

@@ -16,6 +16,12 @@ kubectl apiversions \- Print available API versions.
Print available API versions.
.SH OPTIONS
.PP
\fB\-h\fP, \fB\-\-help\fP=false
help for apiversions
.SH OPTIONS INHERITED FROM PARENT COMMANDS
.PP
\fB\-\-alsologtostderr\fP=false
@@ -49,10 +55,6 @@ Print available API versions.
\fB\-\-context\fP=""
The name of the kubeconfig context to use
.PP
\fB\-h\fP, \fB\-\-help\fP=false
help for kubectl
.PP
\fB\-\-insecure\-skip\-tls\-verify\fP=false
If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.

View File

@@ -38,13 +38,12 @@ as the selector for a new Service on the specified port.
The name of the API generator to use. Default is 'service/v1'.
.PP
<<<<<<< HEAD
\fB\-l\fP, \fB\-\-labels\fP=""
Labels to apply to the service created by this call.
=======
\fB\-h\fP, \fB\-\-help\fP=false
help for expose
>>>>>>> Revert "Revert "Update cobra/pflag. Also update generated kubectl documentation.""
.PP
\fB\-l\fP, \fB\-\-labels\fP=""
Labels to apply to the service created by this call.
.PP
\fB\-\-no\-headers\fP=false