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

Merged master release 1.16 #17964

Closed
wants to merge 268 commits into from
Closed

Merged master release 1.16 #17964

wants to merge 268 commits into from

Conversation

daminisatya
Copy link
Contributor

No description provided.

giom-l and others added 30 commits October 29, 2019 09:52
* Edit link in document.

* Update nodes.md
…17329)

In explanation of init container, doc says 'Initializing' pod
condition. However according to doc of pod condition[1], it may be
'Initialized'.

This commit fixes this misspell.

[1]
https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-conditions
Under `Extension Patterns` sections the link for `Flex Volume Plugins` is broken as the `flexvolume.md` file has been moved to new folder `/devel/sig-storage`. Reference commit `https://github.com/kubernetes/community/commit/ab55d850b8342abe1b87eb1c8bf397c4d05daff4`
Update content/es/docs/reference/glossary/sig.md

Co-Authored-By: Rael Garcia <[email protected]>

Update content/es/docs/reference/glossary/sig.md

Co-Authored-By: Rael Garcia <[email protected]>

Update content/es/docs/reference/glossary/sig.md

Co-Authored-By: Rael Garcia <[email protected]>

Update content/es/docs/reference/glossary/sig.md

Co-Authored-By: Rael Garcia <[email protected]>

Update content/es/docs/reference/glossary/sig.md

Co-Authored-By: Rael Garcia <[email protected]>

Solve YAML identation errors
Grammar errors and spelling corrections
There are many YAML manifests sneaking into the `zh/docs/` directory.
These files should go to the `zh/examples` directory instead. Having
these "garbage" files (not referenced anywhere) is creating confusion
for the release meister when merging branches. For example, some YAML
files found in the 'master' branch are no longer there in the
release-1.16 branch. It is tedious, if possible at all, to solve all
this kind of conflicts during a rebase.

The PR cleanses the zh/docs directory for all dangling YAML files.
Sometimes, pods like `coredns` only run on the master nodes. If there is a problem with upgrading the master node (e.g. if it is interrupted) those pods will not keep running - and other pods will have problems with connections. 

Draining the master node will switch those pods to other nodes before the upgrade-process.
* Update network-policies.md

Add explanation of policy evaluation order from kubernetes/kubernetes#75435

* edit text in network-policies.md
add missing "。" by the end of 参考 card.
@daminisatya daminisatya added tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 5, 2019
@k8s-ci-robot k8s-ci-robot added area/blog Issues or PRs related to the Kubernetes Blog subproject language/de Issues or PRs related to German language language/en Issues or PRs related to English language language/es Issues or PRs related to Spanish language language/fr Issues or PRs related to French language language/id Issues or PRs related to Indonesian language language/it Issues or PRs related to Italian language language/ja Issues or PRs related to Japanese language language/ko Issues or PRs related to Korean language language/vi Issues or PRs related to Vietnamese language language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Dec 5, 2019
@zacharysarah
Copy link
Contributor

@daminisatya It looks like the conflict resolution broke the PR.

@daminisatya
Copy link
Contributor Author

@jimangel Do you have any idea on how I can fix this error?

11:20:54 PM: Error: Error building site: "/opt/build/repo/content/zh/docs/tutorials/stateful-application/mysql-wordpress-persistent-volume.md:436:6": failed to extract shortcode: shortcode "capture" has no .Inner, yet a closing tag was provided

@zacharysarah
Copy link
Contributor

zacharysarah commented Dec 6, 2019

@daminisatya

Do you have any idea on how I can fix this error?

That looks like an error in Chinese content, specifically:
content/zh/docs/tutorials/stateful-application/mysql-wordpress-persistent-volume.md

But it also looks like the most recent PR to that file (#17341) didn't change any capture attributes.

@kubernetes/sig-docs-zh-owners ☝️

@xichengliudui
Copy link
Contributor

According to pr #17341 ,the contents of this file mysql-wordpress-persistent-volume.md should be copied directly from English.

@kbhawkey
Copy link
Contributor

kbhawkey commented Dec 6, 2019

It looks like an extra (?) capture was added on line 427. Look at the diff of the file.
https://github.com/kubernetes/website/blob/971b222bc024d32aad276953d50a0e47f294c7c9/content/zh/docs/tutorials/stateful-application/mysql-wordpress-persistent-volume.md

Also, there may be 2X whatsnext sections.

@k8s-ci-robot
Copy link
Contributor

Keywords which can automatically close issues and at(@) mentions are not allowed in commit messages.

The list of commits with invalid commit messages:

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. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Dec 6, 2019
@daminisatya
Copy link
Contributor Author

Another error

Error: Error building site: "/opt/build/repo/content/en/docs/tasks/federation/set-up-placement-policies-federation.md:26:1": failed to render shortcode "capture": failed to process shortcode: "/opt/build/repo/layouts/shortcodes/code.html:14:16": execute of template failed: template: shortcodes/code.html:14:16: executing "shortcodes/code.html" at <readFile $filename>: error calling readFile: runtime error: invalid memory address or nil pointer dereference

@kbhawkey
Copy link
Contributor

kbhawkey commented Dec 6, 2019

Another error

Error: Error building site: "/opt/build/repo/content/en/docs/tasks/federation/set-up-placement-policies-federation.md:26:1": failed to render shortcode "capture": failed to process shortcode: "/opt/build/repo/layouts/shortcodes/code.html:14:16": execute of template failed: template: shortcodes/code.html:14:16: executing "shortcodes/code.html" at <readFile $filename>: error calling readFile: runtime error: invalid memory address or nil pointer dereference

@daminisatya , Either the file (arg to shortcode) does not exist any more or the shortcode should be changed from code to codenew (most likely).

@Colstuwjx
Copy link
Contributor

@daminisatya Just one note about this PR, you may need to also carry this PR #17976 since we need to update the HUGO_VERSION in netlify.toml as well.

@daminisatya
Copy link
Contributor Author

@Colstuwjx sure!

@daminisatya daminisatya closed this Dec 8, 2019
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. do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. language/de Issues or PRs related to German language language/en Issues or PRs related to English language language/es Issues or PRs related to Spanish language language/fr Issues or PRs related to French language language/id Issues or PRs related to Indonesian language language/it Issues or PRs related to Italian language language/ja Issues or PRs related to Japanese language language/ko Issues or PRs related to Korean language language/vi Issues or PRs related to Vietnamese language language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.