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 to dev 1.18 #19541

Merged

Conversation

VineethReddy02
Copy link
Contributor

As a part of 1.18 docs release teamwork. Syncing up branches between master and dev-1.18
@sftim @zacharysarah

k8s-ci-robot and others added 20 commits March 5, 2020 15:52
* Consolidate and redirect training

* Update static/_redirects

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

* Remove Udacity link

Co-authored-by: Tim Bannister <[email protected]>
* Update deploy-interactive to include note on pods

Signed-off-by: Dean Coakley <[email protected]>

* Update copy

Signed-off-by: Dean Coakley <[email protected]>
An error occurred when executing the original command. After comparison, it was found that there was a problem with the command on the Chinese document.
…beconfig.md (kubernetes#17172)

* starting with the translation

* updating, review and adding more translations

* updating, review and adding more translations

* last review

* replaced 'archivos' by 'ficheros'

* removed comments with original content

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* replaced 'ficheros by archivos' and 'fichero by archivo'

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

* Update content/es/docs/concepts/configuration/organize-cluster-access-kubeconfig.md

Co-Authored-By: Victor Morales <[email protected]>

Co-authored-by: Victor Morales <[email protected]>
…ubernetes#19276)

* create rabc.md file

Add rbac.md file,  I found that there is no corresponding Chinese translation in the official website, so I translated rbac.md in Chinese, I hope it will be helpful, thanks
新增rabc.md文件,我发现官网中没有对应的中文翻译,所以我将官网中对应的rbac文档翻译成中文,希望有帮助,谢谢

* update rbac.md

Add comments to the original English text

* update rbac.md

中英文之间应留白处未留白;
中文仍有半角标点出现;
有些句子不符合汉语表达习惯;
有些英文原文需要多读几遍,以求正确理解。

* update rbac.md

review更新至代码行1940行

* update  rbac.md

* update rbac.md

update zh-trans content/zh/docs/reference/access-authn-authz/rbac.md

* update rbac.md

replace line 1-4 with "---".

* update rbac.md

del 1,3 line

* update rbac.md

line 42, add a space .because of the API Overview's text display problem.

* update rbac.md

replace "角色(Role)" to “角色”

* update rbac.md

Permissive RBAC Permissions 'text format is error

* update rbac.md

translate the contents of the column
fix a bug that code examples don't match the corresponding descriptions  in section "存储Pod字段" and "存储容器字段" .
original:
```
For example, here’s the configuration file with a Pod name as `nginx-demo` and a Container name as `nginx`:
```
* Update to Outdated files in dev-1.17-ko.6 branch.

* Apply suggestions from code review

Co-Authored-By: Seokho Son <[email protected]>

Co-authored-by: Seokho Son <[email protected]>
…ernetes#19403)

* Add zh translation of

* update some translations

* resolve conversation

* resolve conversation
Added <time> </time> HTML element to the date heading in blog post articles. 
The opening <time> tag also was given a datetime attribute, with the value using another Hugo shortcode. Since these use Go time patterns; we included the following in the opening <time> tag datetime="{{ .Date.Format "2006-01-02" }}".
Replaced 107.178.254.228 with a documentation IP address 203.0.113.123
@VineethReddy02 VineethReddy02 added the tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. label Mar 7, 2020
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 7, 2020
@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/id Issues or PRs related to Indonesian language labels Mar 7, 2020
@k8s-ci-robot k8s-ci-robot added 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/pl Issues or PRs related to Polish language language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Mar 7, 2020
@VineethReddy02 VineethReddy02 changed the base branch from master to dev-1.18 March 7, 2020 18:48
@netlify
Copy link

netlify bot commented Mar 7, 2020

Deploy preview for kubernetes-io-master-staging ready!

Built with commit a02b7e9

https://deploy-preview-19541--kubernetes-io-master-staging.netlify.com

@sftim
Copy link
Contributor

sftim commented Mar 7, 2020

This looks the way I understand it's supposed to.
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 7, 2020
@zacharysarah
Copy link
Contributor

/approve

@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 Mar 7, 2020
@k8s-ci-robot k8s-ci-robot merged commit 899ab7b into kubernetes:dev-1.18 Mar 7, 2020
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. 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/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/pl Issues or PRs related to Polish 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.