Update to 0.57.2 via fixing Chinese content (see #16531) #16653
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
cncf-cla: yes
zacharysarah
changed the title
k8s-ci-robot
added
the
do-not-merge/work-in-progress
zacharysarah
changed the title
k8s-ci-robot
removed
the
do-not-merge/work-in-progress
|
/assign @stewart-yu @tengqm |
zacharysarah
changed the title
|
Note: In 1.14, apparmor.md is in the zh/docs/tutorials/cluster directory. That entire directory was removed in 1.15, which is why the ZH content was not part of PR #16531 to fix the master build. |
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: markthink The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
SataQiu
pushed a commit
to SataQiu/website
that referenced
this pull request
Oct 9, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR extends the fix in #16531 to Chinese docs.
Some background
I accidentally YOLO'd a commit directly to
release-1.14. In the process of trying to revert it, the last stable commit began to fail. After initially mistaking it for a stealthy work-in-test-but-fail-in-production build on the part of #16647, I realized that netlify was now failing for a similar but unrelated error in Chinese content.Rather than revert the original commit, apply the fix to Chinese content, then resubmit the original commit in the form of a PR, this PR threads the needle by politely ignoring my earlier commit, fixing Chinese content, and calling it a day.
Preview link
https://deploy-preview-16653--k8s-v1-14.netlify.com/zh/docs/tutorials/clusters/apparmor/#%E4%B8%BE%E4%BE%8B