Skip to content

Reword commits that cause Prow warnings#17960

Closed
zacharysarah wants to merge 36 commits intokubernetes:masterfrom
zacharysarah:reword-commits
Closed

Reword commits that cause Prow warnings#17960
zacharysarah wants to merge 36 commits intokubernetes:masterfrom
zacharysarah:reword-commits

Conversation

@zacharysarah
Copy link
Copy Markdown
Contributor

@zacharysarah zacharysarah commented Dec 5, 2019

This PR rewords commits that cause Prow to apply do-not-merge/invalid-commit-message labels to #17958.

I brought my local fork current with upstream/master:

$ git fetch upstream
$ git merge upstream/master
$ git push

I looked at the repo's commit history to find how far back I needed to edit. Then, in interactive mode, I reworded the commit messages for #17888 and #17889:

$ git rebase -i HEAD~36

Specifically, I removed magic words from the commit messages and reduced them to a single line instead of multiple lines.

This PR includes many files and commits because I didn't squash the other commits; I did this to avoid unduly destructive history changes.

UPDATE: This PR uses different hashes for each commit, compared to the current history in k/website. For example, the current branch tip for k/website is c26806c. This PR changes that hash to 5e730a3. Because this PR alters the earlier (and therefore subsequent) PR commit history, it makes sense to generate new hashes. Reviewers, please verify that commits from each PR apply changes correctly:

tengqm and others added 30 commits December 5, 2019 03:15
* Corrected the typo of 'chck' with 'check'

* Removed the duplicate sentence
* Update kustomization.md

fix 404 urls in kustomization.md

* Update content/en/docs/tasks/manage-kubernetes-objects/kustomization.md

Co-Authored-By: Tim Bannister <tim@scalefactory.com>

* update kustomization.md to be more stable
* update style guide for styling component names

- Attempt to outline style conventions for components
  and component tools
- Interested in comments and feedback

* update style examples

* style edits

- removed code style for components not cmd tools
- added style suggestion for namespaces
- cleaned up a few stray spaces
Signed-off-by: umiblue <lentil1016@163.com>
* Add Gardener Project Update blog post

* Update and rename 2019-11-10-gardener-project-update.md to 2019-11-27-gardener-project-update.md

* Update and rename 2019-11-27-gardener-project-update.md to 2019-12-02-gardener-project-update.md
After installing `cri-o`, we must run `systemctl daemon-reload` before
trying to run `systemctl start crio`. Otherwise, `systemd` doesn't know
about the crio configuration.

Similar instructions already exist for installing docker - this diff
adds these instructions for crio.
* add CIDR

* modify cidr definition

* Update content/en/docs/reference/glossary/cidr.md

Co-Authored-By: Chris <6834943+christophercarney@users.noreply.github.com>

* Update content/en/docs/reference/glossary/cidr.md

Co-Authored-By: Chris <6834943+christophercarney@users.noreply.github.com>
* specify components requiring feature gate 

currently, TTLafterfinished feature gate is a flag that can be passed to kube-apiserver, kube-scheduler and kube-controller-manager. The current description doesn't state what components to pass the flag to.

* specify components requiring feature gate
* fix-up 404 urls

* Revert "fix-up 404 urls"

This reverts commit 4515c4d.

* fix-ip 404 urls

* fix-up 404 urls
* Update guaranteed-scheduling-critical-addon-pods.md

cleanup old stuff again

* Update content/en/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md

Co-Authored-By: Tim Bannister <tim@scalefactory.com>

* Update guaranteed-scheduling-critical-addon-pods.md

remove whitespace
* fix-up 404 urls

* Revert "fix-up 404 urls"

This reverts commit 4515c4d.

* fix-ip 404 urls

* fix-up 404 urls

* fix-up 404 urls

Revert "fix-up 404 urls"

This reverts commit 4515c4d.

fix-ip 404 urls

fix-up 404 urls

* fix-up 404 urls
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. area/blog Issues or PRs related to the Kubernetes Blog subproject language/en Issues or PRs related to English language language/fr Issues or PRs related to French language language/id Issues or PRs related to Indonesian language language/ja Issues or PRs related to Japanese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Dec 5, 2019
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To complete the pull request process, please assign zacharysarah
You can assign the PR to them by writing /assign @zacharysarah in a comment when ready.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 5, 2019
@netlify
Copy link
Copy Markdown

netlify bot commented Dec 5, 2019

Deploy preview for kubernetes-io-master-staging ready!

Built with commit 5e730a3

https://deploy-preview-17960--kubernetes-io-master-staging.netlify.com

@Rajakavitha1
Copy link
Copy Markdown
Contributor

Hi @zacharysarah I reviewed all the files in English and the changes look good to me.

@Rajakavitha1
Copy link
Copy Markdown
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 5, 2019
@gochist
Copy link
Copy Markdown
Contributor

gochist commented Dec 5, 2019

@zacharysarah I don't understand how this PR can fix the commits already merged. If this PR is squashed and merged by PROW, it will become a single commit on the original commit history like this, gochist@ec5b784 .

@zacharysarah
Copy link
Copy Markdown
Contributor Author

zacharysarah commented Dec 5, 2019

@gochist Good point. Can you recommend a way to reword older commits?

EDIT: It's still possible to revert the commits through a PR. Closing this one and doing that now.

/close

@zacharysarah
Copy link
Copy Markdown
Contributor Author

/close

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

@zacharysarah: Closed this PR.

Details

In response to this:

/close

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/blog Issues or PRs related to the Kubernetes Blog subproject cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/en Issues or PRs related to English language language/fr Issues or PRs related to French language language/id Issues or PRs related to Indonesian language language/ja Issues or PRs related to Japanese language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.