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 into dev 1.17 #17209

Merged
merged 288 commits into from
Oct 28, 2019
Merged

Merged master into dev 1.17 #17209

merged 288 commits into from
Oct 28, 2019

Conversation

daminisatya
Copy link
Contributor

No description provided.

it2911 and others added 30 commits September 26, 2019 06:45
* initial commit

* promote AWS-NLB Support from alpha to beta (#14451) (#16459) (#16484)

* 1. Sync release-1.15 into master
2. Sync with en version

* 1. Add the lost yaml file.

* Update he cluster administration folder of concepts
1. Sync with 1.14 branch
2. Sync with en version

* Add yaml files which are used

* 1. Sync the configuration folder from 1.14 version
2. Sync the configuration folder files with en version
3. Changed some files structure for easily review
4. Add glossary folder for fixup build error

* 1. Sync the storage folder from 1.14 version
2. Sync the storage folder files with 1.16 version en document
3. Changed some files structure for easily review
* Fix incorrect advice about creating a secret

The existing command does not use code style as required by the style
guide and it is incorrect as rendered. Also, there's an easier way to do
this.

* Add reviewer suggested improvement for secret escaping

Adding sftim's suggestion phrasing explanation of escaping shell special characters.

Co-Authored-By: Tim Bannister <[email protected]>

* Make secret escaping instructions consistent
This version of flannel manifests include `cniVersion` that is
required for it to work properly with Kubernetes 1.16+.
* initial commit

* promote AWS-NLB Support from alpha to beta (#14451) (#16459) (#16484)

* 1. Sync release-1.15 into master
2. Sync with en version

* 1. Add the lost yaml file.

* Update he cluster administration folder of concepts
1. Sync with 1.14 branch
2. Sync with en version

* Add yaml files which are used

* 1. Sync the configuration folder from 1.14 version
2. Sync the configuration folder files with en version
3. Changed some files structure for easily review
4. Add glossary folder for fixup build error

* 1. Sync the storage folder from 1.14 version
2. Sync the storage folder files with 1.16 version en document
3. Changed some files structure for easily review

* 1. Sync the service-networking folder from 1.14 version
2. Sync the service-networking folder files with 1.16 version en document
3. Changed some files structure for easily review
4. Add the necessary documents
5. Add the runtime-class file
* Added logo change for blog site

Currently on blog site logo is not being changed when a page is scrolled down and therefore disappears. This fixes it

* Update _base.sass

changed email for CLA
* updated OR comments

* removed older long version to fetch labels for pods to use only kubectl get pods --show-labels
when copying/pasting the command to install the Kubernetes on Mac OS using zsh, the command results in the following error,
`The specified key does not exist.`. This is usually because of the `\` that zsh automatically inserts into the command. The best practice is to use double-quotes and this is also the standard method according to https://google.github.io/styleguide/shell.xml?showone=Quoting#Quoting
updating line 51 to correct the path for kube-scheduler
* add kubectl run deploy pod into specific namespace

* add my namespace
Script that generates audit policy file can change, so it's better to point user to file instead of specific line
Fix the spec in kubernetes-using-python example

Signed-off-by: Yishuang Lu <[email protected]>
* Modify #16415, #16417 korean docs. (#16467)
* Modify #16364 and links in korean docs. (#16508)
* Translate concepts/workloads/controllers/statefulset.md in Korean (#16443)
* Update outdated content in dev-1.16-ko.1 (#16502)
* Translate concepts/workloads/controllers/daemonset.md in Korean (#16477)
* Translate concepts/services-networking/dns-pod-service in Korean (#16299)

Co-Authored-By: June Yi <[email protected]>
Co-Authored-By: Yoon <[email protected]>
Co-Authored-By: Seokho Son <[email protected]>
Co-Authored-By: SoHye Choi <[email protected]>
Co-Authored-By: Yuk, Yongsu <[email protected]>
@k8s-ci-robot k8s-ci-robot added 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/ja Issues or PRs related to Japanese language language/ko Issues or PRs related to Korean language language/pt Issues or PRs related to Portuguese language language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. kind/support Categorizes issue or PR as a support question. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 26, 2019
@daminisatya
Copy link
Contributor Author

@jimangel I'm not able to add the tide/merge-method-merge label from GUI.

@bradtopol
Copy link
Contributor

These always scare me :-) Assigning @zacharysarah
/assign @zacharysarah

@jimangel
Copy link
Member

/hold
Waiting for kubernetes/org#1345 to merge so @daminisatya can apply the needed labels.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 26, 2019
@zacharysarah
Copy link
Contributor

Looks like kubernetes/org#1345 merged, so:
/hold cancel

Someone else can review for accuracy.

/approve

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Oct 27, 2019
@jimangel
Copy link
Member

/hold
Still waiting on merge label from @daminisatya, sorry @zacharysarah!

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 27, 2019
@daminisatya
Copy link
Contributor Author

@jimangel still cannot add a label from GUI. kubernetes/org#1345 is merged!

@jimangel jimangel added the tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. label Oct 28, 2019
@jimangel
Copy link
Member

@daminisatya manually added the label while I look into what permissions are needed to add labels.

/hold cancel
/lgtm
/approve

/cc @zacharysarah

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 28, 2019
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 28, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jimangel, 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 merged commit 7c217b5 into kubernetes:dev-1.17 Oct 28, 2019
@daminisatya
Copy link
Contributor Author

@jimangel Thank you. Looks like the merge was successful because of the label now.

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. area/blog Issues or PRs related to the Kubernetes Blog subproject cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/support Categorizes issue or PR as a support question. 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/ja Issues or PRs related to Japanese language language/ko Issues or PRs related to Korean language language/pt Issues or PRs related to Portuguese language language/zh Issues or PRs related to Chinese 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. 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.