Revert "Revert "Update cobra/pflag. Also update generated kubectl documentation.""

This reverts commit 69432e8b2f.

    COMMIT_BLOCKED_ON_GENDOCS

docs/kubectl-expose.md

@@ -31,7 +31,11 @@ $ 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.""
       --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).
@@ -55,7 +59,6 @@ $ kubectl expose streamer --port=4100 --protocol=udp --service-name=video-stream
       --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