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

Modify apparmor.md based on PR - Fix site build (#16531) #16650

Merged
merged 1 commit into from
Oct 2, 2019
Merged

Modify apparmor.md based on PR - Fix site build (#16531) #16650

merged 1 commit into from
Oct 2, 2019

Conversation

aimeeu
Copy link
Contributor

@aimeeu aimeeu commented Oct 1, 2019

Embed contents of deny-write.profile into apparmor.md and delete deny-write.profile to enable the site to build with Hugo 0.57.2. Could not cherry pick PR 16531 because the Korean translation was added in 1.14. See PRs #16104 and #16151.

PRs in this "cherry pick" group: #16645, #16646, #16647, #16648, #16650

zh/docs/reference/setup-tools/kubeadm/generated/README.md updated to fix 'invalid YAML delimiter' compile error caused by HTML comment.

Preview page: https://deploy-preview-16650--k8s-v1-12.netlify.com/docs/tutorials/clusters/apparmor/#example

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

netlify bot commented Oct 1, 2019

Deploy preview for k8s-v1-12 processing.

Building with commit 0a97f60

https://app.netlify.com/sites/k8s-v1-12/deploys/5d93c46f102cc8000c42c5d2

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. language/en Issues or PRs related to English language language/zh Issues or PRs related to Chinese language labels Oct 1, 2019
Modify apparmor.md and delete .profile to enable the site to
build with Hugo 0.57.2. Could not cherry pick PR 16531 because
the Korean translation was added in 1.14.
See also PRs #16104 and #16151.

zh/docs/reference/setup-tools/kubeadm/generated/README.md updated to fix
'invalid YAML delimiter' compile error caused by HTML comment.

Signed-off-by: Aimee Ukasick <aimeeu.opensource@gmail.com>
@aimeeu
Copy link
Contributor Author

aimeeu commented Oct 1, 2019

/assign @zacharysarah

@zacharysarah
Copy link
Contributor

@aimeeu Why does this PR delete a Chinese README?

@aimeeu
Copy link
Contributor Author

aimeeu commented Oct 2, 2019

@zacharysarah it does not delete the README.md file. It removes the HTML comment at the top of the file, which was causing causing an 'invalid YAML delimiter' compile error. Note that the README.md in question does not exist in 1.13

@zacharysarah
Copy link
Contributor

@aimeeu Ah, i see now. Thanks!

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zacharysarah

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 2, 2019
@k8s-ci-robot k8s-ci-robot merged commit f8162b0 into kubernetes:release-1.12 Oct 2, 2019
@aimeeu aimeeu deleted the aimeeu-1.12-cherrypick-pr16531 branch October 8, 2019 19:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/en Issues or PRs related to English language language/zh Issues or PRs related to Chinese language lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants