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

Update dev-1.15 with master content #14949

Closed
wants to merge 629 commits into from

Conversation

makoscafee
Copy link
Contributor

This PR aims at resolving conflicts in branch dev-1.15 was tested here makoscafee#1 is an exact copy of kubernetes dev-1.15 official documentation) and the PR used to resolve conflicts makoscafee#2

sftim and others added 30 commits May 13, 2019 12:51
…-management/ (kubernetes#14298)

* Add missing capture block end

* Drop outdated link to v1.6 upgrade
Dutch (NL) translation

Update i18n/nl.toml

Co-Authored-By: olku <22026726+olku@users.noreply.github.com>

Update i18n/nl.toml

Co-Authored-By: olku <22026726+olku@users.noreply.github.com>

Update i18n/nl.toml

Co-Authored-By: olku <22026726+olku@users.noreply.github.com>

Update nl.toml

Update i18n/nl.toml

Co-Authored-By: Roy Lenferink <lenferinkroy@gmail.com>

Feedback processed.
Fix a node IP issue when using vagrant.
See kubernetes/kubernetes#60835 for detail.

Since the tutorial using debs, we need to configure node IP in
`/etc/default/kubelet`.
See https://kubernetes.io/docs/setup/independent/kubelet-integration/ for
detail.
* Fix phrase

* Fix date format on glossary files
change the formatting of example-ingress.yaml file. 
Raising PR for kubernetes#14284
Add meeting guidelines, graphic

Update embedded image

Use raw HTML for image link

Edit path

Indent list items

minor edits

Add line breaks for indentation

Add bolding

Add section for meetings

Feedback from jimangel
Rather than just saying "they exist, good luck"
Add missing dot

Remove typos
Use title case for all the Pod occurrences which appear in the rkt
glossary term.
here apt installs both kubelet and kubectl but just holds kubelet. I think kubectl should alse be held by apt-mark.

```
# replace x in 1.14.x-00 with the latest patch version
apt-mark unhold kubelet && \
apt-get update && apt-get install -y kubelet=1.14.x-00 kubectl=1.14.x-00 && \
apt-mark hold kubelet
```
* Update create-cluster-kubeadm.md

* Update create-cluster-kubeadm.md

* Remove superfluous kubectl apply -f
Items is an array and the [ ] are missing in the jsonpath
)

* Correcting order of display for daemon set tasks

Correcting order of display for daemon set tasks

* Correcting display order of daemon set task

Correcting display order of daemon set task
jarst and others added 22 commits June 12, 2019 06:59
Add note: Docker for Windows adds its own kubectl to PATH
Signed-off-by: Ben Hall <ben@benhall.me.uk>
…rnetes#14782)

* Added blog post about the upcoming Contributor Summit Shanghai.

* Update content/en/blog/_posts/2019-06-11-contributor-summit-shanghai.md

Spell out CLA

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

* Update content/en/blog/_posts/2019-06-11-contributor-summit-shanghai.md

Spell out KEP

Co-Authored-By: chenrui <rui@meetup.com>

* Update content/en/blog/_posts/2019-06-11-contributor-summit-shanghai.md

define f2f

Co-Authored-By: chenrui <rui@meetup.com>

* Update content/en/blog/_posts/2019-06-11-contributor-summit-shanghai.md

comma

Co-Authored-By: chenrui <rui@meetup.com>

* Update content/en/blog/_posts/2019-06-11-contributor-summit-shanghai.md

add meeting

Co-Authored-By: chenrui <rui@meetup.com>

* Update content/en/blog/_posts/2019-06-11-contributor-summit-shanghai.md

localized/internationalized

Co-Authored-By: chenrui <rui@meetup.com>

* Update and rename 2019-06-11-contributor-summit-shanghai.md to 2019-06-12-contributor-summit-shanghai.md
add default value for housekeeping interval
* update pick-right-solution to setup page Fixes-14476

* update pick-right-solution to setup page kubernetes#14866
…4837)

* zh-trans: add 2019-06-11-contributor-summit-shanghai.md

* s/贡献者峰会活动/贡献者峰会/

* s/不过/不论/

* Adopt PR suggestion

* s/你/您/

* s/当前贡献者节/现有贡献者活动/

* s/在亚洲和大洋洲的很多贡献者/很多亚洲和大洋洲的贡献者/

* s/新开发者/新贡献者/

* Adopt PR suggestion.

* s/上海会展中心/上海世博中心/

* s/工作者/贡献者/

* Refresh original English text as the related PR got merged

* Rename the filename to be consistent with English blog post PR
…4513)

* add pod preset page for language/id

* fix formatting

* fix typos and wording

* fix formatting and add few missed lines

* fix note formatting

* add Garbage Collection page in Bahasa Indonesia and minor fix on Pod Preset page

* remove replication.yaml

* add controllers/replicaset.yaml to example

* fix formatting error

* change dependent to dependen and fix note translation

* delete trailing space in heading
* Fixes-14477

* update pick-right-solution to setup page Fixes-14476

* update sentences and fix typo lang/it Fixes-14477

* Revert "update pick-right-solution to setup page Fixes-14476"

This reverts commit e949a7f.

revert wrong commit
…ubernetes#14874)

Change List
* ko: add tutorials/clusters/apparmor kubernetes#12455 (kubernetes#14613)
* ko: add tasks/access-application-cluster/configure-dns-cluster (kubernetes#14628)
* ko: add tasks/access-application-cluster/communicate-containers-same-… (kubernetes#14627)
* ko: Update outdated files of setup and tasks in dev-1.14-ko.5 partly (kubernetes#14683)
* translate to content/ko/docs/concepts/cluster-administration/cluster-… (kubernetes#14237)
* Update renamed or deleted files in dev-1.14-ko.5 (kubernetes#14710)
* Create pod.md (kubernetes#13927)

Co-Authored-By:    Yoon <learder@gmail.com>
Co-Authored-By:    Woojin Na(Eddie) <kimchigood1130@gmail.com>
Co-Authored-By:    Claudia J. Kang <claudiajkang@gmail.com>
- fix YAML marked as shell
- trim trailing whitespace
* Tidy code blocks

* Reword for better readability
@k8s-ci-robot k8s-ci-robot added the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Jun 17, 2019
@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.

@k8sio-netlify-preview-bot
Copy link
Collaborator

Deploy preview for kubernetes-io-vnext-staging processing.

Building with commit 5736f96

https://app.netlify.com/sites/kubernetes-io-vnext-staging/deploys/5d07e6f940a4e6000899db22

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 17, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by:

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 Jun 17, 2019
@makoscafee makoscafee closed this Jun 17, 2019
@makoscafee makoscafee deleted the conflicts-dev-1.15 branch June 17, 2019 19:18
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. do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.