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.

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

federation: Adding a tool to generate docs for federation apiserver and controller manager #26313

Merged
merged 2 commits into from
May 27, 2016

Conversation

nikhiljindal
Copy link
Contributor

cc @kubernetes/sig-cluster-federation

@nikhiljindal nikhiljindal added area/cluster-federation release-note-none Denotes a PR that doesn't merit a release note. labels May 25, 2016
@nikhiljindal nikhiljindal added this to the v1.3 milestone May 25, 2016
@k8s-github-robot
Copy link

Adding label:do-not-merge because PR changes docs prohibited to auto merge
See http://kubernetes.io/editdocs/ for information about editing docs

@k8s-github-robot k8s-github-robot added kind/old-docs size/L Denotes a PR that changes 100-499 lines, ignoring generated files. do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels May 25, 2016
@nikhiljindal
Copy link
Contributor Author

@kubernetes/docs-review-team Is the do-not-merge label correct?
I assume that the latest autogenerated copy still remains in this repo and then we pull it periodically in kubernetes.github.io.

@eparis
Copy link
Contributor

eparis commented May 25, 2016

the bot is correct

@janetkuo
Copy link
Member

@eparis since the docs are auto-generated, should the bot allow this PR to be merged but keep the kind/old-docs label like how it treats kubectl PRs which also contain auto-generated docs?

@nikhiljindal
Copy link
Contributor Author

@k8s-bot e2e test this issue: #26138

@nikhiljindal
Copy link
Contributor Author

@k8s-bot node e2e test this issue: #26203

@nikhiljindal
Copy link
Contributor Author

Discussed this with @bgrant0607 and he agreed that it is fine to add autogenerated docs to this repo. We will need to manually merge the PR.
We want to move autogenerated docs to the new docs repo but havent done that yet.

As @janetkuo said, it will be good to make the bot smarter to recognize these auto generated docs and handle them as a special case.

@k8s-bot
Copy link

k8s-bot commented May 26, 2016

GCE e2e build/test passed for commit 060e537.

@eparis
Copy link
Contributor

eparis commented May 26, 2016

sorry, I completely missed they are auto-generated. We need to update https://github.com/kubernetes/contrib/blob/master/mungegithub/block-path.yaml

@nikhiljindal
Copy link
Contributor Author

@eparis Thanks for fixing the bot!
Can I have LGTM? :)

@nikhiljindal nikhiljindal removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label May 26, 2016
@k8s-github-robot
Copy link

Adding label:do-not-merge because PR changes docs prohibited to auto merge
See http://kubernetes.io/editdocs/ for information about editing docs

@k8s-github-robot k8s-github-robot added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label May 26, 2016
@nikhiljindal
Copy link
Contributor Author

@eparis Do we need to do something for kubernetes-retired/contrib#1072 to take effect?
merge bot is still adding do-not-merge label.

@eparis
Copy link
Contributor

eparis commented May 27, 2016

LGTM. blocked until submit-queue is restarted, and i'm not going to restart it since it is making progress.

@eparis eparis added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 27, 2016
@eparis eparis merged commit cd700ee into kubernetes:master May 27, 2016
@lavalamp
Copy link
Member

@eparis @nikhiljindal this broke the build... fixed in #26400

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants