Can one of the admins verify that this patch is reasonable to test? If so, please reply "ok to test".
(Note: "add to whitelist" is no longer supported. Please update configurations in kubernetes/test-infra/jenkins/job-configs/kubernetes-jenkins-pull instead.)

This message may repeat a few times in short succession due to jenkinsci/ghprb-plugin#292. Sorry.

Otherwise, if this message is too spammy, please complain to ixdy.

@kubernetes/kubectl

ok to test

@janetkuo thanks for helping with this. looks like it's ready to merge.

There are redundant newlines between command description and aliases. Would you fix the template to show only one newline?

$ kubectl clusterinfo -h 
Display addresses of the master and services with label kubernetes.io/cluster-service=true



Aliases:
  cluster-info, clusterinfo

@janetkuo Done. thanks!

There are redundant newlines when aliases aren't shown. Fix them and then this LGTM.

$ kubectl get -h 
Display one or many resources.

Possible resource types include (case insensitive): pods (po), services (svc), deployments,
replicasets (rs), replicationcontrollers (rc), nodes (no), events (ev), limitranges (limits),
persistentvolumes (pv), persistentvolumeclaims (pvc), resourcequotas (quota), namespaces (ns),
serviceaccounts (sa), ingresses (ing), horizontalpodautoscalers (hpa), daemonsets (ds), configmaps,
componentstatuses (cs), endpoints (ep), and secrets.

By specifying the output as 'template' and providing a Go template as the value
of the --template flag, you can filter the attributes of the fetched resource(s).



Examples:
...

Thanks @janetkuo hopefully fixed :)

Sub-commands are missing:

$ kubectl set -h 
Configure application resources

These commands help you make changes to existing application resources.



Global Flags:
...

should be

$ kubectl set -h 
Configure application resources

These commands help you make changes to existing application resources.

Usage:
  kubectl set SUBCOMMAND [flags]
  kubectl set [command]

Available Commands:
  image       Update image of a pod template

Global Flags:
...

@janetkuo thanks for your patience, here's the output from 4 commands

kubectl clusterinfo -h > out.txt 2>&1
kubectl get -h >> out.txt 2>&1
kubectl set -h >> out.txt 2>&1
kubectl create -h >> out.txt 2>&1

Output from Master : http://paste.openstack.org/show/497959/
Output after applying fix : http://paste.openstack.org/show/497960/

Sorry for the late reply. I found that we missed 2 newlines between Exampes and Available Commands:

$ kubectl create -h 
Create a resource by filename or stdin.

JSON and YAML formats are accepted.

Examples:
# Create a pod using the data in pod.json.
kubectl create -f ./pod.json

# Create a pod based on the JSON passed into stdin.
cat pod.json | kubectl create -f -Available Commands:
  namespace      Create a namespace with the specified name.
  secret         Create a secret using specified subcommand.
  configmap      Create a configMap from a local file, directory or literal value.
  serviceaccount Create a service account with the specified name.

Flags:
   ...
Global Flags:
   ...

Usage:
  kubectl create -f FILENAME [flags]
  kubectl create [command]

Use "kubectl create [command] --help" for more information about a command.

But it makes me think that maybe we should put Available commands right after Usage, since Usage tells you to use sub-commands. cc @kubernetes/kubectl @davidopp

@janetkuo - tested the following 5 commands. I had to tweak the help template too!

kubectl create -h
kubectl clusterinfo -h
kubectl get -h
kubectl set -h
kubectl create -h

GCE e2e build/test passed for commit 911710687283dcb5375c1884a39ec1094a50c15e.

• Build Log
• Test Artifacts
• Internal Jenkins Results

Can one of the admins verify that this patch is reasonable to test? If so, please reply "ok to test".
(Note: "add to whitelist" is no longer supported. Please update configurations in kubernetes/test-infra/jenkins/job-configs/kubernetes-jenkins-pull instead.)

This message may repeat a few times in short succession due to jenkinsci/ghprb-plugin#292. Sorry.

Otherwise, if this message is too spammy, please complain to ixdy.

@dims thanks; I want to let you know that this needs to wait until after the 1.3 code freeze ends

@janetkuo of course. Thanks for all your guidance with this.

GCE e2e build/test passed for commit 4de3f312309d722bb5a5c573ba834d01fba557c4.

• Test Results
• Build Log
• Test Artifacts
• Internal Jenkins Results

@janetkuo can you please lgtm this please? (if appropriate)

@dims
You must link to the test flake issue which caused you to request this manual re-test.
Re-test requests should be in the form of: k8s-bot test this issue: #<number>
Here is the list of open test flakes.

GCE e2e build/test passed for commit 4de3f312309d722bb5a5c573ba834d01fba557c4.

• Test Results
• Build Log
• Test Artifacts
• Internal Jenkins Results

GCE e2e build/test passed for commit 91f1636.

• Test Results
• Build Log
• Test Artifacts
• Internal Jenkins Results

@janetkuo ping. this PR is ready again (had slipped 1.3). Thanks in advance!

So sorry for the late reply.

There's a redundant newline below Aliases:

$ kubectl cluster-info -h 
Display addresses of the master and services with label kubernetes.io/cluster-service=true
To further debug and diagnose cluster problems, use 'kubectl cluster-info dump'.

Aliases:
  cluster-info, clusterinfo


Available Commands:

but this problem existed in the old code so fixing it is optional.

Also how do you feel about renaming Available Commands: to something like Available Sub-commands:? It's up to you.

Otherwise this LGTM. Thanks much!

@janetkuo funny i see that extra line in the current output as well (without my patch)
http://paste.openstack.org/show/526637/

LGTM as discussed in Slack channel.

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

GCE e2e build/test passed for commit 91f1636.

• Test Results
• Build Log
• Test Artifacts
• Internal Jenkins Results

Automatic merge from submit-queue