Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update kubectl help for 1.2 resources #23305

Merged
merged 1 commit into from
Mar 23, 2016
Merged

Update kubectl help for 1.2 resources #23305

merged 1 commit into from
Mar 23, 2016
+126 −112

Conversation

janetkuo
Copy link
Member

Ref #23231; follow up #23222

  1. add deployment, rs, daemonsets, configmaps, and componentstatuses to the supported types
  2. update rs as supported in kubectl autoscale and kubectl scale
  3. update kubectl expose and kubectl rollout help docs; add more examples

@bgrant0607 @kubernetes/kubectl @nikhiljindal @madhusudancs

@janetkuo janetkuo mentioned this pull request Mar 21, 2016
Closed
@k8s-github-robot
Copy link

Labelling this PR as size/M

@k8s-github-robot k8s-github-robot added kind/old-docs size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 21, 2016
madhusudancs
madhusudancs reviewed Mar 21, 2016
View reviewed changes
pkg/kubectl/kubectl.go
replicasets (rs), replicationcontrollers (rc), nodes (no), events (ev), limitranges (limits),
persistentvolumes (pv), persistentvolumeclaims (pvc), resourcequotas (quota), namespaces (ns),
serviceaccounts, ingresses (ing), horizontalpodautoscalers (hpa), daemonsets (ds), configmaps,
componentstatuses (cs), endpoints (ep) or secrets.`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/or/and/

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@k8s-bot
Copy link

k8s-bot commented Mar 21, 2016

GCE e2e build/test passed for commit c0eea559b662332478037de5a95284f0158a9822.

madhusudancs
madhusudancs reviewed Mar 21, 2016
View reviewed changes
pkg/kubectl/cmd/rollout/rollout.go
@@ -24,7 +24,7 @@ import (
)

const (
rollout_long = `rollout manages a deployment using subcommands like "kubectl rollout undo deployment/abc"`
rollout_long = `kubectl rollout manages a deployment using subcommands like "kubectl rollout undo deployment/abc"`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"kubectl rollout" isn't necessary, you can just start with "Manages a deployment ..."? It looks like that's what we are doing with other commands.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@janetkuo
Copy link
Member Author

Comments addressed.

@k8s-bot
Copy link

k8s-bot commented Mar 21, 2016

GCE e2e build/test passed for commit 4c93c8c3aaa1683ef89563047c255aac1d5cac99.

j3ffml
j3ffml reviewed Mar 22, 2016
View reviewed changes
pkg/kubectl/cmd/autoscale.go
@@ -31,7 +31,7 @@ import (
const (
autoscaleLong = `Creates an autoscaler that automatically chooses and sets the number of pods that run in a kubernetes cluster.

Looks up a deployment or replication controller by name and creates an autoscaler that uses this deployment or replication controller as a reference.
Looks up a Deployment, ReplicaSet or ReplicationController by name and creates an autoscaler that uses the given resource as a reference.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: ReplicaSet,

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@j3ffml j3ffml assigned j3ffml and unassigned thockin Mar 22, 2016
@janetkuo
Copy link
Member Author

@jlowdermilk All comments addressed. PTAL

@k8s-github-robot
Copy link

Labelling this PR as size/XS

@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 22, 2016
@j3ffml
Copy link
Contributor

j3ffml commented Mar 22, 2016

lgtm. Feel free to add label after squashing commits.

@k8s-bot
Copy link

k8s-bot commented Mar 22, 2016

GCE e2e build/test passed for commit 7d4332f0cc95c809b5e4e2d725f8ec1a5233523b.

@bgrant0607 bgrant0607 added this to the v1.2 milestone Mar 22, 2016
@janetkuo janetkuo force-pushed the update-kubectl-help branch from 7d4332f to e93b855 Compare March 22, 2016 21:14
@janetkuo janetkuo added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 22, 2016
@k8s-github-robot
Copy link

@k8s-bot ok to test
@k8s-bot test this

pr builder appears to be missing, activating due to 'lgtm' label.

@k8s-github-robot
Copy link

Labelling this PR as size/M

@k8s-github-robot k8s-github-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 22, 2016
@janetkuo
Copy link
Member Author

Squashed and applying tag.

@k8s-bot
Copy link

k8s-bot commented Mar 22, 2016

GCE e2e build/test passed for commit e93b855.

@k8s-bot
Copy link

k8s-bot commented Mar 22, 2016

GCE e2e build/test passed for commit e93b855.

@janetkuo
Copy link
Member Author

Travis failed to do its job. Closing and reopening the PR.

Skipping hack/../hack/verify-all.sh
Verifying hack/../hack/verify-api-reference-docs.sh
Generating api reference docs at /home/travis/gopath/src/github.com/kubernetes/kubernetes/_output/generated_html
Reading swagger spec from: /home/travis/gopath/src/github.com/kubernetes/kubernetes/api/swagger-spec/
Unable to find image 'gcr.io/google_containers/gen-swagger-docs:v5' locally
v5: Pulling from google_containers/gen-swagger-docs
No output has been received in the last 10m0s, this potentially indicates a stalled build or something wrong with the build itself.
The build has been terminated

@janetkuo janetkuo closed this Mar 22, 2016
@janetkuo janetkuo reopened this Mar 22, 2016
@janetkuo janetkuo mentioned this pull request Mar 22, 2016
Merged
@k8s-bot
Copy link

k8s-bot commented Mar 22, 2016

GCE e2e build/test failed for commit e93b855.

Please reference the list of currently known flakes when examining this failure. If you request a re-test, you must reference the issue describing the flake.

@janetkuo
Copy link
Member Author

@k8s-bot e2e test this issue: #23321

@k8s-bot
Copy link

k8s-bot commented Mar 22, 2016

GCE e2e build/test passed for commit e93b855.

@k8s-github-robot
Copy link

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

@k8s-bot
Copy link

k8s-bot commented Mar 23, 2016

GCE e2e build/test passed for commit e93b855.

@k8s-github-robot
Copy link

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

@k8s-bot
Copy link

k8s-bot commented Mar 23, 2016

GCE e2e build/test passed for commit e93b855.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 2f89867 into kubernetes:master Mar 23, 2016
@bgrant0607 bgrant0607 added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 23, 2016
eparis pushed a commit to eparis/kubernetes that referenced this pull request Mar 24, 2016
@eparis
Merge pull request kubernetes#23305 from janetkuo/update-kubectl-help
570b3bb 
Auto commit by PR queue bot
(cherry picked from commit 2f89867)
@eparis eparis mentioned this pull request Mar 24, 2016
Merged
@bgrant0607 bgrant0607 added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Mar 24, 2016
@k8s-cherrypick-bot
Copy link

Commit 570b3bb found in the "release-1.2" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this s an error find help to get your PR picked.

AlainRoy pushed a commit to vmware-archive/kubernetes-archived that referenced this pull request Mar 29, 2016
Merge pull request kubernetes#23305 from janetkuo/update-kubectl-help
7fbde02 
Auto commit by PR queue bot
(cherry picked from commit 2f89867)
alena1108 pushed a commit to rancher/kubernetes that referenced this pull request May 20, 2016
Merge pull request kubernetes#23305 from janetkuo/update-kubectl-help
99a57a8 
Auto commit by PR queue bot
(cherry picked from commit 2f89867)
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@eparis
Merge pull request kubernetes#23305 from janetkuo/update-kubectl-help
5a68abf 
Auto commit by PR queue bot
(cherry picked from commit 2f89867)
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
@eparis
Merge pull request kubernetes#23305 from janetkuo/update-kubectl-help
d0bf1a9 
Auto commit by PR queue bot
(cherry picked from commit 2f89867)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@j3ffml j3ffml

Labels
area/kubectl cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.2
Development

Successfully merging this pull request may close these issues.
10 participants
@janetkuo @k8s-github-robot @k8s-bot @j3ffml @k8s-cherrypick-bot @madhusudancs @k8s-teamcity-mesosphere @googlebot @thockin @bgrant0607