kubernetes · k8s-ci-robot · Dec 25, 2019 · Oct 15, 2019 · Oct 15, 2019 · Oct 16, 2019
diff --git a/content/zh/_index.html b/content/zh/_index.html
@@ -1,61 +1,82 @@
 ---
 title: "生产级别的容器编排系统"
 abstract: "自动化的容器部署、扩展和管理"
-cid: "home"
+cid: home
 ---
 
 {{< deprecationwarning >}}
 
 {{< blocks/section id="oceanNodes" >}}
 {{% blocks/feature image="flower" %}}
-### [Kubernetes (K8s)]({{< relref "/docs/concepts/overview/what-is-kubernetes" >}})
-是一个开源系统，用于容器化应用的自动部署、扩缩和管理。
 
-Kubernetes 将构成应用的容器按逻辑单位进行分组以便于管理和发现。
-Kubernetes 基于 [谷歌公司在运行生产负载上的 15 年经验](http://queue.acm.org/detail.cfm?id=2898444)
-打造，并融合了来自社区的最佳建议与实践。
+<!-- ### [Kubernetes]({{< relref "/docs/concepts/overview/what-is-kubernetes" >}}) is an open-source system for automating deployment, scaling, and management of containerized applications. -->
+### [Kubernetes]({{< relref "/docs/concepts/overview/what-is-kubernetes" >}}) 是用于自动部署，扩展和管理容器化应用程序的开源系统。
+
+<!-- It groups containers that make up an application into logical units for easy management and discovery.
+Kubernetes builds upon [15 years of experience of running production workloads at Google](http://queue.acm.org/detail.cfm?id=2898444),
+combined with best-of-breed ideas and practices from the community. -->
+
+它将组成应用程序的容器组合成逻辑单元，以便于管理和服务发现。Kubernetes 源自[Google 15 年生产环境的运维经验](http://queue.acm.org/detail.cfm?id=2898444)，同时凝聚了社区的最佳创意和实践。
+
 {{% /blocks/feature %}}
 
 {{% blocks/feature image="scalable" %}}
-#### 星际规模
 
-基于一定的规则原理，谷歌公司每周能够运行数十亿的容器；通过遵循相同的设计，
-Kubernetes 能够在保持现有运维团队规模的前提下完成集群的弹性伸缩。
+<!-- #### Planet Scale -->
+#### 星际尺度
+
+<!-- Designed on the same principles that allows Google to run billions of containers a week,
+Kubernetes can scale without increasing your ops team. -->
+
+Google 每周运行数十亿个容器，Kubernetes 基于与之相同的原则来设计，能够在不扩张运维团队的情况下进行规模扩展。
 
 {{% /blocks/feature %}}
 
 {{% blocks/feature image="blocks" %}}
-#### 永不过时
 
-无论是在本地测试还是支撑全球化企业业务，Kubernetes 的灵活性使得其能够与您一起成长。
-无论您的需求多么复杂，Kubernetes 都能助您始终如一地、轻而易举地交付应用。
+<!-- #### Never Outgrow -->
+#### 处处适用
+
+<!-- Whether testing locally or running a global enterprise, Kubernetes flexibility grows with you to deliver your applications
+consistently and easily no matter how complex your need is. -->
+
+无论是本地测试，还是跨国公司，Kubernetes 的灵活性都能让你在应对复杂系统时得心应手。
 
 {{% /blocks/feature %}}
 
 {{% blocks/feature image="suitcase" %}}
-#### 随处运行
 
-作为一个开源系统，Kubernetes 使您能够自由地获得内部云、混合云或公有云基础设施所提供的便利，
-并根据需要轻松地迁移工作负载。
+<!-- #### Run Anywhere -->
+#### 永不过时
+
+<!-- Kubernetes is open source giving you the freedom to take advantage of on-premises, hybrid,
+or public cloud infrastructure, letting you effortlessly move workloads to where it matters to you. -->
+
+Kubernetes 是开源系统，可以自由地部署在企业内部，私有云、混合云或公有云，让您轻松地做出合适的选择。
 
 {{% /blocks/feature %}}
 
 {{< /blocks/section >}}
 
 {{< blocks/section id="video" background-image="kub_video_banner_homepage" >}}
+
 <div class="light-text">
-<h2>将超过 150 个微服务迁移到 Kubernetes 时遇到的挑战</h2>
-        <p>Sarah Wells, Technical Director for Operations and Reliability, Financial Times</p>
-        <button id="desktopShowVideoButton" onclick="kub.showVideo()">观看视频</button>
-        <br>
-        <br>
-        <br>
-        <a href="https://events.linuxfoundation.org/events/kubecon-cloudnativecon-north-america-2019" button id="desktopKCButton">参加 2019 年 11 月 18 日的 San Diego KubeCon</a>
-        <br>
-        <br>
-        <br>
-        <br>
-        <a href="https://events.linuxfoundation.org/events/kubecon-cloudnativecon-europe-2020/" button id="desktopKCButton">参加 2020 年 3 月 30 日的 Amsterdam KubeCon</a>
+    <!-- <h2>The Challenges of Migrating 150+ Microservices to Kubernetes</h2> -->
+    <h2>将 150+ 微服务迁移到 Kubernetes 上的挑战</h2>
+    <!-- <p>By Sarah Wells, Technical Director for Operations and Reliability, Financial Times</p> -->
+    <p>Sarah Wells, 运营和可靠性技术总监, 金融时报</p>
+    <button id="desktopShowVideoButton" onclick="kub.showVideo()">Watch Video</button>
+    <br>
+    <br>
+    <br>
+    <!-- <a href="https://www.lfasiallc.com/events/kubecon-cloudnativecon-china-2018/" button id="desktopKCButton">Attend KubeCon in Shanghai on Nov. 13-15, 2018</a> -->
+    <a href="https://www.lfasiallc.com/events/kubecon-cloudnativecon-china-2018/" button id="desktopKCButton">参加11月13日到15日的上海 KubeCon</a>
+    <br>
+    <br>
+    <br>
+    <br>
+    <!-- <a href="https://events.linuxfoundation.org/events/kubecon-cloudnativecon-north-america-2018/" button id="desktopKCButton">Attend KubeCon in Seattle on Dec. 11-13, 2018</a> -->
+    <a href="https://events.linuxfoundation.org/events/kubecon-cloudnativecon-north-america-2018/" button id="desktopKCButton">参加12月11日到13日的西雅图 KubeCon</a>
 </div>
 <div id="videoPlayer">
     <iframe data-url="https://www.youtube.com/embed/H06qrNmGqyE?autoplay=1" frameborder="0" allowfullscreen></iframe>

diff --git a/content/zh/blog/_posts/2015-03-00-Kubernetes-Gathering-Videos.md b/content/zh/blog/_posts/2015-03-00-Kubernetes-Gathering-Videos.md
@@ -0,0 +1,27 @@
+---
+
+title: " Kubernetes 采集视频 "
+date: 2015-03-23
+slug: kubernetes-gathering-videos
+url: /blog/2015/03/Kubernetes-Gathering-Videos
+---
+
+<!--
+---
+
+title: " Kubernetes Gathering Videos "
+date: 2015-03-23
+slug: kubernetes-gathering-videos
+url: /blog/2015/03/Kubernetes-Gathering-Videos
+---
+-->
+
+<!--
+If you missed the Kubernetes Gathering in SF last month, fear not! Here are the videos from the evening presentations organized into a playlist on YouTube
+
+[![Kubernetes Gathering](https://img.youtube.com/vi/q8lGZCKktYo/0.jpg)](https://www.youtube.com/playlist?list=PL69nYSiGNLP2FBVvSLHpJE8_6hRHW8Kxe)
+-->
+
+如果你错过了上个月在旧金山举行的 Kubernetes 大会，不要害怕!以下是在 YouTube 上组织成播放列表的晚间演示文稿中的视频。
+
+[![Kubernetes Gathering](https://img.youtube.com/vi/q8lGZCKktYo/0.jpg)](https://www.youtube.com/playlist?list=PL69nYSiGNLP2FBVvSLHpJE8_6hRHW8Kxe)
diff --git a/content/zh/blog/_posts/2015-03-00-Weekly-Kubernetes-Community-Hangout.md b/content/zh/blog/_posts/2015-03-00-Weekly-Kubernetes-Community-Hangout.md
@@ -0,0 +1,186 @@
+---
+title: " Kubernetes 社区每周聚会笔记 - 2015年3月27日 "
+date: 2015-03-28
+slug: weekly-kubernetes-community-hangout
+url: /blog/2015/03/Weekly-Kubernetes-Community-Hangout
+---
+
+<!--
+---
+title: " Weekly Kubernetes Community Hangout Notes - March 27 2015 "
+date: 2015-03-28
+slug: weekly-kubernetes-community-hangout
+url: /blog/2015/03/Weekly-Kubernetes-Community-Hangout
+---
+-->
+
+<!--
+Every week the Kubernetes contributing community meet virtually over Google Hangouts. We want anyone who's interested to know what's discussed in this forum.
+-->
+每个星期，Kubernetes 贡献者社区几乎都会在谷歌 Hangouts 上聚会。我们希望任何对此感兴趣的人都能了解这个论坛的讨论内容。
+
+<!--
+Agenda:
+-->
+日程安排：
+
+<!--
+
+\- Andy - demo remote execution and port forwarding
+
+\- Quinton - Cluster federation - Postponed
+
+\- Clayton - UI code sharing and collaboration around Kubernetes
+
+-->
+
+\- Andy - 演示远程执行和端口转发
+
+\- Quinton - 联邦集群 - 延迟
+
+\- Clayton - 围绕 Kubernetes 的 UI 代码共享和协作
+
+<!--
+Notes from meeting:
+-->
+从会议指出：
+
+<!--
+
+1\. Andy from RedHat:
+
+-->
+
+1\. Andy 从 RedHat：
+
+<!--
+
+* Demo remote execution
+
+-->
+
+* 演示远程执行
+
+<!--
+
+    * kubectl exec -p $POD -- $CMD
+
+    * Makes a connection to the master as proxy, figures out which node the pod is on, proxies connection to kubelet, which does the interesting bit.  via nsenter.
+
+    * Multiplexed streaming over HTTP using SPDY
+
+    * Also interactive mode:
+
+    * Assumes first container.  Can use -c $CONTAINER to pick a particular one.
+
+    * If have gdb pre-installed in container, then can interactively attach it to running process
+
+        * backtrace, symbol tbles, print, etc.  Most things you can do with gdb.
+
+    * Can also with careful flag crafting run rsync over this or set up sshd inside container.
+
+    * Some feedback via chat:
+
+-->
+
+    * kubectl exec -p $POD -- $CMD
+
+    * 作为代理与主机建立连接，找出 pod 所在的节点，代理与 kubelet 的连接，这一点很有趣。通过 nsenter。
+
+    * 使用 SPDY 通过 HTTP 进行多路复用流式传输
+
+    * 还有互动模式：
+
+    * 假设第一个容器，可以使用 -c $CONTAINER 一个特定的。
+
+    * 如果在容器中预先安装了 gdb，则可以交互地将其附加到正在运行的进程中
+
+        * backtrace、symbol tbles、print 等。  使用gdb可以做的大多数事情。
+
+    * 也可以用精心制作的参数在上面运行 rsync 或者在容器内设置 sshd。
+
+    * 一些聊天反馈：
+
+<!--
+
+* Andy also demoed port forwarding
+* nsenter vs. docker exec
+
+-->
+
+* Andy 还演示了端口转发
+* nnsenter 与 docker exec
+
+<!--
+
+    * want to inject a binary under control of the host, similar to pre-start hooks
+
+    * socat, nsenter, whatever the pre-start hook needs
+
+-->
+
+    * 想要在主机的控制下注入二进制文件，类似于预启动钩子
+
+    * socat、nsenter，任何预启动钩子需要的
+
+<!--
+
+* would be nice to blog post on this
+* version of nginx in wheezy is too old to support needed master-proxy functionality
+
+-->
+
+* 如果能在博客上发表这方面的文章就太好了
+* wheezy 中的 nginx 版本太旧，无法支持所需的主代理功能
+
+<!--
+
+2\. Clayton: where are we wrt a community organization for e.g. kubernetes UI components?
+
+* google-containers-ui IRC channel, mailing list.
+* Tim: google-containers prefix is historical, should just do "kubernetes-ui"
+* also want to put design resources in, and bower expects its own repo.
+* General agreement
+
+-->
+
+2\. Clayton: 我们的社区组织在哪里，例如 kubernetes UI 组件？
+
+* google-containers-ui IRC 频道，邮件列表。
+* Tim: google-containers 前缀是历史的，应该只做 "kubernetes-ui"
+* 也希望将设计资源投入使用，并且 bower 期望自己的仓库。
+* 通用协议
+
+<!--
+
+3\. Brian Grant:
+
+* Testing v1beta3, getting that ready to go in.
+* Paul working on changes to commandline stuff.
+* Early to mid next week, try to enable v1beta3 by default?
+* For any other changes, file issue and CC thockin.
+
+-->
+
+3\. Brian Grant:
+
+* 测试 v1beta3，准备进入。
+* Paul 力于改变命令行的内容。
+* 下周初至中旬，尝试默认启用v1beta3 ?
+* 对于任何其他更改，请发出文件并抄送 thockin。
+
+<!--
+
+4\. General consensus that 30 minutes is better than 60
+
+-->
+
+4\. 一般认为30分钟比60分钟好
+
+<!--
+
+* Shouldn't artificially try to extend just to fill time.
+
+-->
+
+* 不应该为了填满时间而人为地延长。
diff --git a/content/zh/blog/_posts/2015-03-00-Welcome-To-Kubernetes-Blog.md b/content/zh/blog/_posts/2015-03-00-Welcome-To-Kubernetes-Blog.md
@@ -0,0 +1,62 @@
+---
+title: 欢迎来到 Kubernetes 博客!
+date: 2015-03-20
+slug: welcome-to-kubernetes-blog
+url: /blog/2015/03/Welcome-To-Kubernetes-Blog
+---
+
+<!--
+---
+title: Welcome to the Kubernetes Blog! 
+date: 2015-03-20
+slug: welcome-to-kubernetes-blog
+url: /blog/2015/03/Welcome-To-Kubernetes-Blog
+---
+-->
+
+<!--
+Welcome to the new Kubernetes Blog. Follow this blog to learn about the Kubernetes Open Source project. We plan to post release notes, how-to articles, events, and maybe even some off topic fun here from time to time.
+-->
+欢迎来到新的 Kubernetes 博客。关注此博客，了解 Kubernetes 开源项目。我们计划不时发布发布说明，操作方法文章，活动，甚至一些非常有趣的话题。
+
+<!--
+If you are using Kubernetes or contributing to the project and would like to do a guest post, [please let me know](mailto:kitm@google.com).
+-->
+如果您正在使用 Kubernetes 或为该项目做出贡献并想要发帖子，[请告诉我](mailto:kitm@google.com)。
+
+<!--
+To start things off, here's a roundup of recent Kubernetes posts from other sites:
+-->
+首先，以下是 Kubernetes 最近在其他网站上发布的文章摘要：
+
+<!--
+- [Scaling MySQL in the cloud with Vitess and Kubernetes](http://googlecloudplatform.blogspot.com/2015/03/scaling-MySQL-in-the-cloud-with-Vitess-and-Kubernetes.html)
+- [Container Clusters on VMs](http://googlecloudplatform.blogspot.com/2015/02/container-clusters-on-vms.html)
+- [Everything you wanted to know about Kubernetes but were afraid to ask](http://googlecloudplatform.blogspot.com/2015/01/everything-you-wanted-to-know-about-Kubernetes-but-were-afraid-to-ask.html)
+- [What makes a container cluster?](http://googlecloudplatform.blogspot.com/2015/01/what-makes-a-container-cluster.html)
+- [Integrating OpenStack and Kubernetes with Murano](https://www.mirantis.com/blog/integrating-openstack-and-kubernetes-with-murano/)
+- [An introduction to containers, Kubernetes, and the trajectory of modern cloud computing](http://googlecloudplatform.blogspot.com/2015/01/in-coming-weeks-we-will-be-publishing.html)
+- [What is Kubernetes and how to use it?](http://www.centurylinklabs.com/what-is-kubernetes-and-how-to-use-it/)
+- [OpenShift V3, Docker and Kubernetes Strategy](https://blog.openshift.com/v3-docker-kubernetes-interview/)
+- [An Introduction to Kubernetes](https://www.digitalocean.com/community/tutorials/an-introduction-to-kubernetes)
+-->
+
+- [使用 Vitess 和 Kubernetes 在云中扩展 MySQL](http://googlecloudplatform.blogspot.com/2015/03/scaling-MySQL-in-the-cloud-with-Vitess-and-Kubernetes.html)
+- [虚拟机上的容器群集](http://googlecloudplatform.blogspot.com/2015/02/container-clusters-on-vms.html)
+- [想知道的关于 kubernetes 的一切，却又不敢问](http://googlecloudplatform.blogspot.com/2015/01/everything-you-wanted-to-know-about-Kubernetes-but-were-afraid-to-ask.html)
+- [什么构成容器集群？](http://googlecloudplatform.blogspot.com/2015/01/what-makes-a-container-cluster.html)
+- [将 OpenStack 和 Kubernetes 与 Murano 集成](https://www.mirantis.com/blog/integrating-openstack-and-kubernetes-with-murano/)
+- [容器介绍，Kubernetes 以及现代云计算的发展轨迹](http://googlecloudplatform.blogspot.com/2015/01/in-coming-weeks-we-will-be-publishing.html)
+- [什么是 Kubernetes 以及如何使用它？](http://www.centurylinklabs.com/what-is-kubernetes-and-how-to-use-it/)
+- [OpenShift V3，Docker 和 Kubernetes 策略](https://blog.openshift.com/v3-docker-kubernetes-interview/)
+- [Kubernetes 简介](https://www.digitalocean.com/community/tutorials/an-introduction-to-kubernetes)
+
+<!--
+Happy cloud computing!
+-->
+快乐的云计算！
+
+<!--
+ - Kit Merker - Product Manager, Google Cloud Platform
+-->
+ - Kit Merker - Google 云平台产品经理