Simplify sentence

minor correction for datastore storage folder
Fix spelling error (#4528 )
2017-07-28 01:01:48 -07:00 · 2017-07-28 00:54:09 -07:00 · 2017-07-27 16:51:16 -07:00 · 2017-07-27 15:26:14 -07:00 · 2017-07-27 15:23:25 -07:00 · 2017-07-27 14:42:20 -07:00
988 changed files with 131142 additions and 3983 deletions
@@ -7,4 +7,3 @@ overrides:
 - path: docs/admin/kube-scheduler.md
 - path: docs/admin/kubelet.md
 - copypath: k8s/federation/docs/api-reference/ docs/federation/
- copypath: k8s/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml docs/getting-started-guides/fluentd-gcp.yaml
@@ -6,6 +6,7 @@ toc:
 - title: Using the API
  section:
  - docs/reference/api-overview.md
+  - docs/reference/client-libraries.md
  - title: Accessing the API
    section:
    - docs/admin/accessing-the-api.md
@@ -127,9 +127,11 @@ toc:
  - docs/tasks/administer-cluster/dns-horizontal-autoscaling.md
  - docs/tasks/administer-cluster/safely-drain-node.md
  - docs/tasks/administer-cluster/declare-network-policy.md
-  - docs/tasks/administer-cluster/calico-network-policy.md
-  - docs/tasks/administer-cluster/romana-network-policy.md
-  - docs/tasks/administer-cluster/weave-network-policy.md
+  - title: Install Network Policy Provider
+    section:
+    - docs/tasks/administer-cluster/calico-network-policy.md
+    - docs/tasks/administer-cluster/romana-network-policy.md
+    - docs/tasks/administer-cluster/weave-network-policy.md
  - docs/tasks/administer-cluster/change-pv-reclaim-policy.md
  - docs/tasks/administer-cluster/configure-pod-disruption-budget.md
  - docs/tasks/administer-cluster/limit-storage-consumption.md
@@ -4,10 +4,11 @@
    <link rel="shortcut icon" type="image/png" href="/images/favicon.png">
    <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic">
    <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto+Mono">
-    <link rel="stylesheet" type="text/css" href="/css/styles.css">
+    {% if page.case_study_styles %}<link rel="stylesheet" type="text/css" href="/css/case_study_styles.css"><!-- custom case_study_styles on -->{% else %}<link rel="stylesheet" type="text/css" href="/css/styles.css"><!-- default styles.css on -->{% endif %}
    <link rel="stylesheet" type="text/css" href="/css/jquery-ui.min.css">
    <link rel="stylesheet" type="text/css" href="/css/sweetalert.css">
    {% if page.class == "gridPage" %}<link rel="stylesheet" type="text/css" href="/css/gridpage.css">{% endif %}
+    {% if page.css %}<link rel="stylesheet" type="text/css" href="{{ page.css }}"><!-- custom css added -->{% else %}<!-- no custom css detected -->{% endif %}

    {% if page.description %}
    <meta name="description" content="{{ page.description }}" />
@@ -39,7 +39,7 @@
 			type: 0,
 			name: 'Citrix',
 			logo: 'citrix',
-			link: 'http://wercker.com/workflows/partners/kubernetes/',
+			link: 'https://www.citrix.com/networking/microservices.html',
 			blurb: 'Netscaler CPX gives app developers all the features they need to load balance their microservices and containerized apps with Kubernetes.'
 		},
 		{
@@ -67,7 +67,7 @@
 			type: 0,
 			name: 'Wercker',
 			logo: 'wercker',
-			link: 'http://wercker.com/workflows/partners/kubernetes/',
+			link: 'http://www.wercker.com/integrations/kubernetes',
 			blurb: 'Wercker automates your build, test and deploy pipelines for launching containers and triggering rolling updates on your Kubernetes cluster. '
 		},
 		{
@@ -183,7 +183,7 @@
 			blurb: 'Aporeto makes cloud-native applications secure by default without impacting developer velocity and works at any scale, on any cloud.'
 		},
 		{
-  		type: 0,
+  			type: 0,
 			name: 'Giant Swarm',
 			logo: 'giant_swarm',
 			link: 'https://giantswarm.io',
@@ -413,13 +413,6 @@
 			link: 'http://www.stackoverdrive.net/kubernetes-consulting/',
 			blurb: 'We are a devops consulting firm and we do alot of work with containers and Kunbernetes is one of our go to tools.'
  		},
-		{
- 			type: 0,
- 			name: 'F5 Networks',
- 			logo: 'f5networks',
- 			link: 'https://f5.com/about-us/news/press-kit',
- 			blurb: 'Integration of our ADC services with Kubernetes'
-  		},
 		{
 			type: 0,
 			name: 'StackIQ, Inc.',
@@ -459,8 +452,8 @@
 			type: 1,
 			name: 'Lovable Tech',
 			logo: 'lovable',
- 			link: 'https://drive.google.com/file/d/0BxCnAyMK1pgBTUFOdEZsUndLa01xMGJYZWtUVmVOdldadk80/view?usp=sharing',
- 			blurb: ''
+ 			link: 'http://lovable.tech/',
+ 			blurb: 'World class engineers, designers, and strategic consultants helping you ship Lovable web & mobile technology.'
  		},
 		{
 			type: 0,
@@ -0,0 +1 @@
+{{ content }}
@@ -0,0 +1,99 @@
+// SASS for Case Studies pages go here:
+
+hr
+  background-color: #999999
+
+h2
+  margin-bottom: 15px !important
+
+.subhead
+  padding-bottom: 2% !important
+  padding-top: 0% !important
+
+.details
+  margin-left: 1.9%
+  padding-right: 5%
+  font-size: 16px !important
+  padding-bottom: 2% !important
+
+.section1
+  margin-bottom: 3%
+  .cols
+    width: 80% !important
+    margin-left: 6.8%
+    padding-top: 1.5%
+    .col1
+      width: 52% !important
+      font-weight: 300 !important
+    .col2
+      width: 46% !important
+
+.banner2text
+  width: 63%
+  padding-top: 10%
+  padding-left: 0% !important
+  float: initial !important
+  text-align: center
+  margin: 0 auto
+  position: relative
+
+.banner3text, .banner4text, .banner5text
+  width: 63%
+  padding-left: 0% !important
+  float: initial !important
+  text-align: center
+  margin: 0 auto
+  position: relative
+
+.fullcol
+  float: initial !important
+
+body footer
+  background-color: #585858 !important
+
+.section1
+  float: left !important
+
+.banner1
+  padding-left: 11.9% !important
+
+.banner2
+  float: initial !important
+  padding-bottom: 2% !important
+
+footer
+  padding: 0% 7%
+
+.banner4, .banner3, .banner5
+  float: initial !important
+
+@media screen and (max-width: 910px)
+  .banner2text
+    width: 47%
+    padding-top: 45%
+  .details
+    margin-left: 0%
+    margin-bottom: 3%
+  .subhead
+    padding-bottom: 0% !important
+    padding-top: 0% !important
+  .banner3
+    width: 100% !important
+
+@media screen and (max-width: 780px)
+  .section1 .cols
+    width: 100% !important
+    margin-left: 0%
+    padding-top: 5%
+    .col1, .col2
+      width: 100% !important
+      margin-left: 0% !important
+  .fullcol
+    width: 90% !important
+    margin-left: 5% !important
+  .banner1
+    padding-left: 10% !important
+    margin-bottom: 6% !important
+  .banner2text
+    padding-top: 60% !important
+    padding-bottom: 2% !important
@@ -0,0 +1,127 @@
+---
+title: Ancestry Case Study
+layout: none
+class: gridPage
+cid: caseStudies
+---
+<!DOCTYPE html>
+<html>
+  <head>
+
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<link href="https://fonts.googleapis.com/css?family=Roboto:300,400" rel="stylesheet">
+<link rel="stylesheet" type="text/css" href="/css/style_ancestry.css">
+
+<title>Ancestry Case Study</title>
+
+</head>
+
+<body>
+
+<div class="banner1">
+  <h1> CASE STUDY:<img src="http://c.mfcreative.com/i/logo/ancestry-on-dark.svg" class="logo" width="22%" style="margin-bottom:-12px;margin-left:3px;"><br> <div class="subhead">Digging Into the Past With New Technology</div></h1>
+
+</div>
+
+<div class="details">
+  Company &nbsp;<b>Ancestry</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Location &nbsp;<b>Lehi, Utah</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Industry &nbsp;<b>Internet Company, Online Services</b>
+</div>
+
+<hr>
+
+<div class="cols">
+<div class="col1">
+
+<h2>Challenge</h2>
+Ancestry, the global leader in family history and consumer genomics, uses sophisticated engineering and technology to help everyone, everywhere discover the story of what led to them. The company has spent more than 30 years innovating and building products and technologies that at their core, result in real and emotional human responses. <a href="https://www.ancestry.com">Ancestry</a> currently serves more than 2.6 million paying subscribers, holds 20 billion historical records, 90 million family trees and more than four million people are in its AncestryDNA network, making it the largest consumer genomics DNA network in the world. The company's popular website, <a href="https://www.ancestry.com">ancestry.com</a>, has been working with big data long before the term was popularized. The site was built on hundreds of services, technologies and a traditional deployment methodology. "It's worked well for us in the past," says Paul MacKay, software engineer and architect at Ancestry, "but had become quite cumbersome in its processing and is time-consuming. As a primarily online service, we are constantly looking for ways to accelerate to be more agile in delivering our solutions and our&nbsp;products."
+
+<br>
+
+</div>
+
+<div class="col2">
+  <h2>Solution</h2>
+
+  The company is transitioning to cloud native infrastructure, using <a href="https://www.docker.com">Docker</a> containerization, <a href="https://kubernetes.io">Kubernetes</a> orchestration and <a href="https://prometheus.io">Prometheus</a> for cluster monitoring.<br>
+<br>
+<h2>Impact</h2>
+  "Every single product, every decision we make at Ancestry, focuses on delighting our customers with intimate, sometimes life-changing discoveries about themselves and their families," says MacKay. "As the company continues to grow, the increased productivity gains from using Kubernetes has helped Ancestry make customer discoveries faster. With the move to Dockerization for example, instead of taking between 20 to 50 minutes to deploy a new piece of code, we can now deploy in under a minute for much of our code. We’ve truly experienced a significant time savings in addition to the various features and benefits from cloud native and Kubernetes-type technologies."
+
+</div>
+
+</div>
+
+<div class="banner2">
+  <div class="banner2text">
+    "At a certain point, you have to step back if you're going to push a new technology and get key thought leaders with engineers within the organization to become your champions for new technology adoption. At training sessions, the development teams were always the ones that were saying, 'Kubernetes saved our time tremendously; it's an enabler. It really is incredible.'"<br><br><span style="font-size:16px">- PAUL MACKAY, SOFTWARE ENGINEER AND ARCHITECT AT ANCESTRY</span>
+  </div>
+</div>
+
+<div class="fullcol">
+<h2>It started with a Shaky Leaf.</h2>
+
+    Since its introduction a decade ago, the Shaky Leaf icon has become one of Ancestry's signature features, which signals to users that there's a helpful hint you can use to find out more about your family tree.<br><br>
+    So when the company decided to begin moving its infrastructure to cloud native technology, the first service that was launched on <a href="https://kubernetes.io">Kubernetes</a>, the open source platform for managing application containers across clusters of hosts, was this hint system. Think of it as Amazon's recommended products, but instead of recommending products the company recommends records, stories, or familial connections. "It was a very important part of the site," says Ancestry software engineer and architect Paul MacKay, "but also small enough for a pilot project that we knew we could handle in a very appropriate, secure way."<br><br>
+    And when it went live smoothly in early 2016, "our deployment time for this service literally was cut down from 50 minutes to 2 or 5 minutes," MacKay adds. "The development team was just thrilled because we're focused on supplying a great experience for our customers. And that means features, it means stability, it means all those things that we need for a first-in-class type operation."<br><br>
+    The stability of that Shaky Leaf was a signal for MacKay and his team that their decision to embrace cloud native technologies was the right one for the company. With a private data center, Ancestry built its website (which launched in 1996) on hundreds of services and technologies and a traditional deployment methodology. "It worked well for us in the past, but the sum of the legacy systems became quite cumbersome in its processing and was time-consuming," says MacKay. "We were looking for other ways to accelerate, to be more agile in delivering our solutions and our products."
+</div>
+
+<div class="banner3">
+  <div class="banner3text">
+"And when it [Kubernetes] went live smoothly in early 2016, 'our deployment time for this service literally was cut down from 50 minutes to 2 or 5 minutes,' MacKay adds. 'The development team was just thrilled because we're focused on supplying a great experience for our customers. And that means features, it means stability, it means all those things that we need for a first-in-class type operation.'"
+  </div>
+</div>
+
+<div class="fullcol">
+  That need led them in 2015 to explore containerization. Ancestry engineers had already been using technology like <a href="https://www.java.com/en/">Java</a> and <a href="https://www.python.org">Python</a> on Linux, so part of the decision was about making the infrastructure more Linux-friendly. They quickly decided that they wanted to go with Docker for containerization, "but it always comes down to the orchestration part of it to make it really work," says MacKay.<br><br>
+  His team looked at orchestration platforms offered by <a href="https://docs.docker.com/compose/">Docker Compose</a>, <a href="http://mesos.apache.org">Mesos</a> and <a href="https://www.openstack.org/software/">OpenStack</a>, and even started to prototype some homegrown solutions. And then they started hearing rumblings of the imminent release of Kubernetes v1.0. "At the forefront, we were looking at the secret store, so we didn't have to manage that all ourselves, the config maps, the methodology of seamless deployment strategy," he says. "We found that how Kubernetes had done their resources, their types, their labels and just their interface was so much further advanced than the other things we had seen. It was a feature fit."<br><br>
+  <div class="quote">
+  Plus, MacKay says, "I just believed in the confidence that comes with the history that Google has with containerization. So we started out right on the leading edge of it. And we haven't looked back since."</div><br>
+  Which is not to say that adopting a new technology hasn't come with some challenges. "Change is hard," says MacKay. "Not because the technology is hard or that the technology is not good. It's just that people like to do things like they had done [before]. You have the early adopters and you have those who are coming in later. It was a learning experience on both sides."<br><br>
+  Figuring out the best deployment operations for Ancestry was a big part of the work it took to adopt cloud native infrastructure. "We want to make sure the process is easy and also controlled in the manner that allows us the highest degree of security that we demand and our customers demand," says MacKay. "With Kubernetes and other products, there are some good solutions, but a little bit of glue is needed to bring it into corporate processes and governances. It's like having a set of gloves that are generic, but when you really do want to grab something you have to make it so it's customized to you. That's what we had to do."<br><br>
+  Their best practices include allowing their developers to deploy into development stage and production, but then controlling the aspects that need governance and auditing, such as secrets. They found that having one namespace per service is useful for achieving that containment of secrets and config maps. And for their needs, having one container per pod makes it easier to manage and to have a smaller unit of deployment.
+<br><br>
+</div>
+
+<div class="banner4">
+<div class="banner4text">
+
+"The success of Ancestry's first deployment of the hint system on Kubernetes helped create momentum for greater adoption of the technology."
+
+</div>
+</div>
+
+
+<div class="fullcol">
+  With that process established, the time spent on deployment was cut down to under a minute for some services. "As programmers, we have what's called REPL: read, evaluate, print, and loop, but with Kubernetes, we have CDEL: compile, deploy, execute, and loop," says MacKay. "It's a very quick loop back and a great benefit to understand that when our services are deployed in production, they're the same as what we tested in the pre-production environments. The approach of cloud native for Ancestry provides us a better ability to scale and to accommodate the business needs as work loads occur."<br><br>
+  The success of Ancestry's first deployment of the hint system on Kubernetes helped create momentum for greater adoption of the technology. "Engineers like to code, they like to do features, they don't like to sit around waiting for things to be deployed and worrying about scaling up and out and down," says MacKay. "After a while the engineers became our champions. At training sessions, the development teams were always the ones saying, 'Kubernetes saved our time tremendously; it's an enabler; it really is incredible.' Over time, we were able to convince our management that this was a transition that the industry is making and that we needed to be a part of it."<br><br>
+  A year later, Ancestry has transitioned a good number of applications to Kubernetes. "We have many different services that make up the rich environment that [the website] has from both the DNA side and the family history side," says MacKay. "We have front-end stacks, back-end stacks and back-end processing type stacks that are in the cluster."<br><br>
+  The company continues to weigh which services it will move forward to Kubernetes, which ones will be kept as is, and which will be replaced in the future and thus don't have to be moved over. MacKay estimates that the company is "approaching halfway on those features that are going forward. We don't have to do a lot of convincing anymore. It's more of an issue of timing with getting product management and engineering staff the knowledge and information that they need."
+</div>
+
+<div class="banner2">
+  <div class="banner2text">
+    "... 'I believe in Kubernetes. I believe in containerization. I think
+    if we can get there and establish ourselves in that world, we will be further along and far better off being agile and all the things we talk about,
+    and it'll&nbsp;go&nbsp;forward.'"
+  </div>
+</div>
+
+<div class="fullcol">
+
+
+Looking ahead, MacKay sees Ancestry maximizing the benefits of Kubernetes in 2017. "We're very close to having everything that should be or could be in a Linux-friendly world in Kubernetes by the end of the year," he says, adding that he's looking forward to features such as federation and horizontal pod autoscaling that are currently in the works. "Kubernetes has been very wonderful for us and we continue to ride the wave."<br><br>
+That wave, he points out, has everything to do with the vibrant Kubernetes community, which has grown by leaps and bounds since Ancestry joined it as an early adopter. "This is just a very rough way of judging it, but on Slack in June 2015, there were maybe 500 on there," MacKay says. "The last time I looked there were maybe 8,500 just on the Slack channel. There are so many major companies and different kinds of companies involved now. It's the variety of contributors, the number of contributors, the incredibly competent and friendly community."<br><br>
+As much as he and his team at Ancestry have benefited from what he calls "the goodness and the technical abilities of many" in the community, they've also contributed information about best practices, logged bug issues and participated in the open source conversation. And they've been active in attending <a href="https://www.meetup.com/Utah-Kubernetes-Meetup/">meetups</a> to help educate and give back to the local tech community in Utah. Says MacKay: "We're trying to give back as far as our experience goes, rather than just code."
+<br><br>When he meets with companies considering adopting cloud native infrastructure, the best advice he has to give from Ancestry's Kubernetes journey is this: "Start small, but with hard problems," he says. And "you need a patron who understands the vision of containerization, to help you tackle the political as well as other technical roadblocks that can occur when change is needed."<br><br>
+With the changes that MacKay's team has led over the past year and a half, cloud native will be part of Ancestry's technological genealogy for years to come. MacKay has been such a champion of the technology that he says people have jokingly accused him of having a Kubernetes tattoo.<br><br>
+"I really don't," he says with a laugh. "But I'm passionate. I'm not exclusive to any technology; I use whatever I need that's out there that makes us great. If it's something else, I'll use it. But right now I believe in Kubernetes. I believe in containerization. I think if we can get there and establish ourselves in that world, we will be further along and far better off being agile and all the things we talk about, and it'll go forward."<br><br>
+He pauses. "So, yeah, I guess you can say I'm an evangelist for Kubernetes," he says. "But I'm not getting a tattoo!"
+
+
+</div>
+
+
+</body>
+</html>
@@ -0,0 +1,111 @@
+---
+title: Box Case Study
+layout: basic
+case_study_styles: true
+cid: caseStudies
+css: /css/style_box.css
+---
+
+<div class="banner1">
+  <h1>CASE STUDY: <img src="/images/box_logo.png" width="10%" style="margin-bottom:-6px"><br>
+    <div class="subhead">An Early Adopter Envisions
+      a New Cloud Platform</div>
+  </h1>
+</div>
+
+
+<div class="details">
+    Company &nbsp;<b>Box</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Location &nbsp;<b>Redwood City, California</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Industry &nbsp;<b>Technology</b>
+</div>
+
+<hr>
+
+<section class="section1">
+
+<div class="cols">
+  <div class="col1">
+
+      <h2>Challenge</h2>
+        Founded in 2005, the enterprise content management company allows its more than 50 million users to manage content in the cloud. <a href="https://www.box.com/home">Box</a> was built primarily with bare metal inside the company’s own data centers, with a monolithic PHP code base. As the company was expanding globally, it needed to focus on "how we run our workload across many different cloud infrastructures from bare metal to public cloud," says Sam Ghods, Cofounder and Services Architect of Box. "It’s been a huge challenge because different clouds, especially bare metal, have very different interfaces."
+        <br>
+  </div>
+
+  <div class="col2">
+    <h2>Solution</h2>
+      Over the past couple of years, Box has been decomposing its infrastructure into microservices, and became an early adopter of, as well as contributor to, <a href="http://kubernetes.io/">Kubernetes</a> container orchestration. Kubernetes, Ghods says, has allowed Box’s developers to "target a universal set of concepts that are portable across all clouds."<br><br>
+
+    <h2>Impact</h2>
+      "Before Kubernetes," Ghods says, "our infrastructure was so antiquated it was taking us more than six months to deploy a new microservice. Today, a new microservice takes less than five days to deploy. And we’re working on getting it to an hour."
+  </div>
+</div>
+
+</section>
+
+<div class="banner2">
+  <div class="banner2text">
+      "We looked at a lot of different options, but Kubernetes really stood out....the fact that on day one it was designed to run on bare metal just as well as Google Cloud meant that we could actually migrate to it inside of our data centers, and then use those same tools and concepts to run across public cloud providers as&nbsp;well."<br><br><span style="font-size:15px;letter-spacing:0.08em">- SAM GHOUDS, CO-FOUNDER AND SERVICES ARCHITECT OF BOX</span>
+  </div>
+</div>
+
+<section class="section2">
+
+  <div class="fullcol">
+      <h2>In the summer of 2014, Box was feeling the pain of a decade’s worth of hardware and software infrastructure that wasn’t keeping up with the company’s needs.</h2>
+
+      A platform that allows its more than 50 million users (including governments and big businesses like <a href="https://www.ge.com/">General Electric</a>) to manage and share content in the cloud, Box was originally a <a href="http://php.net/">PHP</a> monolith of millions of lines of code built exclusively with bare metal inside of its own data centers. It had already begun to slowly chip away at the monolith, decomposing it into microservices. And "as we’ve been expanding into regions around the globe, and as the public cloud wars have been heating up, we’ve been focusing a lot more on figuring out how we run our workload across many different environments and many different cloud infrastructure providers," says Box Cofounder and Services Architect Sam Ghods. "It’s been a huge challenge thus far because all these different providers, especially bare metal, have very different interfaces and ways in which you work with them."<br><br>
+      Box’s cloud native journey accelerated that June, when Ghods attended <a href="https://www.docker.com/events/dockercon">DockerCon</a>. The company had come to the realization that it could no longer run its applications only off bare metal, and was researching containerizing with Docker, virtualizing with OpenStack, and supporting public cloud.<br><br>
+      At that conference, Google announced the release of its Kubernetes container management system, and Ghods was won over. "We looked at a lot of different options, but Kubernetes really stood out, especially because of the incredibly strong team of <a href="https://research.google.com/pubs/pub43438.html">Borg</a> veterans and the vision of having a completely infrastructure-agnostic way of being able to run cloud software," he says, referencing Google’s internal container orchestrator Borg. "The fact that on day one it was designed to run on bare metal just as well as <a href="https://cloud.google.com/">Google Cloud</a> meant that we could actually migrate to it inside of our data centers, and then use those same tools and concepts to run across public cloud providers as well."<br><br>
+      Another plus: Ghods liked that <a href="kubernetes.io">Kubernetes</a> has a universal set of API objects like pod, service, replica set and deployment object, which created a consistent surface to build tooling against. "Even PaaS layers like <a href="https://www.openshift.com/">OpenShift</a> or <a href="http://deis.io/">Deis</a> that build on top of Kubernetes still treat those objects as first-class principles," he says. "We were excited about having these abstractions shared across the entire ecosystem, which would result in a lot more momentum than we saw in other potential solutions."<br><br>
+      Box deployed Kubernetes in a cluster in a production data center just six months later. Kubernetes was then still pre-beta, on version 0.11. They started small: The very first thing Ghods’s team ran on Kubernetes was a Box API checker that confirms Box is up. "That was just to write and deploy some software to get the whole pipeline functioning," he says. Next came some daemons that process jobs, which was "nice and safe because if they experienced any interruptions, we wouldn’t fail synchronous incoming requests from customers."
+
+  </div>
+</section>
+
+<div class="banner3">
+  <div class="banner3text">
+    "As we’ve been expanding into regions around the globe, and as the public cloud wars have been heating up, we’ve been focusing a lot more on figuring out how we [can have Kubernetes help] run our workload across many different environments and many different cloud infrastructure providers."
+  </div>
+</div>
+
+<section class="section3">
+  <div class="fullcol">
+    The first live service, which the team could route to and ask for information, was launched a few months later. At that point, Ghods says, "We were comfortable with the stability of the Kubernetes cluster. We started to port some services over, then we would increase the cluster size and port a few more, and that’s ended up to about 100 servers in each data center that are dedicated purely to Kubernetes. And that’s going to be expanding a lot over the next 12 months, probably to many hundreds if not thousands."<br><br>
+    While observing teams who began to use Kubernetes for their microservices, "we immediately saw an uptick in the number of microservices being released," Ghods&nbsp;notes. "There was clearly a pent-up demand for a better way of building software through microservices, and the increase in agility helped our developers be more productive and make better architectural choices."
+    <br><br><div class="quote">"There was clearly a pent-up demand for a better way of building software through microservices, and the increase in agility helped our developers be more productive and make better architectural choices."</div><br>
+    Ghods reflects that as early adopters, Box had a different journey from what companies experience now. "We were definitely lock step with waiting for certain things to stabilize or features to get released," he says. "In the early days we were doing a lot of contributions [to components such as kubectl apply] and waiting for Kubernetes to release each of them, and then we’d upgrade, contribute more, and go back and forth several times. The entire project took about 18 months from our first real deployment on Kubernetes to having general availability. If we did that exact same thing today, it would probably be no more than six."<br><br>
+    In any case, Box didn’t have to make too many modifications to Kubernetes for it to work for the company. "The vast majority of the work our team has done to implement Kubernetes at Box has been making it work inside of our existing (and often legacy) infrastructure," says Ghods, "such as upgrading our base operating system from RHEL6 to RHEL7 or integrating it into <a href="https://www.nagios.org/">Nagios</a>, our monitoring infrastructure. But overall Kubernetes has been remarkably flexible with fitting into many of our constraints, and we’ve been running it very successfully on our bare metal infrastructure."<br><br>
+    Perhaps the bigger challenge for Box was a cultural one. "Kubernetes, and cloud native in general, represents a pretty big paradigm shift, and it’s not very incremental," Ghods says. "We’re essentially making this pitch that Kubernetes is going to solve everything because it does things the right way and everything is just suddenly better. But it’s important to keep in mind that it’s not nearly as proven as many other solutions out there. You can’t say how long this or that company took to do it because there just aren’t that many yet. Our team had to really fight for resources because our project was a bit of a moonshot."
+  </div>
+</section>
+
+  <div class="banner4">
+    <div class="banner4text">
+    "The vast majority of the work our team has done to implement Kubernetes at Box has been making it work inside of our existing [and often legacy] infrastructure....overall Kubernetes has been remarkably flexible with fitting into many of our constraints, and we’ve been running it very successfully on our bare metal infrastructure."
+    </div>
+  </div>
+
+<section class="section4">
+  <div class="fullcol">
+    Having learned from experience, Ghods offers these two pieces of advice for companies going through similar challenges:
+    <h2>1. Deliver early and often.</h2> Service discovery was a huge problem for Box, and the team had to decide whether to build an interim solution or wait for Kubernetes to natively satisfy Box’s unique requirements. After much debate, "we just started focusing on delivering something that works, and then dealing with potentially migrating to a more native solution later," Ghods says. "The above-all-else target for the team should always be to serve real production use cases on the infrastructure, no matter how trivial. This helps keep the momentum going both for the team itself and for the organizational perception of the project." </br></br>
+    <h2>2. Keep an open mind about what your company has to abstract away from developers and what it&nbsp;doesn’t.</h2> Early on, the team built an abstraction on top of Docker files to help ensure that images had the right security updates.
+    This turned out to be superfluous work, since container images are considered immutable and you can easily scan them post-build to ensure they do not contain vulnerabilities. Because managing infrastructure through containerization is such a discontinuous leap, it’s better to start by interacting directly with the native tools and learning their unique advantages and caveats. An abstraction should be built only after a practical need for it arises.</br></br>
+    In the end, the impact has been powerful. "Before Kubernetes," Ghods says, "our infrastructure was so antiquated it was taking us more than six months to deploy a new microservice. Now a new microservice takes less than five days to deploy. And we’re working on getting it to an hour. Granted, much of that six months was due to how broken our systems were, but bare metal is intrinsically a difficult platform to support unless you have a system like Kubernetes to help manage&nbsp;it."</br></br>
+    By Ghods’s estimate, Box is still several years away from his goal of being a 90-plus percent Kubernetes shop. "We’re very far along on having a mission-critical, stable Kubernetes deployment that provides a lot of value," he says. "Right now about five percent of all of our compute runs on Kubernetes, and I think in the next six months we’ll likely be between 20 to 50 percent. We’re working hard on enabling all stateless service use cases, and shift our focus to stateful services after&nbsp;that."
+  </div>
+</section>
+
+  <div class="banner5">
+    <div class="banner5text">
+    "Ghods predicts that Kubernetes has the opportunity to be the new cloud platform. '...because it’s a never-before-seen level of automation and intelligence surrounding infrastructure that is portable and agnostic to every way you can run your infrastructure.'"
+    </div>
+  </div>
+
+<section class="section5">
+  <div class="fullcol">
+    In fact, that’s what he envisions across the industry: Ghods predicts that Kubernetes has the opportunity to be the new cloud platform. Kubernetes provides an API consistent across different cloud platforms including bare metal, and "I don’t think people have seen the full potential of what’s possible when you can program against one single interface," he says. "The same way <a href="https://aws.amazon.com/">AWS</a> changed infrastructure so that you don’t have to think about servers or cabinets or networking equipment anymore, Kubernetes enables you to focus exclusively on the containers that you’re running, which is pretty exciting. That’s the vision."</br></br>
+    Ghods points to projects that are already in development or recently released for Kubernetes as a cloud platform: cluster federation, the Dashboard UI, and <a href="https://coreos.com/">CoreOS</a>’s etcd operator. "I honestly believe it’s the most exciting thing I’ve seen in cloud infrastructure," he says, "because it’s a never-before-seen level of automation and intelligence surrounding infrastructure that is portable and agnostic to every way you can run your infrastructure."</br></br>
+    Box, with its early decision to use bare metal, embarked on its Kubernetes journey out of necessity. But Ghods says that even if companies don’t have to be agnostic about cloud providers today, Kubernetes may soon become the industry standard, as more and more tooling and extensions are built around the API.</br></br>
+    "The same way it doesn’t make sense to deviate from Linux because it’s such a standard," Ghods says, "I think Kubernetes is going down the same path. It is still early days—the documentation still needs work and the user experience for writing and publishing specs to the Kubernetes clusters is still rough. When you’re on the cutting edge you can expect to bleed a little. But the bottom line is, this is where the industry is going. Three to five years from now it’s really going to be shocking if you run your infrastructure any other way."
+  </div>
+</section>
@@ -0,0 +1,125 @@
+---
+title: GolfNow Case Study
+layout: basic
+case_study_styles: true
+cid: caseStudies
+css: /css/style_golfnow.css
+---
+
+<div class="banner1">
+  <h1>CASE STUDY: <img src="/images/golfnow_logo.png" width="20%" style="margin-bottom:-6px"><br>
+    <div class="subhead">Saving Time and Money with Cloud Native Infrastructure</div>
+  </h1>
+</div>
+
+<div class="details">
+    Company&nbsp;<b>GolfNow</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Location&nbsp;<b>Orlando, Florida</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Industry&nbsp;<b>Golf Industry Technology and Services Provider</b>
+</div>
+
+<hr>
+
+<section class="section1">
+  <div class="cols">
+    <div class="col1">
+
+    <h2>Challenge</h2>
+      A member of the <a href="http://www.nbcunicareers.com/our-businesses/nbc-sports-group">NBC Sports Group</a>, <a href="https://www.golfnow.com/">GolfNow</a> is the golf industry’s technology and services leader, managing 10 different products, as well as the largest e-commerce tee time marketplace in the world. As its business began expanding rapidly and globally, GolfNow’s monolithic application became problematic. "We kept growing our infrastructure vertically rather than horizontally, and the cost of doing business became problematic," says Sheriff Mohamed, GolfNow’s Director, Architecture. "We wanted the ability to more easily expand globally."
+      <br>
+  </div>
+
+  <div class="col2">
+    <h2>Solution</h2>
+      Turning to microservices and containerization, GolfNow began moving its applications and databases from third-party services to its own clusters running on <a href="https://www.docker.com/">Docker</a> and <a href="http://kubernetes.io/">Kubernetes.</a><br><br>
+
+    <h2>Impact</h2>
+      The results were immediate. While maintaining the same capacity—and beyond, during peak periods—GolfNow saw its infrastructure costs for the first application virtually cut in half.
+    </div>
+  </div>
+</section>
+
+
+<div class="banner2">
+  <div class="banner2text">
+      "With our growth we obviously needed to expand our infrastructure, and we kept growing vertically rather than horizontally. We were basically wasting money and doubling the cost of our infrastructure."<br><br><span style="font-size:15px;letter-spacing:0.08em">- SHERIFF MOHAMED, DIRECTOR, ARCHITECTURE AT GOLFNOW</span>
+  </div>
+</div>
+
+<section class="section2">
+  <div class="fullcol">
+      <h2>It’s not every day that you can say you’ve slashed an operating expense by half.</h2>
+
+      But Sheriff Mohamed and Josh Chandler did just that when they helped lead their company, <a href="https://www.golfnow.com/">GolfNow</a>, on a journey from a monolithic to a containerized, cloud native infrastructure managed by Kubernetes.
+      <br> <br>
+      A top-performing business within the NBC Sports Group, GolfNow is a technology and services company with the largest tee time marketplace in the world. GolfNow serves 5 million active golfers across 10 different products. In recent years, the business had grown so fast that the infrastructure supporting their giant monolithic application (written in C#.NET and backed by SQL Server database management system) could not keep up. "With our growth we obviously needed to expand our infrastructure, and we kept growing vertically rather than horizontally," says Sheriff, GolfNow’s Director, Architecture. "Our costs were growing exponentially. And on top of that, we had to build a Disaster Recovery (DR) environment, which then meant we’d have to copy exactly what we had in our original data center to another data center that was just the standby. We were basically wasting money and doubling the cost of our infrastructure."
+      <br> <br>
+      In moving just the first of GolfNow’s important applications—a booking engine for golf courses and B2B marketing platform—from third-party services to their own Kubernetes environment, "our bill went down drastically," says Sheriff.
+      <br> <br>
+      The path to those stellar results began in late 2014. In order to support GolfNow’s global growth, the team decided that the company needed to have multiple data centers and the ability to quickly and easily re-route traffic as needed. "From there we knew that we needed to go in a direction of breaking things apart, microservices, and containerization," says Sheriff. "At the time we were trying to get away from <a href="https://www.microsoft.com/net">C#.NET</a> and <a href="https://www.microsoft.com/en-cy/sql-server/sql-server-2016">SQL Server</a> since it didn’t run very well on Linux, where everything container was running smoothly."
+      <br> <br>
+      To that end, the team shifted to working with <a href="https://nodejs.org/">Node.js</a>, the open-source, cross-platform JavaScript runtime environment for developing tools and applications, and <a href="https://www.mongodb.com/">MongoDB</a>, the open-source database program. At the time, <ahref="https://www.docker.com/">Docker</a>, the platform for deploying applications in containers, was still new. But once the team began experimenting with it, Sheriff says, "we realized that was the way we wanted to go, especially since that’s the way the industry is heading."
+  </div>
+</section>
+
+<div class="banner3">
+  <div class="banner3text">
+    "The team migrated the rest of the application into their Kubernetes cluster. And the impact was immediate: On top of cutting monthly costs by a large percentage, says Sheriff, 'Running at the same capacity and during our peak time, we were able to horizontally grow. Since we were using our VMs more efficiently with containers, we didn’t have to pay extra money at all.'"
+  </div>
+</div>
+
+<section class="section3">
+  <div class="fullcol">
+    GolfNow’s dev team ran an "internal, low-key" proof of concept and were won over. "We really liked how easy it was to be able to pass containers around to each other and have them up and running in no time, exactly the way it was running on my machine," says Sheriff. "Because that is always the biggest gripe that Ops has with developers, right? ‘It worked on my machine!’ But then we started getting to the point of, ‘How do we make sure that these things stay up and running?’" <br><br>
+    That led the team on a quest to find the right orchestration system for the company’s needs. Sheriff says the first few options they tried were either too heavy or "didn’t feel quite right." In late summer 2015, they discovered the just-released <a href="http://kubernetes.io/">Kubernetes</a>, which Sheriff immediately liked for its ease of use. "We did another proof of concept," he says, "and Kubernetes won because of the fact that the community backing was there, built on top of what Google had already done."
+    <br><br>
+    But before they could go with Kubernetes, <a href="http://www.nbc.com/">NBC</a>, GolfNow’s parent company, also asked them to comparison shop with another company. Sheriff and his team liked the competing company’s platform user interface, but didn’t like that its platform would not allow containers to run natively on Docker. With no clear decision in sight, Sheriff’s VP at GolfNow, Steve McElwee, set up a three-month trial during which a GolfNow team (consisting of Sheriff and Josh, who’s now Lead Architect, Open Platforms) would build out a Kubernetes environment, and a large NBC team would build out one with the other company’s platform.
+    <br><br>
+    "We spun up the cluster and we tried to get everything to run the way we wanted it to run," Sheriff says. "The biggest thing that we took away from it is that not only did we want our applications to run within Kubernetes and Docker, we also wanted our databases to run there. We literally wanted our entire infrastructure to run within Kubernetes."
+    <br><br>
+    At the time there was nothing in the community to help them get Kafka and MongoDB clusters running within a Kubernetes and Docker environment, so Sheriff and Josh figured it out on their own, taking a full month to get it right. "Everything started rolling from there," Sheriff says. "We were able to get all our applications connected, and we finished our side of the proof of concept a month in advance. My VP was like, ‘Alright, it’s over. Kubernetes wins.’"
+    <br><br>
+    The next step, beginning in January 2016, was getting everything working in production. The team focused first on one application that was already written in Node.js and MongoDB. A booking engine for golf courses and B2B marketing platform, the application was already going in the microservice direction but wasn’t quite finished yet. At the time, it was running in <a href="https://devcenter.heroku.com/articles/mongohq">Heroku Compose</a> and other third-party services—resulting in a large monthly bill.
+
+  </div>
+</section>
+
+  <div class="banner4">
+    <div class="banner4text">
+    "'The time I spent actually moving the applications was under 30 seconds! We can move data centers in just incredible amounts of time. If you haven’t come from the Kubernetes world you wouldn’t believe me.' Sheriff puts it in these terms: 'Before Kubernetes I wasn’t sleeping at night, literally. I was woken up all the time, because things were down. After Kubernetes, I’ve been sleeping at night.'"
+    </div>
+  </div>
+
+<section class="section4">
+  <div class="fullcol">
+    "The goal was to take all of that out and put it within this new platform we’ve created with Kubernetes on <a href="https://cloud.google.com/compute/">Google Compute Engine (GCE)</a>," says Sheriff. "So we ended up building piece by piece, in parallel, what was out in Heroku and Compose, in our Kubernetes cluster. Then, literally, just switched configs in the background. So in Heroku we had the app running hitting a Compose database. We’d take the config, change it and make it hit the database that was running in our cluster."
+    <br><br>
+    Using this procedure, they were able to migrate piecemeal, without any downtime. The first migration was done during off hours, but to test the limits, the team migrated the second database in the middle of the day, when lots of users were running the application. "We did it," Sheriff says, "and again it was successful. Nobody noticed."
+    <br><br>
+    After three weeks of monitoring to make sure everything was running stable, the team migrated the rest of the application into their Kubernetes cluster. And the impact was immediate: On top of cutting monthly costs by a large percentage, says Sheriff, "Running at the same capacity and during our peak time, we were able to horizontally grow. Since we were using our VMs more efficiently with containers, we didn’t have to pay extra money at all."
+    <br><br>
+    Not only were they saving money, but they were also saving time. "I had a meeting this morning about migrating some applications from one cluster to another," says Josh. "I spent about 2 hours explaining the process. The time I spent actually moving the applications was under 30 seconds! We can move data centers in just incredible amounts of time. If you haven’t come from the Kubernetes world you wouldn’t believe me." Sheriff puts it in these terms: "Before Kubernetes I wasn’t sleeping at night, literally. I was woken up all the time, because things were down. After Kubernetes, I’ve been sleeping at night."
+    <br><br>
+    A small percentage of the applications on GolfNow have been migrated over to the Kubernetes environment. "Our Core Team is rewriting a lot of the .NET applications into <a href="https://www.microsoft.com/net/core">.NET Core</a> [which is compatible with Linux and Docker] so that we can run them within containers," says Sheriff.
+    <br><br>
+    Looking ahead, Sheriff and his team want to spend 2017 continuing to build a whole platform around Kubernetes with <a href="https://github.com/drone/drone">Drone</a>, an open-source continuous delivery platform, to make it more developer-centric. "Now they’re able to manage configuration, they’re able to manage their deployments and things like that, making all these subteams that are now creating all these microservices, be self sufficient," he says. "So it can pull us away from applications and allow us to just make sure the cluster is running and healthy, and then actually migrate that over to our Ops team."
+
+  </div>
+</section>
+
+  <div class="banner5">
+    <div class="banner5text">
+    "Having gone from complete newbies to production-ready in three months, the GolfNow team is eager to encourage other companies to follow their lead. 'This is The Six Million Dollar Man of the cloud right now,' adds Josh. 'Just try it out, watch it happen. I feel like the proof is in the pudding when you look at these kinds of application stacks. They’re faster, they’re more resilient.'"
+    </div>
+  </div>
+
+<section class="section5">
+  <div class="fullcol">
+    And long-term, Sheriff has an even bigger goal for getting more people into the Kubernetes fold. "We’re actually trying to make this platform generic enough so that any of our sister companies can use it if they wish," he says. "Most definitely I think it can be used as a model. I think the way we migrated into it, the way we built it out, are all ways that I think other companies can learn from, and should not be afraid of."
+    <br><br>
+    The GolfNow team is also giving back to the Kubernetes community by open-sourcing a bot framework that Josh built. "We noticed that the dashboard user interface is actually moving a lot faster than when we started," says Sheriff. "However we realized what we needed was something that’s more of a bot that really helps us administer Kubernetes as a whole through Slack." Josh explains: "With the Kubernetes-Slack integration, you can essentially hook into a cluster and the issue commands and edit configurations. We’ve tried to simplify the security configuration as much as possible. We hope this will be our major thank you to Kubernetes, for everything you’ve given us."
+    <br><br>
+    Having gone from complete newbies to production-ready in three months, the GolfNow team is eager to encourage other companies to follow their lead. The lessons they’ve learned: "You’ve got to have buy-in from your boss," says Sheriff. "Another big deal is having two to three people dedicated to this type of endeavor. You can’t have people who are half in, half out." And if you don’t have buy-in from the get go, proving it out will get you there.
+    <br><br>
+    "This is The Six Million Dollar Man of the cloud right now," adds Josh. "Just try it out, watch it happen. I feel like the proof is in the pudding when you look at these kinds of application stacks. They’re faster, they’re more resilient."
+
+  </div>
+</section>
@@ -14,17 +14,35 @@ cid: caseStudies
    <main>
        <div class="content">
            <div class="case-studies">
+              <div class="case-study">
+                  <img src="/images/case_studies/wink_logo.png" alt="Wink">
+                  <p class="quote">"What you get by adopting CoreOS/Kubernetes is portability, to not be locked in to anyone. You can really make your own fate."</p>
+                  <!--<p class="attrib">— Kit Klein, Head of Engineering at Wink</p>-->
+                  <a href="/case-studies/wink/">Read about Wink</a>
+              </div>
+              <div class="case-study">
+                  <img src="/images/case_studies/ancestry-logo.png" alt="Ancestry">
+                  <p class="quote">"Kubernetes saved our time tremendously; it’s an enabler. It really is incredible."</p>
+                  <!--<p class="attrib">— Paul MacKay, Software Engineer and Architect at Ancestry</p>-->
+                  <a href="/case-studies/ancestry/">Read about Ancestry.com</a>
+              </div>
+              <div class="case-study">
+                  <img src="/images/case_studies/golfnow.png" alt="GolfNow">
+                  <p class="quote">"We can move data centers in incredible amounts of time. If you haven’t come from the Kubernetes world and I tell you this is what I’ve been doing, you wouldn’t believe me."</p>
+                  <!--<p class="attrib">— Josh Chandler, Lead Architect, Open Platforms at GolfNow</p>-->
+                  <a href="/case-studies/golfnow/">Read about GolfNow</a>
+              </div>
                <div class="case-study">
                    <img src="/images/case_studies/pearson.png" alt="Pearson">
                    <p class="quote">"We chose Kubernetes because of its flexibility, ease of management and the way it improves our engineers' productivity."</p>
                    <!--<p class="attrib">— Chris Jackson, Director for Cloud Product Engineering, Pearson</p>-->
-                    <a href="./pearson/">Read about Pearson</a>
+                    <a href="/case-studies/pearson/">Read about Pearson</a>
                </div>
                <div class="case-study">
                    <img src="/images/case_studies/wikimedia.png" alt="Wikimedia">
                    <p class="quote">"With Kubernetes, we're simplifying our environment and making it easier for developers to build the tools that make wikis run better."</p>
                    <!--<p class="attrib">— Yuvi Panda, Operations Engineer, Wikimedia Foundation</p>-->
-                    <a href="./wikimedia/">Read about Wikimedia</a>
+                    <a href="/case-studies/wikimedia/">Read about Wikimedia</a>
                </div>
                <div class="case-study">
                    <img src="/images/case_studies/ebay.png" alt="eBay">
@@ -33,8 +51,8 @@ cid: caseStudies
                </div>
                <div class="case-study">
                    <img src="/images/case_studies/box.png" alt="box">
-                    <p class="quote">Kubernetes at Box: Microservices at Maximum Velocity</p>
-                    <a href="https://blog.box.com/blog/kubernetes-box-microservices-maximum-velocity/">Read about Box</a>
+                    <p class="quote">"Kubernetes has the opportunity to be the new cloud platform. Because it’s a never-before-seen level of automation and intelligence surrounding infrastructure."</p>
+                    <a href="/case-studies/box/">Read about Box</a>
                </div>
            </div>
        </div>
@@ -82,10 +100,11 @@ cid: caseStudies
            <a target="_blank" href="https://cloud.google.com/customers/philips/"><img src="/images/case_studies/philips_logo.png" alt="Philips"></a>
            <a target="_blank" href="https://youtu.be/EC_ZRLsw58M"><img src="/images/case_studies/buffer_logo.png" alt="buffer"></a>
            <a target="_blank" href="https://youtu.be/lmeFkH-rHII"><img src="/images/case_studies/comcast_logo.png" alt="Comcast"></a>
-            <a href="./wikimedia/"><img src="/images/case_studies/wikimedia_logo.png" alt="Wikimedia"></a>
-            <a href="./pearson/"><img src="/images/case_studies/pearson_logo.png" alt="Pearson"></a>
+            <a href="/case-studies/wikimedia/"><img src="/images/case_studies/wikimedia_logo.png" alt="Wikimedia"></a>
+            <a href="/case-studies/pearson/"><img src="/images/case_studies/pearson_logo.png" alt="Pearson"></a>
            <a target="_blank" href="#" onclick="event.preventDefault(); kub.showVideo()"><img src="/images/case_studies/zulily_logo.png" alt="zulily"></a>
            <a target="_blank" href="http://www.nextplatform.com/2015/11/12/inside-ebays-shift-to-kubernetes-and-containers-atop-openstack/"><img src="/images/case_studies/ebay_logo.png" alt="Ebay"></a>
+            <a target="_blank" href="http://blog.kubernetes.io/2017/02/inside-jd-com-shift-to-kubernetes-from-openstack.html"><img src="/images/case_studies/jd.png" alt="JD.COM"></a>
            <a target="_blank" href="https://docs.google.com/a/google.com/forms/d/e/1FAIpQLScuI7Ye3VQHQTwBASrgkjQDSS5TP0g3AXfFhwSM9YpHgxRKFA/viewform" class="tell-your-story"><img src="/images/case_studies/story.png" alt="Tell your story"></a>
        </div>
    </main>
@@ -31,13 +31,13 @@ cid: caseStudies
            <div class="bullet">
                <h4>Challenges:</h4>
                <ul>
-                    <li>Pearson had difficulty in scaling and adapting to the growing online audience. They wanted to build and deliver content primarily over the web.</li>
+                    <li>Pearson had difficulty in scaling and adapting to the growing online audience. They wanted to build and deliver content primarily over the web.</li>
                </ul>
            </div>
            <div class="bullet">
                <h4>Why Kubernetes:</h4>
                <ul>
-                    <li>Kubernetes will allow Pearson's teams to develop their apps in a consistent manner, saving time and minimizing complexity.</li>
+                    <li>Kubernetes will allow Pearson's teams to develop their apps in a consistent manner, saving time and minimizing complexity.</li>
                </ul>
            </div>
            <div class="bullet">
@@ -0,0 +1,125 @@
+---
+title: WINK Case Study
+layout: none
+class: gridPage
+cid: caseStudies
+---
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+      <link href="https://fonts.googleapis.com/css?family=Roboto:300,400" rel="stylesheet">
+      <link rel="stylesheet" type="text/css" href="/css/style_wink.css">
+    <title>WINK Case Study</title>
+  </head>
+<body>
+
+
+<div class="banner1">
+  <h1>CASE STUDY: <img src="/images/wink_logo.png" class="logo" width="13%" style="margin-bottom:-4px"><br>
+    <div class="subhead">Cloud-Native Infrastructure Keeps Your Smart Home Connected</div>
+  </h1>
+</div>
+
+
+<div class="details">
+    Company &nbsp;<b>Wink</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Location &nbsp;<b>New York, N.Y.</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Industry &nbsp;<b>Internet of Things Platform</b>
+</div>
+
+<hr>
+
+<section class="section1">
+
+<div class="cols">
+  <div class="col1">
+
+      <h2>Challenge</h2>
+        Building a low-latency, highly reliable infrastructure to serve communications between millions of connected smart-home devices and the company’s consumer hubs and mobile app, with an emphasis on horizontal scalability, the ability to encrypt everything quickly and connections that could be easily brought back up if anything went wrong.
+        <br>
+
+      <h2>Solution</h2>
+        Across-the-board use of a Kubernetes-Docker-CoreOS Container Linux stack.<br><br>
+  </div>
+
+  <div class="col2">
+    <h2>Impact</h2>
+      "Two of the biggest American retailers [Home Depot and Walmart] are carrying and promoting the brand and the hardware,” Wink Head of Engineering Kit Klein says proudly – though he adds that "it really comes with a lot of pressure. It’s not a retail situation where you have a lot of tech enthusiasts. These are everyday people who want something that works and have no tolerance for technical excuses.” And that’s further testament to how much faith Klein has in the infrastructure that the Wink team has built. With 80 percent of Wink’s workload running on a unified stack of Kubernetes-Docker-CoreOS, the company has put itself in a position to continually innovate and improve its products and services. Committing to this technology, says Klein, "makes building on top of the infrastructure relatively&nbsp;easy.”
+  </div>
+</div>
+
+</section>
+
+
+<div class="banner2">
+  <div class="banner2text">
+      "It’s not proprietary, it’s totally open, it’s really portable. You can run all the workloads across different cloud providers. You can easily run a hybrid AWS or even bring in your own data center. That’s the benefit of having everything unified on one  open source Kubernetes-Docker-CoreOS Container Linux stack. There’s massive security benefits if you only have one Linux distro/machine image to validate. The benefits are enormous because you save money, and you save time.”<br><br><span style="font-size:15px;letter-spacing:0.08em">- KIT KLEIN, HEAD OF ENGINEERING, WINK</span>
+  </div>
+</div>
+
+
+<section class="section2">
+
+  <div class="fullcol">
+      <h2>How many people does it take to turn on a light bulb?</h2>
+
+      Kit Klein whips out his phone to demonstrate. With a few swipes, the head of engineering at Wink pulls up the smart-home app created by the New York City-based company and taps the light button. "Honestly when you’re holding the phone and you’re hitting the light,” he says, "by the time you feel the pressure of your finger on the screen, it’s on. It takes as long as the signal to travel to your brain.”<br><br>
+      Sure, it takes just one finger and less than 200 milliseconds to turn on the light – or lock a door or change a thermostat. But what allows Wink to help consumers manage their connected smart-home products with such speed and ease is a sophisticated, cloud native infrastructure that Klein and his team built and continue to develop using a unified stack of CoreOS, the open-source operating system designed for clustered deployments, and Kubernetes, an open-source platform for automating deployment, scaling, and operations of application containers across clusters of hosts, providing container-centric infrastructure. "When you have a big, complex network of interdependent microservices that need to be able to discover each other, and need to be horizontally scalable and tolerant to failure, that’s what this is really optimized for,” says Klein. "A lot of people end up relying on proprietary services [offered by some big cloud providers] to do some of this stuff, but what you get by adopting CoreOS/Kubernetes is portability, to not be locked in to anyone. You can really make your own fate.”<br><br>
+      Indeed, Wink did. The company’s mission statement is to make the connected home accessible – that is, user-friendly for non-technical owners, affordable and perhaps most importantly, reliable. "If you can’t trust that when you hit the switch, you know a light is going to go on, or if you’re remote and you’re checking on your house and that information isn’t accurate, then the convenience of the system is lost,” says Klein. "So that’s where the infrastructure comes in.”<br><br>
+      Wink was incubated within Quirky, a company that developed crowd-sourced inventions. The Wink app was first introduced in 2013, and at the time, it controlled only a few consumer products such as the PivotPower Strip that Quirky produced in collaboration with GE. As smart-home products proliferated, Wink was launched in 2014 in Home Depot stores nationwide. Its first project: a hub that could integrate with smart products from about a dozen brands like Honeywell and Chamberlain. The biggest challenge would be to build the infrastructure to serve all those communications between the hub and the products, with a focus on maximizing reliability and minimizing latency.<br><br>
+      "When we originally started out, we were moving very fast trying to get the first product to market, the minimum viable product,” says Klein. "Lots of times you go down a path and end up having to backtrack and try different things. But in this particular case, we did a lot of the work up front, which led to us making a really sound decision to deploy it on CoreOS Container Linux. And that was very early in the life of it.”
+
+
+  </div>
+</section>
+
+<div class="banner3">
+  <div class="banner3text">
+    "...what you get by adopting CoreOS/Kubernetes is portability, to not be locked in to anyone. You can really make your own fate.”
+  </div>
+</div>
+
+<section class="section3">
+  <div class="fullcol">
+    Concern number one: Wink’s products need to connect to consumer devices in people’s homes, behind a firewall. "You don’t have an end point like a URL, and you don’t even know what ports are open behind that firewall,” Klein explains. "So you essentially need to have this thing wake up and talk to your system and then open real-time, bidirectional communication between the cloud and the device. And it’s really, really important that it’s persistent because you want to decrease as much as possible the overhead of sending a message – you never know when someone is going to turn on the lights.”<br><br>
+    With the earliest version of the Wink Hub, when you decided to turn your lights on or off, the request would be sent to the cloud and then executed. Subsequent updates to Wink’s software enabled local control, cutting latency down to about 10 milliseconds for many devices. But with the need for cloud-enabled integrations of an ever-growing ecosystem of smart home products, low-latency internet connectivity is still a critical consideration.
+    <h2>"You essentially need to have this thing wake up and talk to your system and then open real-time, bidirectional communication between the cloud and the device. And it’s really, really important that it’s persistent...you never know when someone is going to turn on the&nbsp;lights.”</h2>
+    In addition, Wink had other requirements: horizontal scalability, the ability to encrypt everything quickly, connections that could be easily brought back up if something went wrong. "Looking at this whole structure we started, we decided to make a secure socket-based service,” says Klein. "We’ve always used, I would say, some sort of clustering technology to deploy our services and so the decision we came to was, this thing is going to be containerized, running on Docker.”<br><br>
+    At the time – just over two years ago – Docker wasn’t yet widely used, but as Klein points out, "it was certainly understood by the people who were on the frontier of technology. We started looking at potential technologies that existed. One of the limiting factors was that we needed to deploy multi-port non-http/https services. It wasn’t really appropriate for some of the early cluster technology. We liked the project a lot and we ended up using it on other stuff for a while, but initially it was too targeted toward http workloads.”<br><br>
+    Once Wink’s backend engineering team decided on a Dockerized workload, they had to make decisions about the OS and the container orchestration platform. "Obviously you can’t just start the containers and hope everything goes well,” Klein says with a laugh. "You need to have a system that is helpful [in order] to manage where the workloads are being distributed out to. And when the container inevitably dies or something like that, to restart it, you have a load balancer. All sorts of housekeeping work is needed to have a robust infrastructure.”
+
+  </div>
+</section>
+
+  <div class="banner4">
+    <div class="banner4text">
+    "Obviously you can’t just start the containers and hope everything goes well,” Klein says with a laugh. "You need to have a system that is helpful [in order] to manage where the workloads are being distributed out to. And when the container inevitably dies or something like that, to restart it, you have a load balancer. All sorts of housekeeping work is needed to have a robust infrastructure.”
+    </div>
+  </div>
+
+<section class="section4">
+  <div class="fullcol">
+    Wink considered building directly on a general purpose Linux distro like Ubuntu (which would have required installing tools to run a containerized workload) and cluster management systems like Mesos (which was targeted toward enterprises with larger teams/workloads), but ultimately set their sights on CoreOS Container Linux. "A container-optimized Linux distribution system was exactly what we needed,” he says. "We didn’t have to futz around with trying to take something like a Linux distro and install everything. It’s got a built-in container orchestration system, which is Fleet, and an easy-to-use API. It’s not as feature-rich as some of the heavier solutions, but we realized that, at that moment, it was exactly what we needed.”<br><br>
+    Wink’s hub (along with a revamped app) was introduced in July 2014 with a short-term deployment, and within the first month, they had moved the service to the Dockerized CoreOS deployment. Since then, they’ve moved almost every other piece of their infrastructure – from third-party cloud-to-cloud integrations to their customer service and payment portals – onto CoreOS Container Linux clusters. <br><br>
+    Using this setup did require some customization. "Fleet is really nice as a basic container orchestration system, but it doesn’t take care of routing, sharing configurations, secrets, et cetera, among instances of a service,” Klein says. "All of those layers of functionality can be implemented, of course, but if you don’t want to spend a lot of time writing unit files manually – which of course nobody does – you need to create a tool to automate some of that, which we did.”<br><br>
+    Wink quickly embraced the Kubernetes container cluster manager when it was launched in 2015 and integrated with CoreOS core technology, and as promised, it ended up providing the features Wink wanted and had planned to build. "If not for Kubernetes, we likely would have taken the logic and library we implemented for the automation tool that we created, and would have used it in a higher level abstraction and tool that could be used by non-DevOps engineers from the command line to create and manage clusters,” Klein says. "But Kubernetes made that totally unnecessary – and is written and maintained by people with a lot more experience in cluster management than us, so all the better.” Now, an estimated 80 percent of Wink’s workload is run on Kubernetes on top of CoreOS Container Linux.
+
+  </div>
+</section>
+
+  <div class="banner5">
+    <div class="banner5text">
+      "Stay close to the development. Understand why decisions are being made. If you understand the intent behind the project, from the technological intent to a certain philosophical intent, then it helps you understand how to build your system in harmony with those systems as opposed to trying to work against it.”
+    </div>
+  </div>
+
+<section class="section5">
+  <div class="fullcol">
+    Wink’s reasons for going all in are clear: "It’s not proprietary, it’s totally open, it’s really portable,” Klein says. "You can run all the workloads across different cloud providers. You can easily run a hybrid AWS or even bring in your own data center. That’s the benefit of having everything unified on one Kubernetes-Docker-CoreOS Container Linux stack. There’s massive security benefits if you only have one Linux distro to try to validate. The benefits are enormous because you save money, you save time.”<br><br>
+    Klein concedes that there are tradeoffs in every technology decision. "Cutting-edge technology is going to be scary for some people,” he says. "In order to take advantage of this, you really have to keep up with the technology. You can’t treat it like it’s a black box. Stay close to the development. Understand why decisions are being made. If you understand the intent behind the project, from the technological intent to a certain philosophical intent, then it helps you understand how to build your system in harmony with those systems as opposed to trying to work against it.”<br><br>
+    Wink, which was acquired by Flex in 2015, now controls 2.3 million connected devices in households all over the country. What’s next for the company? A new version of the hub - Wink Hub 2 - hit shelves last November – and is being offered for the first time at Walmart stores in addition to Home Depot. "Two of the biggest American retailers are carrying and promoting the brand and the hardware,” Klein says proudly – though he adds that "it really comes with a lot of pressure. It’s not a retail situation where you have a lot of tech enthusiasts. These are everyday people who want something that works and have no tolerance for technical excuses.” And that’s further testament to how much faith Klein has in the infrastructure that the Wink team has have built.<br><br>
+    Wink’s engineering team has grown exponentially since its early days, and behind the scenes, Klein is most excited about the machine learning Wink is using. "We built [a system of] containerized small sections of the data pipeline that feed each other and can have multiple outputs,” he says. "It’s like data pipelines as microservices.” Again, Klein points to having a unified stack running on CoreOS Container Linux and Kubernetes as the primary driver for the innovations to come. "You’re not reinventing the wheel every time,” he says. "You can just get down to work.”  </div>
+</section>
+
+</body>
+</html>
@@ -5,14 +5,14 @@ assignees:
 title: 认识 Kubernetes?
 ---

-Kubernetes 是一个 [开源的容器调度平台，它可以自动化应用容器的部署、扩展和操作](http://www.slideshare.net/BrianGrant11/wso2con-us-2015-kubernetes-a-platform-for-automating-deployment-scaling-and-operations) 可以跨主机集群, 提供以容器为中心的基础架构。
+Kubernetes 是一个跨主机集群的 [开源的容器调度平台，它可以自动化应用容器的部署、扩展和操作](http://www.slideshare.net/BrianGrant11/wso2con-us-2015-kubernetes-a-platform-for-automating-deployment-scaling-and-operations) , 提供以容器为中心的基础架构。

 使用 Kubernetes, 您可以快速高效地响应客户需求:

 - 快速、可预测地部署您的应用程序
 - 拥有即时扩展应用程序的能力
- - 不影响现有业务的情况下，无缝地发布新功能。
- - 优化您的硬件资源，降低您的拥有成本
+ - 不影响现有业务的情况下，无缝地发布新功能
+ - 优化硬件资源，降低成本

 我们的目标是构建一个软件和工具的生态系统，以减轻您在公共云或私有云运行应用程序的负担。

@@ -36,11 +36,11 @@ Kubernetes 项目由 Google 公司在 2014 年启动。Kubernetes 建立在 [Goo

 *新方式* 是基于操作系统级虚拟化而不是硬件级虚拟化方法来部署容器。容器之间彼此隔离并与主机隔离：它们具有自己的文件系统，不能看到彼此的进程，并且它们所使用的计算资源是可以被限制的。它们比虚拟机更容易构建，并且因为它们与底层基础架构和主机文件系统隔离，所以它们可以跨云和操作系统快速分发。

-由于容器体积小且启动快，因此可以在每个容器镜像中打包一个应用程序。这种一对一的应用镜像关系拥有很多好处。使用容器，不需要与外部的基础架构环境绑定, 因为每一个应用程序不需要外部依赖，更不需要与外部的基础架构环境依赖。完美解决了从开发到生产环境的一致性问题。
+由于容器体积小且启动快，因此可以在每个容器镜像中打包一个应用程序。这种一对一的应用镜像关系拥有很多好处。使用容器，不需要与外部的基础架构环境绑定, 因为每一个应用程序都不需要外部依赖，更不需要与外部的基础架构环境依赖。完美解决了从开发到生产环境的一致性问题。

-类似地，容器比虚拟机更加透明，这有助于监测和管理。真实的情况是，容器进程的生命周期由基础设施管理，而容器内的进程对外是隐藏的。最后，每个应用程序用容器封装，管理容器部署就等同于管理应用程序部署。
+容器同样比虚拟机更加透明，这有助于监测和管理。尤其是容器进程的生命周期由基础设施管理，而不是由容器内的进程对外隐藏时更是如此。最后，每个应用程序用容器封装，管理容器部署就等同于管理应用程序部署。

-容器好处摘要:
+容器优点摘要:

 * **敏捷的应用程序创建和部署**:
    与虚拟机镜像相比，容器镜像更容易创建，提升了硬件的使用效率。
@@ -55,7 +55,7 @@ Kubernetes 项目由 Google 公司在 2014 年启动。Kubernetes 建立在 [Goo
 * **以应用为中心的管理**:
    提升了操作系统的抽象级别，以便在使用逻辑资源的操作系统上运行应用程序。
 * **松耦合、分布式、弹性伸缩 [微服务](http://martinfowler.com/articles/microservices.html)**:
-    应用程序被分成更小，更独立的部分，可以动态部署和管理 - 而不是巨型单体应用运行在专用的大型机。
+    应用程序被分成更小，更独立的部分，可以动态部署和管理 - 而不是巨型单体应用运行在专用的大型机上。
 * **资源隔离**:
    通过对应用进行资源隔离，可以很容易的预测应用程序性能。
 * **资源利用**:
@@ -87,11 +87,11 @@ Kubernetes 满足了生产中运行应用程序的许多常见的需求，例如

 #### 为什么 Kubernetes 是一个平台?

-Kubernetes 提供了很多的功能，总会有新的场景会受益于新特性。它可以简化应用程序的工作流，加快开发速度。被大家认可的应用编排通常需要有较强的自动化能力。这就是为什么 Kubernetes 被设计作为构建组件和工具的生态系统平台，以便更轻松地部署、扩展和管理应用程序。
+Kubernetes 提供了很多的功能，总会有新的场景受益于新特性。它可以简化应用程序的工作流，加快开发速度。被大家认可的应用编排通常需要有较强的自动化能力。这就是为什么 Kubernetes 被设计作为构建组件和工具的生态系统平台，以便更轻松地部署、扩展和管理应用程序。

 [Label](/docs/user-guide/labels/) 允许用户按照自己的方式组织管理对应的资源。 [注解](/docs/user-guide/annotations/) 使用户能够以自定义的描述信息来修饰资源，以适用于自己的工作流，并为管理工具提供检查点状态的简单方法。

-此外，[Kubernetes 控制面](/docs/admin/cluster-components) 是构建在相同的 [APIs](/docs/api/) 上面，开发员人和用户都可以用。用户可以编写自己的控制器， [调度器](https://git.k8s.io/community/contributors/devel/scheduler.md)等等，如果这么做，根据新加的[自定义 API](https://git.k8s.io/community/contributors/design-proposals/extending-api.md) ，可以扩展当前的通用 [CLI 命令行工具](/docs/user-guide/kubectl-overview/)。
+此外，[Kubernetes 控制面 (Controll Plane)](/docs/admin/cluster-components) 是构建在相同的 [APIs](/docs/api/) 上面，开发人员和用户都可以用。用户可以编写自己的控制器， [调度器](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/docs/devel/scheduler.md)等等，如果这么做，根据新加的[自定义 API](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/extending-api.md) ，可以扩展当前的通用 [CLI 命令行工具](/docs/user-guide/kubectl-overview/)。

 这种 [设计](https://git.k8s.io/community/contributors/design-proposals/principles.md) 使得许多其他系统可以构建在 Kubernetes 之上。

@@ -116,4 +116,3 @@ Kubernetes 不是一个传统意义上，包罗万象的 PaaS (平台即服务)
 #### *Kubernetes* 是什么意思? K8s?

 名称 **Kubernetes** 源于希腊语，意为 "舵手" 或 "飞行员"， 且是英文 "governor" 和 ["cybernetic"](http://www.etymonline.com/index.php?term=cybernetics)的词根。 **K8s** 是通过将 8 个字母 "ubernete" 替换为 8 而导出的缩写。另外，在中文里，k8s 的发音与 Kubernetes 的发音比较接近。
-
@@ -0,0 +1,238 @@
+---
+assignees:
+- thockin
+title: CentOS
+---
+
+* TOC
+{:toc}
+
+## 警告
+
+本文档适用于Kubernetes 1.1.0，目前已经被[废弃](https://github.com/kubernetes/kubernetes.github.io/issues/1613)。相关内容请参阅最新版[指南](/docs/getting-started-guides/kubeadm/)。
+
+## 前提条件
+
+在CentOS上部署和配置Kubernetes，您需要在集群中拥有一台机器作为master节点，并拥有至少一台运行CentOS 7系统的主机作为集群节点（node）。
+
+## 启动一个集群
+
+本文档是一篇基于CentOS系统部署和配置Kubernetes的入门指南，内容涵盖一个手工的配置，以便于您了解所有的底层软件包、服务以及端口等信息。
+
+Kubernetes由一系列服务构成，包括kube-apiserver、kube-scheduler、kube-controller-manager、kubelet以及kube-proxy等。这些服务由systemd管理，配置集中位于/etc/kubernetes。我们将在集群中的不同主机上部署不同的服务。其中，第一台主机，即centos-master，将被部署成为Kubernetes集群中的master节点。这台主机上将运行kube-apiserver、kube-controller-manager和kube-scheduler。 此外，master节点还将运行 _etcd_。集群中剩余的主机，即centos-minion-n节点，将运行kubelet、proxy、cadvisor和docker。
+
+集群中的所有节点将运行flanneld来构建网络（networking overlay）。
+
+**系统信息：**
+
+主机：
+
+请使用您真实环境中的信息替换以下配置中的各个主机IP
+
+```conf
+centos-master = 192.168.121.9
+centos-minion-1 = 192.168.121.65
+centos-minion-2 = 192.168.121.66
+centos-minion-3 = 192.168.121.67
+```
+
+**配置主机环境：**
+
+* 在集群所有节点上——centos-{master,minion-n}，创建包含以下配置信息的/etc/yum.repos.d/virt7-docker-common-release.repo文件。
+
+```conf
+[virt7-docker-common-release]
+name=virt7-docker-common-release
+baseurl=http://cbs.centos.org/repos/virt7-docker-common-release/x86_64/os/
+gpgcheck=0
+```
+
+* 在集群所有节点上——centos-{master,minion-n}，安装Kubernetes、etcd和flanneld。这一过程也将同时在节点上安装docker和cadvisor。
+
+```shell
+yum -y install --enablerepo=virt7-docker-common-release kubernetes etcd flannel
+```
+
+* 将master节点和其他节点的主机名——IP映射添加到所有集群节点的/etc/hosts文件中（如果主机名已经在DNS中记录，则可略过此步）
+
+```shell
+echo "192.168.121.9    centos-master
+192.168.121.65    centos-minion-1
+192.168.121.66  centos-minion-2
+192.168.121.67  centos-minion-3" >> /etc/hosts
+```
+
+* 编辑/etc/kubernetes/config文件以保证在集群所有主机上都包含以下内容：
+
+```shell
+# logging to stderr意为从systemd journal获取日志
+KUBE_LOGTOSTDERR="--logtostderr=true"
+
+# journal消息级别, 0代表debug
+KUBE_LOG_LEVEL="--v=0"
+
+# 是否允许集群运行privileged docker containers
+KUBE_ALLOW_PRIV="--allow-privileged=false"
+
+# 配置replication conrtoller和scheduler所需的kube-apiserver地址
+KUBE_MASTER="--master=http://centos-master:8080"
+```
+
+* 由于docker与一些防火墙规则不兼容，需要在master节点及其他集群节点上禁用防火墙。在CentOS系统上，需要首先禁用SELinux，进而才能禁用防火墙。
+
+```shell
+setenforce 0
+systemctl disable iptables-services firewalld
+systemctl stop iptables-services firewalld
+```
+
+**配置master节点上的Kubernetes服务**
+
+* 编辑/etc/etcd/etcd.conf文件内容如下：
+
+```shell
+# [member]
+ETCD_NAME=default
+ETCD_DATA_DIR="/var/lib/etcd/default.etcd"
+ETCD_LISTEN_CLIENT_URLS="http://0.0.0.0:2379"
+
+#[cluster]
+ETCD_ADVERTISE_CLIENT_URLS="http://0.0.0.0:2379"
+```
+
+* 编辑/etc/kubernetes/apiserver文件内容如下：
+
+```shell
+# 本地服务器监听地址
+KUBE_API_ADDRESS="--address=0.0.0.0"
+
+# 本地服务器监听端口
+KUBE_API_PORT="--port=8080"
+
+# Kubelet监听端口
+KUBELET_PORT="--kubelet-port=10250"
+
+# 以逗号间隔的etcd集群中各个节点的地址
+KUBE_ETCD_SERVERS="--etcd-servers=http://centos-master:2379"
+
+# Kubernetes服务IP地址网段
+KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=10.254.0.0/16"
+
+# 请添加您需要的Kubernetes API Server启动参数
+KUBE_API_ARGS=""
+```
+
+* 启动ETCD并保存master节点的网络设置（network overlay configuration）：
+**警告** 请根据您的真实环境配置网络信息！在本文环境中，`172.30.0.0/16`网段是可用的。
+
+```shell
+systemctl start etcd
+etcdctl mkdir /kube-centos/network
+etcdctl mk /kube-centos/network/config "{ \"Network\": \"172.30.0.0/16\", \"SubnetLen\": 24, \"Backend\": { \"Type\": \"vxlan\" } }"
+```
+
+* 在master节点上配置/etc/sysconfig/flanneld文件使用flannel覆盖Docker网络 (需要在其他集群节点上完成相同配置，详见下文):
+
+```shell
+# Flanneld配置选项
+
+# etcd url地址，指向运行etcd的服务器
+FLANNEL_ETCD_ENDPOINTS="http://centos-master:2379"
+
+# etcd配置秘钥，即flannel查询的配置秘钥
+# 用于网段分配
+FLANNEL_ETCD_PREFIX="/kube-centos/network"
+
+# 其它需要的Flannel启动参数
+#FLANNEL_OPTIONS=""
+```
+
+* 在master节点上启动相关服务：
+
+```shell
+for SERVICES in etcd kube-apiserver kube-controller-manager kube-scheduler flanneld; do
+    systemctl restart $SERVICES
+    systemctl enable $SERVICES
+    systemctl status $SERVICES
+done
+```
+
+**在集群其他节点上配置Kubernetes服务**
+
+***我们需要在集群其他节点上配置kubelet，启动kubelet和proxy服务***
+
+* 编辑/etc/kubernetes/kubelet文件内容如下：
+
+```shell
+# info server的服务地址
+KUBELET_ADDRESS="--address=0.0.0.0"
+
+# info server的监听端口
+KUBELET_PORT="--port=10250"
+
+# 本字段可以设置空值以使用真实的主机名
+# 注意节点序号（n）
+KUBELET_HOSTNAME="--hostname-override=centos-minion-n"
+
+# api-server地址
+KUBELET_API_SERVER="--api-servers=http://centos-master:8080"
+
+# 添加您所需要的Kubelet参数
+KUBELET_ARGS=""
+```
+
+* 在所有节点上配置/etc/sysconfig/flanneld文件设置使用flannel覆盖Docker网络：
+
+```shell
+# Flanneld配置选项
+
+# etcd url地址，指向运行etcd的服务器
+FLANNEL_ETCD_ENDPOINTS="http://centos-master:2379"
+
+# etcd配置秘钥，即flannel查询的配置秘钥
+# 用于网段分配
+FLANNEL_ETCD_PREFIX="/kube-centos/network"
+
+# 其他需要配置的选项
+#FLANNEL_OPTIONS=""
+```
+
+* 在节点上启动相关服务（centos-minion-n）
+
+```shell
+for SERVICES in kube-proxy kubelet flanneld docker; do
+    systemctl restart $SERVICES
+    systemctl enable $SERVICES
+    systemctl status $SERVICES
+done
+```
+* 配置kubectl
+
+```shell
+kubectl config set-cluster default-cluster --server=http://centos-master:8080
+kubectl config set-context default-context --cluster=default-cluster --user=default-admin
+kubectl config use-context default-context
+```
+
+*至此，Kubernetes在CentOS集群中的部署已经完成 ！*
+
+* 在centos-master节点上通过kubectl命令检查所有的Kubernetes节点已经到位
+
+```shell
+$ kubectl get nodes
+NAME                   STATUS     AGE     VERSION
+centos-minion-1        Ready      3d      v1.6.0+fff5156
+centos-minion-2        Ready      3d      v1.6.0+fff5156   
+centos-minion-3        Ready      3d      v1.6.0+fff5156
+```
+
+**现在，Kubernetes集群已经正常运行！可以创建测试pod验证集群了！**
+
+## 支持级别
+
+
+IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
+-------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
+Bare-metal           | custom       | CentOS | flannel     | [docs](/docs/getting-started-guides/centos/centos_manual_config)            |          | Community ([@coolsvap](https://github.com/coolsvap))
+
+有关所有解决方案的支持级别信息，请参阅[解决方案列表](/docs/getting-started-guides/#table-of-solutions)。
@@ -1,5 +1,5 @@
 ---
-title: 交互式教程 - 创建集群
+title: 互动教程 - 创建集群
 ---

 <!DOCTYPE html>
@@ -1,7 +1,4 @@
 ---
-redirect_from:
- "/docs/tutorials/getting-started/create-cluster/"
- "/docs/tutorials/getting-started/create-cluster.html"
 title: 使用 Minikube 创建一个集群
 ---

@@ -31,12 +28,12 @@ title: 使用 Minikube 创建一个集群
 			<div class="col-md-8">
 				<h3>Kubernetes 集群</h3>
 				<p>
-				<b>Kubernetes 用于协调高度可用的计算机集群，这些计算机群集被连接作为单个单元工作。</b> Kubernetes 中的抽象允许您将容器化的应用程序部署到集群，而不必专门将其绑定到单个计算机。为了利用这种新的部署模型，应用程序需要以将它们与各个主机分离的方式打包: 它们需要被容器化。容器化应用程序比过去的部署模型更灵活和可用，其中应用程序直接安装到特定机器上，作为深入集成到主机中的软件包。 <b>Kubernetes 以更有效的方式自动化、跨集群的容器应用程序的分发和调度。</b> Kubernetes 是一个 <a href="https://github.com/kubernetes/kubernetes">开源</a> 平台，为生产环境准备的。
+				<b>Kubernetes 用于协调高度可用的计算机集群，这些计算机群集被连接作为单个单元工作。</b> Kubernetes 的抽象性允许您将容器化的应用程序部署到集群，而不必专门将其绑定到单个计算机。为了利用这种新的部署模型，应用程序需要以将它们与各个主机分离的方式打包: 它们需要被容器化。容器化应用程序比过去的部署模型更灵活和可用，其中应用程序直接安装到特定机器上，作为深入集成到主机中的软件包。 <b>Kubernetes 在一个集群上以更有效的方式自动分发和调度容器应用程序。</b> Kubernetes 是一个 <a href="https://github.com/kubernetes/kubernetes">开源</a> 平台，可满足生产环境的需要。
 				</p>
 				<p>Kubernetes 集群由两种类型的资源组成:
 					<ul>
-			            <li>一个 <b>Master</b> 调度节点</li>
-			            <li><b>Nodes</b> 应用程序实际运行的地方</li>
+			            <li>一个 <b>Master</b> 是集群的调度节点</li>
+			            <li><b>Nodes</b> 是应用程序实际运行的工作节点</li>
 			        </ul>
 			    </p>
 			</div>
@@ -74,21 +71,21 @@ title: 使用 Minikube 创建一个集群
 		<div class="row">
 			<div class="col-md-8">
 				<p><b>Master 负责管理集群。</b> master 协调集群中的所有活动，例如调度应用程序、维护应用程序的所需状态、扩展应用程序和滚动更新。</p>
-				<p><b>node 是 Kubernetes 集群中的工作机器，可以是物理机或虚拟机。</b> 每个工作节点都有一个 Kubelet，它是管理 node 并与 Kubernetes Master 节点进行通信的代理。node 上还应具有处理容器操作的工作，例如 <a href="https://www.docker.com/">Docker</a> 或 <a href="https://coreos.com/rkt/">rkt</a>。一个 Kubernetes 工作集群至少有三个 node 节点。</p>
+				<p><b>节点 是 Kubernetes 集群中的工作机器，可以是物理机或虚拟机。</b> 每个工作节点都有一个 Kubelet，它是管理 节点 并与 Kubernetes Master 节点进行通信的代理。节点 上还应具有处理容器操作的工作，例如 <a href="https://www.docker.com/">Docker</a> 或 <a href="https://coreos.com/rkt/">rkt</a>。一个 Kubernetes 工作集群至少有三个节点。</p>

 			</div>
 			<div class="col-md-4">
 				<div class="content__box content__box_fill">
-					<p><i> Master 管理集群和 Nodes 用于托管正在运行的应用程序。  </i></p>
+					<p><i> Master 管理集群，而 节点 用于托管正在运行的应用程序。  </i></p>
 				</div>
 			</div>
 		</div>

 		<div class="row">
 			<div class="col-md-8">
-				<p>当您在 Kubernetes 上部署应用程序时，您可以告诉 master 启动应用程序容器。Master 调度容器在集群的 Node 上运行。<b> Nodes 使用 Master 公开的 Kubernetes API 与 Master 通信</b>。最终用户还可以直接使用 Kubernetes 的 API 与集群交互。</p>
+				<p>当您在 Kubernetes 上部署应用程序时，您可以告诉 master 启动应用程序容器。Master 调度容器在集群的 节点 上运行。<b> 节点 使用 Master 公开的 Kubernetes API 与 Master 通信</b>。最终用户还可以直接使用 Kubernetes 的 API 与集群交互。</p>

-				<p>Kubernetes 集群可以部署在物理机或虚拟机上。要开始使用 Kubernetes 开发，您可以使用 <a href="https://github.com/kubernetes/minikube">Minikube</a>。Minikube 是一个轻量级的 Kubernetes 实现，在本机创建一台虚拟机，并部署一个只包含一个节点的简单集群。 Minikube 适用于 Linux, Mac OS 和 Windows 系统。Minikube CLI 提供了集群的基本引导操作，包括启动、停止、状态和删除。但是，对于此基础训练，您将使用预先安装了 Minikube 的在线终端。</p>
+				<p>Kubernetes 集群可以部署在物理机或虚拟机上。要开始使用 Kubernetes 开发，您可以使用 <a href="https://github.com/kubernetes/minikube">Minikube</a>。Minikube 是一个轻量级的 Kubernetes 实现，会在本机创建一台虚拟机，并部署一个只包含一个节点的简单集群。 Minikube 适用于 Linux, Mac OS 和 Windows 系统。Minikube CLI 提供了集群的基本引导操作，包括启动、停止、状态和删除。为了完成此基础训练，您将使用预先安装了 Minikube 的在线终端。</p>

 				<p>现在您已经知道 Kubernetes 是什么，让我们使用在线教程，开始我们的第一个集群!</p>

@@ -98,7 +95,7 @@ title: 使用 Minikube 创建一个集群

 		<div class="row">
 			<div class="col-md-12">
-				<a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/cluster-interactive/" role="button">启动交互教程 <span class="btn__next">›</span></a>
+				<a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/cluster-interactive/" role="button">启动互动教程 <span class="btn__next">›</span></a>
 			</div>
 		</div>

@@ -1,5 +1,5 @@
 ---
-title: 交互式教程 - 部署应用程序
+title: 互动教程 - 部署应用程序
 ---

 <!DOCTYPE html>
@@ -30,9 +30,9 @@ title: 使用 kubectl 创建部署
 				一旦运行了 Kubernetes 集群，您可以在其上部署容器化应用程序。为此，您可以创建一个 Kubernetes <b>Deployment</b>。Deployment 负责创建和更新应用程序实例。创建 Deployment 后， Kubernetes master 会将 Deployment 创建的应用程序实例调度到集群中的各个节点。
 				</p>

-				<p>创建应用程序实例后，Kubernetes Deployment 控制器会持续监视这些实例。如果托管它的节点不可用或删除，则 Deployment 控制器将替换实例。 <b>这提供了一种解决机器故障或维护的自愈机制。</b></p>
+				<p>创建应用程序实例后，Kubernetes 部署控制器会持续监视这些实例。如果托管它的节点不可用或删除，则部署控制器将替换实例。 <b>这提供了一种解决机器故障或维护的自愈机制。</b></p>

-				<p>在编排前的世界中，通常会使用安装脚本启动应用程序，但是它们并不能从机器故障中恢复。通过创建应用程序实例并使其运行在跨节点的机器之间，Kubernetes Deployments 提供了截然不同的应用管理方法。 </p>
+				<p>在编排诞生前的世界中，通常会使用安装脚本启动应用程序，但是它们并不能从机器故障中恢复。通过创建应用程序实例并使其运行在跨节点的机器之间，Kubernetes 部署提供了截然不同的应用管理方法。 </p>

 			</div>

@@ -40,13 +40,13 @@ title: 使用 kubectl 创建部署
 				<div class="content__box content__box_lined">
 					<h3>概要:</h3>
 					<ul>
-						<li>Deployments</li>
+						<li>部署</li>
 						<li>Kubectl</li>
 					</ul>
 				</div>
 				<div class="content__box content__box_fill">
 					<p><i>
-						Deployment 负责创建和更新应用程序的实例
+						部署负责创建和更新应用程序的实例
 					</i></p>
 				</div>
 			</div>
@@ -69,9 +69,9 @@ title: 使用 kubectl 创建部署
 		<div class="row">
 			<div class="col-md-8">

-                <p>您可以使用 Kubernetes 命令行工具 <b>Kubectl</b>创建和管理 Deployment。Kubectl 使用 Kubernetes API 与集群进行交互。在本模块中，您将学习在 Kubernetes 集群上运行应用程序部署所需的最常见 Kubectl 命令。</p>
+                <p>您可以使用 Kubernetes 命令行工具 <b>Kubectl</b>创建和管理部署。Kubectl 使用 Kubernetes API 与集群进行交互。在本模块中，您将学习在 Kubernetes 集群上运行应用程序部署所需的最常见的 Kubectl 命令。</p>

-				<p>创建部署时，您需要为应用程序指定容器镜像以及要运行的副本数。您可以稍后通过更新部署来更改该信息；模块 <a href="/docs/tutorials/kubernetes-basics/scale-intro/">5</a> 和 <a href="/docs/tutorials/kubernetes-basics/update-intro/">6</a> 是一个基础训练讨论如何扩展和更新您的部署。</p>
+				<p>创建部署时，您需要为应用程序指定容器镜像以及要运行的副本数。您可以稍后通过更新部署来更改该信息；基础训练模块 <a href="/docs/tutorials/kubernetes-basics/scale-intro/">5</a> 和 <a href="/docs/tutorials/kubernetes-basics/update-intro/">6</a> 讨论如何扩展和更新您的部署。</p>



@@ -86,7 +86,7 @@ title: 使用 kubectl 创建部署

 		<div class="row">
 			<div class="col-md-8">
-				<p>对于我们的第一个部署，我们将使用 <a href="https://nodejs.org">Node.js</a> 应用程序打包到 Docker 容器。源代码和 Dockerfile 可在 Kubernetes Bootcamp <a href="https://github.com/kubernetes/kubernetes-bootcamp">GitHub 存储库</a> 中找到。</p>
+				<p>对于我们的第一个部署，我们将使用 <a href="https://nodejs.org">Node.js</a> 应用程序打包到 Docker 容器。源代码和 Dockerfile 可在 Kubernetes Bootcamp 的 <a href="https://github.com/kubernetes/kubernetes-bootcamp">GitHub 存储库</a> 中找到。</p>

 				<p>现在您已经知道部署是什么，我来再来看看在线教程，并部署我们的第一个应用程序!</p>

@@ -96,7 +96,7 @@ title: 使用 kubectl 创建部署

 		<div class="row">
 			<div class="col-md-12">
-				<a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/deploy-interactive/" role="button">启动交互式教程 <span class="btn__next">›</span></a>
+				<a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/deploy-interactive/" role="button">启动互动教程 <span class="btn__next">›</span></a>
 			</div>
 		</div>

@@ -1,5 +1,5 @@
 ---
-title: 交互式教程 - 应用程序探索
+title: 互动教程 - 应用程序探索
 ---

 <!DOCTYPE html>
@@ -1,5 +1,5 @@
 ---
-title: 查看 Pods 和 Nodes
+title: 查看 Pods 和节点
 ---

 <!DOCTYPE html>
@@ -22,7 +22,7 @@ title: 查看 Pods 和 Nodes
 				<ul>
 					<li>了解 Kubernetes Pods</li>
 					<li>了解 Kubernetes Nodes</li>
-					<li>已部署应用故障排除</li>
+					<li>已部署应用的故障排除</li>
 				</ul>
 			</div>

@@ -34,9 +34,9 @@ title: 查看 Pods 和 Nodes
 					<li>网络，作为唯一的集群 IP 地址</li>
 					<li>每个容器如何运行的信息，例如容器镜像版本或要使用的特定端口</li>
 				</ul>
-				<p>Pod 模型可以理解为应用程序特定的 "逻辑主机"，并且可以包含相对紧密耦合的不同应用程序容器。例如，Pod 可能包含带有 Node.js 应用程序的容器以及用于提供要由 Node.js Web 服务器发布数据的不同容器。Pod 中的容器共享 IP 地址和端口空间，始终位于同一位置并且统一调度，并在相同的节点上运行，共享上下文环境。</p>
+				<p>Pod 模型可以理解为应用程序特定的 "逻辑主机"，并且可以包含相对紧密耦合的不同应用程序容器。例如，Pod 可能包含带有 Node.js 应用程序的容器以及另一个要吸收 Node.js Web 服务器提供的数据的不同容器。Pod 中的容器共享 IP 地址和端口空间，始终位于同一位置并且统一调度，并在相同的节点上运行，共享上下文环境。</p>

-			<p>Pods 是 Kubernetes 平台上的原子单元。当我们在 Kubernetes 上创建一个部署时，该部署将在其中创建包含容器的 Pod (而不是直接创建容器)。每个 Pod 绑定到它被调度的节点，并且保持在那里，直到终止 (根据重启策略) 或删除。在节点故障的情况下，在集群中的其他可用节点上调度相同的 Pod。</p>
+			<p>Pods 是 Kubernetes 平台上原子级别的单元。当我们在 Kubernetes 上创建一个部署时，该部署将在其中创建包含容器的 Pod (而不是直接创建容器)。每个 Pod 都绑定到它被调度的节点，并且始终在那里，直到终止 (根据重启策略) 或删除。在节点故障的情况下，在集群中的其他可用节点上调度相同的 Pod。</p>

 			</div>
 			<div class="col-md-4">
@@ -44,13 +44,13 @@ title: 查看 Pods 和 Nodes
 					<h3>概要:</h3>
 					<ul>
 						<li>Pods</li>
-						<li>Nodes</li>
+						<li>节点</li>
 						<li>Kubectl 主要命令</li>
 					</ul>
 				</div>
 				<div class="content__box content__box_fill">
 						<p><i>
-							Pod 是一组或多个应用程序容器 (例如 Docker 或 rkt)，包含共享存储 (卷)，IP 地址以及有关如何运行它们的信息。
+							Pod是由一个或者多个应用程序容器构成的(例如 Docker 或 rkt)，包含共享存储 (卷)，IP 地址以及有关如何运行它们的信息。
 						</i></p>
 				</div>
 			</div>
@@ -72,19 +72,19 @@ title: 查看 Pods 和 Nodes

 		<div class="row">
 			<div class="col-md-8">
-				<h2>Nodes</h2>
-				<p>Pod 总是运行在 <b>Node</b>上。Node 是 Kubernetes 的工作机器，可以是一个虚拟机或物理，这取决于在集群的安装情况。每个 Node 由 Master 管理。一个 Node 上可以有多个 Pod, Kubernetes master 会自动处理调度集群各个 Node 上的 Pod。 Master 在自动调度时，会考虑每个 Node 上的可用资源。</p>
+				<h2>节点</h2>
+				<p>Pod 总是运行在 <b>Node</b>上。Node 是 Kubernetes 的工作机器，可以是虚拟机或物理机，这取决于在集群的安装情况。每个节点由 Master 管理。一个节点上可以有多个 Pod, Kubernetes master 会自动处理调度集群各个节点上的 Pod。 Master 在自动调度时，会考虑每个 Node 上的可用资源。</p>

-				<p>每个 Kubernetes Node 节点至少运行以下组件:</p>
+				<p>每个 Kubernetes 节点至少运行以下组件:</p>
 				<ul>
-					<li>Kubelet 是负责 Kubernetes Master 和 所有 Node 节点之间通信的进程，它管理机器上运行的 Pod 和容器。</li>
+					<li>Kubelet 是负责 Kubernetes Master 和 所有节点之间通信的进程，它管理机器上运行的 Pod 和容器。</li>
 					<li>容器运行时(例如 Docker, rkt) 负责从镜像仓库中拉取容器镜像，解包容器并运行应用程序。</li>
 				</ul>

 			</div>
 			<div class="col-md-4">
 				<div class="content__box content__box_fill">
-					<p><i> 如果一些容器强耦合并且需要共享资源(例如 磁盘)，那么这些容器应该放到单个 Pod 中一起调度。 </i></p>
+					<p><i> 如果一些容器属于强耦合并且需要共享资源(例如 磁盘)，那么这些容器应该放到单个 Pod 中一起调度。 </i></p>
 				</div>
 			</div>
 		</div>
@@ -93,7 +93,7 @@ title: 查看 Pods 和 Nodes

 		<div class="row">
 			<div class="col-md-8">
-				<h2 style="color: #3771e3;">Node 概述</h2>
+				<h2 style="color: #3771e3;">节点概述</h2>
 			</div>
 		</div>

@@ -107,7 +107,7 @@ title: 查看 Pods 和 Nodes
 		<div class="row">
 			<div class="col-md-8">
 				<h2>使用 kubectl 进行故障排除</h2>
-				<p>在模块 <a href="/docs/tutorials/kubernetes-basics/deploy-intro/">2</a>中，您使用了 Kubectl 命令行接口。您将在模块 3 中继续使用它来获取有关已部署应用程序及其环境信息。最常见的操作可以通过以下 kubectl 命令完成:</p>
+				<p>在模块 <a href="/docs/tutorials/kubernetes-basics/deploy-intro/">2</a>中，您使用了 Kubectl 命令行接口。您将在模块 3 中继续使用它来获取有关已部署应用程序及其环境的信息。最常见的操作可以通过以下 kubectl 命令完成:</p>
 				<ul>
 					<li><b>kubectl get</b> - 列出可用资源</li>
 					<li><b>kubectl describe</b> - 显示有关资源的详细信息</li>
@@ -122,7 +122,7 @@ title: 查看 Pods 和 Nodes
 			</div>
 			<div class="col-md-4">
 				<div class="content__box content__box_fill">
-					<p><i> Node 是 Kubernetes 中的工作机器，可能是物理机或虚拟机，具体取决于集群的安装配置。多个 Pod 可以在一个 Node 上运行。 </i></p>
+					<p><i> 节点是 Kubernetes 中的工作机器，可能是物理机或虚拟机，具体取决于集群的安装配置。多个 Pod 可以在一个节点上运行。 </i></p>
 				</div>
 			</div>
 		</div>
@@ -130,7 +130,7 @@ title: 查看 Pods 和 Nodes

 		<div class="row">
 			<div class="col-md-12">
-				<a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/explore-interactive/" role="button">启动交互式教程<span class="btn__next">›</span></a>
+				<a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/explore-interactive/" role="button">启动互动教程<span class="btn__next">›</span></a>
 			</div>
 		</div>

@@ -1,5 +1,5 @@
 ---
-title: 交互性教程 - 应用外部可见
+title: 互动教程 - 应用外部可见
 ---

 <!DOCTYPE html>
@@ -1,5 +1,5 @@
 ---
-title: 使用服务让您的应用程序外部可见
+title: 使用服务发布您的应用程序
 ---

 <!DOCTYPE html>
@@ -15,40 +15,41 @@ title: 使用服务让您的应用程序外部可见
 	<main class="content">

 		<div class="row">
-
-     <div class="col-md-8">
-      	<h3>目标</h3>
+			<div class="col-md-8">
+    		<h3>目标</h3>
 				<ul>
-					<li>了解 Kubernetes 服务</li>
-					<li>了解 Kubernetes 标签</li>
-					<li>应用程序在 Kubernetes 外部可见</li>
+					<li>了解 Kubernetes 中的服务</li>
+					<li>了解标签和标签选择器对象如何与服务相关联</li>
+					<li>通过 Service 在 Kubernetes 集群外发布应用程序</li>
 				</ul>
 			</div>

 			<div class="col-md-8">
-			<h3>Kubernetes Services</h3>
+			<h3>Kubernetes 服务概述</h3>

-			<p>虽然每个 Pod 在所在的集群中拥有自己独立的 IP 地址，但这些 IP 地址不会暴露在 Kubernetes 集群外部。考虑到 Pod 可能随时会被终止、删除或被其他 Pod 替换，我们需要一种方法让其他 Pod 和应用程序自动发现彼此。Kubernetes 通过 Service 对 Pods 进行分组来解决此问题。一个 Kubernetes <b>Service</b> 是一个抽象层，它定义了一组逻辑的 Pods，并让这些 Pods 对外部流量可见，可以被负载均衡和服务发现。 </p>
+			<p>Kubernetes <a href="/docs/concepts/workloads/pods/pod-overview/">Pods</a> 终有一死. Pods 实际上有一个 <a href="/docs/concepts/workloads/pods/pod-lifecycle/">生命周期</a>. 当工作节点死机时, 节点上运行的Pod也将丢失。 一个 <a href="/docs/user-guide/replication-controller/#what-is-a-replicationcontroller">ReplicationController</a> 可能会通过创建新的Pod以动态地将集群恢复到所需的状态，以保持您的应用程序运行。还有一种方法就是：决定是否使用具有3个副本的图像处理后端。这些副本是可替代的前端系统不应关心后端副本，即使Pod丢失并重建也不会更改。 也就是说，Kubernetes 集群中的每个 Pod 都有一个唯一的IP地址，即使在同一个节点上的 Pods 也是如此，所以此时就需要一种自动调整更改 Pod 的方法, 以便您的应用程序继续运行。输入 <i>服务</i>. Kubernetes 中的服务是一个抽象对象，它定义了一组逻辑的 Pods 和一个访问它们的策略。 服务让互相依赖的 Pod 之间的耦合松动。 服务由 YAML <a href="/docs/concepts/configuration/overview/#general-config-tips">(首选)</a> 或 JSON 定义。像所有 Kubernetes 对象一样。 针对服务的一组 Pod 通常由<i>Label选择器</i>确定（参见下文，为什么您可能希望不将 <code>选择器</code> 包含在规范中。</p>

-			<p>此抽象允许我们将 Pods 暴露给集群外部的流量访问。Services 具有自己的唯一集群专用 IP 地址，并显示一个端口以接收流量。如果选择在集群外公开 Service，则有如下选项:</p>
+			<p>虽然每个 Pod 都有一个唯一的 IP 地址，但是这些 IP 不会在没有服务的情况下公开在群集之外。服务允许您的应用程序接收流量。 可以通过在 ServiceSpec 中指定<code>类型</code> 以不同方式显示服务：</p>
 			<ul>
-				<li>LoadBalancer - 提供公有 IP 地址 (在 GCP 或 AWS 上运行 Kubernetes 通常使用此方式)</li>
-				<li>NodePort - 使用 NAT 在集群的每个 Node 节点的同一端口让服务可见。(所有 Kubernetes 集群和 Minikube 中都可用此方式)</li>
+				<li><i>ClusterIP</i>(默认) - 在集群中的内部IP上公开服务。此类型使服务只能从集群中访问。</li>
+				<li><i>NodePort</i> —— 使用NAT在群集中每个选定的节点的同一端口上显示该服务。使用 <code><NodeIP>:<NodePort></code>可以从群集外部访问服务。建立 ClusterIP 的超集.</li>
+				<li><i>LoadBalancer</i> —— 在当前云中创建外部负载平衡器(如果支持)，并为服务分配固定的外部IP。建立 NodePort 的超集。</li>
+				<li><i>ExternalName</i> —— 使用任意名称显示该服务(由规范中的<code>externalName</code> 指定)，本过程通过使用该名称返回 CNAME 记录达成。无须使用代理。这种类型需要 v1.7 或更高版本的 <code>kube-dns</code>.</li>
 			</ul>
+			<p>有关不同类型服务的详细信息，请参见 <a href="/docs/tutorials/services/source-ip/">使用源IP</a> 教程。另请参阅 <a href="/docs/concepts/services-networking/connect-applications-service">使用服务连接应用程序</a>.</p>
+			<p>另外，请注意，服务中有一些使用案例涉及在规范中不定义<code>选择器</code> 。不使用 <code>选择器</code> 创建的服务也不会创建相应的端点对象。 这允许用户手动将服务映射到特定端点。没有选择器还有可能是因为您严格地使用了 <code>type: ExternalName</code>.</p>
 			</div>
 			<div class="col-md-4">
 				<div class="content__box content__box_lined">
-					<h3>摘要:</h3>
+					<h3>摘要</h3>
 					<ul>
-						<li>Pod 流量外部可见</li>
-						<li>Pods 流量负载均衡</li>
+						<li>对外部流量曝光 Pod </li>
+						<li>跨多个 Pods 进行流量负载均衡</li>
 						<li>使用标签</li>
 					</ul>
 				</div>
 				<div class="content__box content__box_fill">
-						<p><i>
-							Kubernetes Service 是一个抽象层，它定义了一组逻辑的 Pods，并为这些 Pods 启用了外部流量访问、负载均衡和服务发现。
-						</i></p>
+						<p><i>Kubernetes 服务是一个抽象层，它定义了一组逻辑的Pods，并为这些Pods启用了外部流量曝光、负载平衡和服务发现。</i></p>
 				</div>
 			</div>
 		</div>
@@ -56,57 +57,35 @@ title: 使用服务让您的应用程序外部可见

 		<div class="row">
 			<div class="col-md-8">
-				<h2 style="color: #3771e3;">Services 概述</h2>
+				<h3>服务和标签</h3>
 			</div>
 		</div>

 		<div class="row">
 			<div class="col-md-8">
-				<p><img src="/docs/tutorials/kubernetes-basics/public/images/module_04_services.svg"></p>
-			</div>
-		</div>
-		<br>
-
-		<div class="row">
-			<div class="col-md-8">
-
-				<p>一个 Service 提供了一组 Pods 的流量负载均衡。通过创建服务以对来自特定部署的所有 Pods 进行分组时，这是有用的(当我们有多个实例运行时，我们的应用程序将在下一个模块中使用这一点)。</p>
-
-				<p>Services 还负责集群内部的服务发现 (包含在 <a href="/docs/user-guide/connecting-applications/#accessing-the-service">访问服务</a>中)。 例如，这将允许前端服务 (如 web 服务器) 从后端服务 (如 数据库) 接收流量，而不必考虑 Pod。 </p>
-
-				<p>Services 使用标签选择器匹配一组 Pods，标签选择器支持在标签上进行原始逻辑分组的能力。</p>
-
-			</div>
-			<div class="col-md-4">
-				<div class="content__box content__box_fill">
-					<p><i> 您可以通过添加 --expose 作为 kubectl 运行命令的参数，在创建 Deployment 的同时创建 Service。 </i></p>
-				</div>
+				<p><img src="/docs/tutorials/kubernetes-basics/public/images/module_04_services.svg" width="150%" height="150%"></p>
 			</div>
 		</div>

-		<br>
-
 		<div class="row">
 			<div class="col-md-8">
-				<p><b>Labels</b> 是附加到对象的 键/值对，例如 Pods，您可以将它们视为社交媒体的标签符号。它们用于以对用户有意义的方式组织相关对象，如:</p>
+				<p> A服务可以跨一组 Pod 路由流量。服务是允许 Pod 在 Kubernetes 中死亡和复制而不影响应用程序的抽象层。相关 Pod 之间的发现和路由(如应用程序中的前端和后端组件)是由 Kubernetes Services 处理的。</p>
+				<p> 服务使用 <a href="/docs/concepts/overview/working-with-objects/labels">标签和选择器</a>, 匹配一组 Pod，成为分组原语，此原语允许在 Kubernetes 中的对象进行逻辑运算。标签是一对附加到对象的关键/重要组，可以以多种方式使用，方式如下: </p>
 				<ul>
-					<li>生产环境 (生产、测试、开发)</li>
-					<li>应用程序版本 (beta、v1.3)</li>
-					<li>服务类型 (前端、后端、数据库)</li>
+					<li>指定用于开发、测试和生产的对象</li>
+					<li>嵌入版本标签</li>
+					<li>使用标签分类对象</li>
 				</ul>
+
 			</div>
 			<div class="col-md-4">
 				<div class="content__box content__box_fill">
-					<p><i> Labels 是附加到对象的键/值对。</i></p>
+					<p><i>您可以在使用<br><code>--expose</code> 在 kubectl 中创建部署的同时创建服务.</i></p>
 				</div>
 			</div>
 		</div>
+
 		<br>
-		<div class="row">
-			<div class="col-md-8">
-				<h2 style="color: #3771e3;">Labels</h2>
-			</div>
-		</div>

 		<div class="row">
 			<div class="col-md-8">
@@ -116,22 +95,16 @@ title: 使用服务让您的应用程序外部可见
 		<br>
 		<div class="row">
 			<div class="col-md-8">
-
-				<p>Labels 可以在创建时或以后附加到对象，并可以随时修改。
-				在使用 kubectl run 命令新建 Pods/Deployment 时，会设置一些默认的 Labels/Label。标签和标签选择器之间的链接定义了 Deployment 及其创建 Pod 之间的关系。</p>
-
-				<p>现在，让我们在 Service 的帮助下公开我们的应用程序，并应用一些新的标签。</p>
+				<p>标签可以在创建时或之后附加到对象后，并支持随时修改。让我们现在开始使用服务公开我们的应用程序并应用一些标签吧。</p>
 			</div>
 		</div>
 		<br>
 		<div class="row">
 			<div class="col-md-12">
-				<a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/expose-interactive/" role="button">启动交互式教程<span class="btn__next">›</span></a>
+				<a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/expose-interactive/" role="button">启动互动教程<span class="btn__next">›</span></a>
 			</div>
 		</div>
-
 	</main>
-
 </div>

 </body>
@@ -17,15 +17,15 @@ title: 概述
    <div class="row">
      <div class="col-md-9">
        <h2>Kubernetes 基础</h2>
-        <p>本教程介绍了 Kubernetes 集群编排系统的基础知识。每个模块包含关于 Kubernetes 主要特性和概念的一些背景信息，并包括一个交互式在线教程。这些交互式教程让您可以自己管理一个简单的集群及其容器化应用程序。</p>
-        <p>使用交互式教程，您可以学习:</p>
+        <p>本教程介绍了 Kubernetes 集群编排系统的基础知识。每个模块包含关于 Kubernetes 主要特性和概念的一些背景信息，并包括一个在线互动教程。这些互动教程让您可以自己管理一个简单的集群及其容器化应用程序。</p>
+        <p>使用互动教程，您可以学习:</p>
        <ul>
        <li>在集群上部署容器化应用程序</li>
        <li>弹性部署</li>
        <li>使用新的软件版本，更新容器化应用程序</li>
        <li>调试容器化应用程序</li>
        </ul>
-        <p>教程 Katacoda 在您的浏览器中运行一个虚拟终端，在浏览器中运行 Minikube，这是一个可在任何地方小规模本地部署的 Kubernetes 集群。没有安装任何软件或进行任何配置; 每个交互性教程都直接从您的网页浏览器上运行。</p>
+        <p>教程 Katacoda 在您的浏览器中运行一个虚拟终端，在浏览器中运行 Minikube，这是一个可在任何地方小规模本地部署的 Kubernetes 集群。不需要安装任何软件或进行任何配置; 每个交互性教程都直接从您的网页浏览器上运行。</p>
      </div>
    </div>

@@ -34,7 +34,7 @@ title: 概述
    <div class="row">
      <div class="col-md-9">
        <h2>Kubernetes 可以为您做些什么?</h2>
-        <p>现代的 Web 服务，用户希望应用程序能够 24/7 全天候使用，开发人员希望每天可以多次发布部署新版本的应用程序。 容器化可以帮助软件包服务于这些目标，使应用程序能够以简单快速的方式发布和更新，而无需停机。Kubernetes 帮助您确保这些容器化的应用程序在您想要的地方和时间运行，并帮助应用程序找到它们需要的资源的工具。 <a href="http://kubernetes.io/docs/whatisk8s/">Kubernetes</a>  是一个生产可用的开源平台，具有 Google 容器集群方面的设计与经验积累，拥有来自社区的最佳实践。</p>
+        <p>通过现代的 Web 服务，用户希望应用程序能够 24/7 全天候使用，开发人员希望每天可以多次发布部署新版本的应用程序。 容器化可以帮助软件包达成这些目标，使应用程序能够以简单快速的方式发布和更新，而无需停机。Kubernetes 帮助您确保这些容器化的应用程序在您想要的时间和地点运行，并帮助应用程序找到它们需要的资源和工具。 <a href="http://kubernetes.io/docs/whatisk8s/">Kubernetes</a>  是一个可用于生产的开源平台，根据 Google 容器集群方面积累的经验，以及来自社区的最佳实践而设计。</p>
      </div>
    </div>

@@ -77,7 +77,7 @@ title: 概述
          <div class="thumbnail">
            <a href="/docs/tutorials/kubernetes-basics/scale-intro/"><img src="./public/images/module_05.svg?v=1469803628347" alt=""></a>
            <div class="caption">
-              <a href="scale-intro/"><h5>5. 应用可伸缩</h5></a>
+              <a href="scale-intro/"><h5>5. 应用可扩展</h5></a>
            </div>
          </div>
        </div>
@@ -1,5 +1,5 @@
 ---
-title: 交互式教程 - 扩展您的应用程序
+title: 互动教程 - 扩展您的应用程序
 ---

 <!DOCTYPE html>
@@ -19,14 +19,15 @@ title: 运行应用程序的多个实例
     <div class="col-md-8">
      	<h3>目标</h3>
 				<ul>
-					<li>使用 kubectl 缩放应用程序</li>
+					<li>使用 kubectl 伸缩应用程序</li>
 				</ul>
 			</div>

 			<div class="col-md-8">
-       <h3>缩放应用程序</h3>
+       <h3>应用程序伸缩</h3>

-			<p>在之前的模块中，我们创建了一个 <a href="http://kubernetes.io/docs/user-guide/deployments/"> Deployment</a>，然后通过 <a href="http://kubernetes.io/docs/user-guide/services/">Service</a>让应用程序外部可见。Deployment 仅为我们的应用程序创建了一个 Pod。 当流量增加时，我们将需要扩展应用程序以跟上用户需求。</p>
+			<p>在之前的模块中，我们创建了一个 <a href="http://kubernetes.io/docs/user-guide/deployments/"> Deployment</a>，然后通过 <a href="http://kubernetes.io/docs/user-guide/services/">Service</a>让应用程序外部可见。Deployment 仅为我们的应用程序创建了一个 Pod。 当流量增加时，我们将需要
+				应用程序以跟上用户需求。</p>

 			<p><b>Scaling</b> 是通过更改 Deployment 中的副本数量实现的。</p>

@@ -35,7 +36,7 @@ title: 运行应用程序的多个实例
 				<div class="content__box content__box_lined">
 					<h3>摘要:</h3>
 					<ul>
-						<li>Deployment 的缩放</li>
+						<li>Deployment 的伸缩</li>
 					</ul>
 				</div>
 				<div class="content__box content__box_fill">
@@ -101,14 +102,14 @@ title: 运行应用程序的多个实例

 		<div class="row">
 			<div class="col-md-8">
-				<p> 一旦您有应用程序的多个实例，您将能够滚动更新而不会停止服务。我们将在下一个模块中介绍。现在，我们去在线终端扩展我们的应用程序。</p>
+				<p> 一旦您有应用程序的多个实例，您将能够滚动更新，而不会停止服务————我们将在下一个模块中介绍这些。现在，我们去在线终端对我们的应用程序进行伸缩。</p>
 			</div>
 		</div>
 		<br>

 		<div class="row">
 			<div class="col-md-12">
-				<a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/scale-interactive/" role="button">启动交互式教程 <span class="btn__next">›</span></a>
+				<a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/scale-interactive/" role="button">启动互动教程 <span class="btn__next">›</span></a>
 			</div>
 		</div>

@@ -1,5 +1,5 @@
 ---
-title: 交互式教程 - 更新您的应用程序
+title: 互动教程 - 更新您的应用程序
 ---

 <!DOCTYPE html>
@@ -26,9 +26,9 @@ title: 执行滚动更新
 			<div class="col-md-8">
 			<h3>更新应用程序</h3>

-			<p>用户期望应用程序始终可用，并且开发人员有望每天部署新版本。这就是 Kubernetes 的滚动更新。 <b>Rolling updates</b> 允许通过使用新的 Pods 实例逐个更新来实现零停机的更新部署。新的 Pods 会被调度到可用资源的 Node 节点上。</p>
+			<p>用户期望应用程序始终可用，并且希望开发人员每天部署新版本。在 Kubernetes 上这通过滚动更新(Rolling updates)达成。 <b>Rolling updates</b> 允许通过使用新的 Pods 实例逐个更新来实现零停机的部署更新。新的 Pods 会被调度到可用资源的 Node 节点上。</p>

-			<p>在上一个模块中，我们将应用程序扩展为运行多个实例。这是执行更新但不影响应用可用性的要求。默认情况下，更新期间最大数量的 Pods 可能不可用，此时创建和更新 Pod 的最大数量是一。 这两个选项可以配置为数字或百分比(Pods)。
+			<p>在上一个模块中，我们将应用程序扩展为运行多个实例。这也是执行更新但不影响应用可用性所需的条件。默认情况下，更新期间最大数量的不可用 Pod 以及最大数量的新 Pod 是一。 这两个选项可以配置为数字或百分比(Pods)。
 			在 Kubernetes 中，更新已版本化，任何部署更新都可以恢复到以前的 (稳定) 版本。</p>

 			</div>
@@ -94,13 +94,13 @@ title: 执行滚动更新
 		<div class="row">
 			<div class="col-md-8">

-				<p>与应用程序缩放类似，如果 Deployment 外部可见，则 Service 将在更新期间将流量负载均衡到可用的 Pod。可用的 Pod 指的是应用程序用户可用的实例。</p>
+				<p>与应用程序伸缩类似，如果 Deployment 外部可见，则服务将在更新期间将流量负载均衡到可用的 Pod。可用的 Pod 指的是应用程序用户可用的实例。</p>

 				<p>滚动更新允许以下操作:</p>
 				<ul>
 					<li>将应用程序从一个环境升级到另一个环境 (通过容器镜像更新)</li>
 					<li>回滚到以前的版本</li>
-					<li>持续集成和持续交付，实现应用程序零故障</li>
+					<li>持续集成和持续交付，实现应用程序零停机</li>

 				</ul>

@@ -116,7 +116,7 @@ title: 执行滚动更新

 		<div class="row">
 			<div class="col-md-8">
-				<p> 在下面的交互式教程中，我们将把应用程序更新到一个新版本，并执行回滚。</p>
+				<p> 在下面的互动教程中，我们将把应用程序更新到一个新版本，并执行回滚。</p>
 			</div>
 		</div>
 		<br>
@@ -0,0 +1,142 @@
+---
+title: 使用命令式的方式管理 Kubernetes 对象
+---
+
+{% capture overview %}
+直接使用内置的 `kubectl` 命令行工具，以命令式方式可以快速创建，更新和删除 Kubernetes 对象。本文档介绍了这些命令是如何组织的，以及如何使用它们来管理活动对象。
+{% endcapture %}
+
+{% capture body %}
+
+## 权衡
+
+`kubectl` 工具支持三种对象的管理:
+
+* 命令式的方式
+* 命令式的对象配置
+* 声明式的对象配置
+
+参见[Kubernetes对象管理](/docs/concepts/tools/kubectl/object-management-overview/)
+讨论各种对象管理的优缺点.
+
+## 如何创建对象
+
+`kubectl` 工具支持用于创建一些最常用的对象类型的动词驱动命令，这些命令被命名为对于不熟悉的用户也是一目了然。
+
+- `run`: 创建一个新的 Deployment 对象以在一个或多个 Pod 中运行 Containers。
+- `expose`: 创建一个新的 Service 对象用于负载均衡 Pods 上的的网络流量。
+- `autoscale`: 创建一个新的 Autoscaler 对象，即自动水平扩展控制器，提供 Deployment 自动水平伸缩支持。
+
+`kubectl` 工具也支持由对象类型驱动的创建命令。 这些命令支持更多的对象类型，并且对其意图更为明确，但要求用户知道他们打算创建的对象的类型。
+
+ - `create <objecttype> [<subtype>] <instancename>`
+
+某些对象类型具有您可以在“create"命令中指定的子类型.
+例如，Service对象有几种子类型，包括ClusterIP，
+LoadBalancer和NodePort. 以下是创建一个服务的示例
+子类型NodePort:
+
+一些对象类型允许你在 `create` 命令中指定子命令。例如，Service 对象拥有几个子命令，包括 ClusterIP、LoadBalancer 和 NodePort。以下是使用子命令 NodePort 创建服务的示例:
+
+
+```shell
+kubectl create service nodeport <myservicename>
+```
+
+在前面的例子中，调用 `create service nodeport`命令是 `create service`命令的子命令.
+
+您可以使用 `-h` 标志来查找子命令支持的参数和标志:
+
+```shell
+kubectl create service nodeport -h
+```
+
+## 如何更新对象
+
+`kubectl` 命令支持一些常见更新操作的动词驱动命令。这样命名可以让不熟悉 Kubernetes 对象的用户，在不知道必须设置的特定字段的情况下也可以执行更新操作:
+
+ - `scale`: 通过更新控制器的副本数量，水平扩展控制器以添加或删除 Pod。
+ - `annotate`: 从对象添加或删除注释。
+ - `label`: 为对象添加或删除标签。
+
+`kubectl`命令还支持由对象的一个切面驱动的更新命令.设置此切面可能会为不同的对象类型设置不同的字段:
+
+ - `set` <field>: 设置对象的一个切面.
+
+**注**: 在 Kubernetes 版本 1.5 中，并不是每个动词驱动的命令都有一个相关的切面驱动的命令.
+
+`kubectl` 工具支持直接更新活动对象的其他方法，然而，它们需要更好的了解 Kubernetes 对象模式。
+
+- `edit`: 通过在编辑器中打开其配置，直接编辑活动对象的原始配置。
+- `patch`: 通过使用补丁字符串直接修改活动对象的特定字段。
+
+有关补丁字符串的更多详细信息，请参阅补丁部分
+[API 公约](https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#patch-operations).
+
+## 如何删除对象
+
+您可以使用 `delete` 命令从集群中删除一个对象:
+
+ - `delete <type>/<name>`
+
+ **注意**: 您可以对命令式命令和命令式对象配置都使用 `kubectl delete` 方法。两者的差异在于传递的命令参数不同。要将
+ `kubectl delete` 作为命令式命令使用，将要删除的对象作为参数传递。以下是传递名为 nginx 的 Deployment 对象的示例:
+
+```shell
+kubectl delete deployment/nginx
+```
+
+## 如何查看对象
+
+{% comment %}
+TODO(pwittrock): 实现时取消注释.
+
+您可以使用 `kubectl view` 打印指定对象的字段。
+
+- `view`: 打印对象的特定字段的值。
+
+{% endcomment %}
+
+
+
+有几个命令用于打印有关对象的信息:
+
+- `get`: 打印有关匹配对象的基本信息。使用 `get -h` 来查看选项列表。
+- `describe`: 打印有关匹配对象的聚合详细信息。
+- `logs`: 打印 Pod 运行容器的 stdout 和 stderr 信息。
+
+##  使用 `set` 命令在创建之前修改对象
+
+有一些对象字段没有可以使用的标志，在 `create` 命令中。在某些情况下，您可以使用组合 `set` 和 `create` 为对象之前的字段指定一个值创建。这是通过将 `create` 命令的输出管道连接到 `set` 命令，然后回到 `create` 命令。以下是一个例子:
+
+```sh
+kubectl create service clusterip <myservicename> -o yaml --dry-run | kubectl set selector --local -f - 'environment=qa' -o yaml | kubectl create -f -
+```
+
+1.  使用 `create service -o yaml --dry-run` 创建服务配置，并将其作为 YAML 打印到 stdout，而不是将其发送到 Kubernetes API 服务器。
+1.  使用 `set --local -f - -o yaml` 从 stdin 读取配置，并将更新后的配置作为 YAML 写入 stdout。
+1.  使用 `kubectl create -f -` 从 stdin 提供的配置创建对象。
+
+## 使用 `--edit` 在创建之前修改对象
+
+您可以使用 `kubectl create --edit` 命令在对象创建之前，对对象进行任意更改。以下是一个例子:
+
+```sh
+kubectl create service clusterip my-svc -o yaml --dry-run > /tmp/srv.yaml
+kubectl create --edit -f /tmp/srv.yaml
+```
+
+1. 使用`create service` 创建服务的配置并将其保存到 `/tmp/srv.yaml`。
+1. 使用`create --edit` 在创建对象之前打开配置文件进行编辑。
+
+
+{% endcapture %}
+
+{% capture whatsnext %}
+ -  [使用对象配置管理 Kubernetes 对象(必要)](/docs/tutorials/object-management-kubectl/imperative-object-management-configuration/)
+ -  [使用对象配置(声明式)管理 Kubernetes 对象](/docs/tutorials/object-management-kubectl/declarative-object-management-configuration/)
+ -  [Kubectl 命令参考](/docs/user-guide/kubectl/v1.6/)
+ -  [Kubernetes 对象模式参考](/docs/resources-reference/v1.6/)
+ {% endcapture %}
+
+ {% include templates/concept.md %}
@@ -0,0 +1,152 @@
+---
+title: Kubernetes 对象管理
+---
+
+{% capture overview %}
+`kubectl` 命令行工具支持 Kubernetes 对象几种不同的创建和管理方法。本文档简要介绍了这些方法.
+{% endcapture %}
+
+{% capture body %}
+
+## 管理技巧
+
+**警告:** Kubernetes 对象应该只使用一种技术进行管理。混合使用不同的技术，会导致相同对象出现未定义的行为。
+
+| 管理技术             | 操作         |推荐环境 | 支持撰写  | 学习曲线 |
+|----------------------------------|----------------------|------------------------|--------------------|----------------|
+| 命令式的方式              | 活动对象         | 开发项目   | 1+                 | 最低         |
+| 命令式对象配置  | 单文件     | 生产项目    | 1                  | 中等       |
+| 声明式对象配置 | 文件目录 | 生产项目    | 1+                 | 最高        |
+
+## 命令式的方式
+
+当使用命令式的命令时，用户直接对集群中的活动对象进行操作。用户提供 `kubectl` 命令的参数或标记进行操作。
+
+这是在集群中启动或运行一次性任务的最简单的方法。因为这种技术直接在活动对象上运行，所以它没有提供以前配置的历史记录。
+
+### 例子
+
+通过创建 Deployment 对象来运行 nginx 容器的实例:
+
+```sh
+kubectl run nginx --image nginx
+```
+
+使用不同的语法做同样的事情:
+
+```sh
+kubectl create deployment nginx --image nginx
+```
+
+### 权衡
+
+与对象配置相比的优点:
+
+ - 命令简单易学，易于记忆。
+ - 命令只需要一个步骤即可对群集进行更改。
+
+与对象配置相比的缺点:
+
+ - 命令不与变更审核流程整合。
+ - 命令不提供与更改相关联的审计跟踪。
+ - 除了活动对象之外，命令不提供记录来源。
+ - 命令不提供用于创建新对象的模板。
+
+## 命令式对象配置
+
+在命令式对象配置中，`kubectl` 命令指定操作(创建，替换等)，可选标志和至少一个文件名称。指定的文件必须包含对象的完整定义以 YAML 或 JSON 格式。
+
+请参阅[参考资源](https://kubernetes.io/docs/resources-reference/v1.6/)
+查看有关对象定义的更多细节。
+
+**警告:** 命令式 `replace` 命令用新提供的命令替换现有资源规格，将对配置文件中缺少的对象的所有更改都丢弃。这种方法不应更新与配置文件无关的资源类型。例如，`LoadBalancer` 类型的服务使其 `externalIPs` 字段与集群的配置无关。
+
+### 例子
+
+创建对象定义配置文件:
+
+```sh
+kubectl create -f nginx.yaml
+```
+
+删除两个配置文件中定义的对象:
+
+```sh
+kubectl delete -f nginx.yaml -f redis.yaml
+```
+
+通过覆写实时配置更新配置文件中定义的对象:
+
+```sh
+kubectl replace -f nginx.yaml
+```
+
+### 权衡
+
+与命令式的命令相比的优点:
+
+ - 对象配置可以存储在源码控制系统中，如Git。
+ - 对象配置可以与进程集成，例如在推送和审计跟踪之前查看更改。
+ - 对象配置提供了一个用于创建新对象的模板。
+
+与命令式的命令相比的缺点:
+
+ - 对象配置需要对对象模式有基本的了解。
+ - 对象配置需要编写 YAML 文件的附加步骤。
+
+与声明式对象配置相比的优势:
+
+ - 命令对象配置行为更简单易懂。
+ - 至于 Kubernetes 1.5 版本，命令式对象配置更为成熟。
+
+与声明式对象配置相比的缺点:
+
+ - 命令对象配置最适合于文件，而不是目录。
+ - 活动对象的更新必须反映在配置文件中，否则在下次更替时将丢失。
+
+## 声明式对象配置
+
+当使用声明式对象配置时，用户对本地存储的对象配置文件进行操作，但是用户没有定义要对文件执行的操作。通过 `kubectl` 自动检测每个对象进行创建、更新和删除操作。这样可以在目录层级上工作，因为不同的对象可能需要不同的操作。
+
+**注意:** 声明式对象配置保留由其他对象进行的更改，即使更改未合并到对象配置文件中。这可以通过使用 `patch` API 操作来写入观察到的差异，而不是使用`replace` API 操作来替换整个对象的配置。
+
+### 例子
+
+处理`configs` 目录中的所有对象配置文件，创建或修补(patch)活动对象:
+
+```sh
+kubectl apply -f configs/
+```
+
+递归处理目录:
+
+```sh
+kubectl apply -R -f configs/
+```
+
+### 权衡
+
+与命令式对象配置相比的优点:
+
+ - 直接对活动对象进行的更改将被保留，即使它们未被并入到配置文件中。
+ - 声明式对象配置更好地支持目录操作，并自动检测每个对象的操作类型 (创建、修补，删除)。
+
+与命令式对象配置相比的缺点:
+
+- 声明式对象配置在意外情况下难以调试和了解结果。
+- 使用差异的部分更新会创建复杂的合并和补丁操作。
+
+ {% endcapture %}
+
+ {% capture whatsnext %}
+ -  [使用命令式的命令管理 Kubernetes 对象](/docs/tutorials/object-management-kubectl/imperative-object-management-command/)
+ -  [使用对象配置管理 Kubernetes 对象(必要)](/docs/tutorials/object-management-kubectl/imperative-object-management-configuration/)
+ -  [使用对象配置(声明式)管理 Kubernetes 对象](/docs/tutorials/object-management-kubectl/declarative-object-management-configuration/)
+ -  [Kubectl 命令参考](/docs/user-guide/kubectl/v1.6/)
+ -  [Kubernetes 对象模式参考](/docs/resources-reference/v1.6/)
+
+ {% comment %}
+ {% endcomment %}
+ {% endcapture %}
+
+ {% include templates/concept.md %}
@@ -1,6 +1,7 @@
 ---
 assignees:
 - k8s-merge-robot
+
 title: 认识 Kubernetes?
 ---

@@ -0,0 +1,12 @@
+---
+---
+
+@import "../_sass/reset"
+@import "../_sass/skin"
+@import "../_sass/code-styles"
+
+// media queries
+@import "../_sass/base"
+@import "../_sass/case-studies"
+@import "../_sass/tablet"
+@import "../_sass/desktop"
@@ -0,0 +1,449 @@
+#caseStudyTitle {
+    margin-top: 1em !important;
+    font-family:"Roboto", sans-serif;
+}
+
+p {
+  font-family:"Roboto", sans-serif;
+  padding:5%;
+}
+
+a {
+  text-decoration:none;
+  color:#3366ff;
+}
+
+body {
+  margin:0;
+
+}
+
+h1 {
+  font-family:"Roboto", sans-serif;
+  font-weight:bold;
+  letter-spacing:0.025em;
+  font-size:42px;
+  padding-bottom:0px;
+}
+
+.subhead {
+  font-size:26px;
+  font-weight:100;
+  line-height:40px;
+  padding-bottom:1%;
+  padding-top:0.5%;
+
+}
+
+.banner1 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:12%;
+  padding-bottom:0.5%;
+  padding-left:10.9%;
+  font-size:32px;
+  background: url('/images/CaseStudy_ancestry_banner1.jpg');
+  background-size:100% auto;
+  background-repeat:no-repeat;
+}
+
+.banner2 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:3%;
+  padding-bottom:3%;
+  font-size:19px;
+  letter-spacing:0.03em;
+  line-height:28px;
+  float:left;
+  background-size:100% auto;
+  background-color:#666666;
+  background-repeat:no-repeat;
+
+}
+
+.banner3 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-left:5%;
+  padding-right:5%;
+  padding-top:6%;
+  padding-bottom:6%;
+  font-size:21px;
+  letter-spacing:0.03em;
+  line-height:32px;
+  float:left;
+  background: url('/images/CaseStudy_ancestry_banner3.jpg');
+  background-size:100% auto;
+}
+
+.banner4 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:5%;
+  padding-bottom:5%;
+  font-size:21px;
+  letter-spacing:0.03em;
+  line-height:32px;
+  float:left;
+  background: url('/images/CaseStudy_ancestry_banner4.jpg');
+  background-size:100% auto;
+}
+
+.banner5 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:3%;
+  padding-bottom:3%;
+  font-size:21px;
+  letter-spacing:0.03em;
+  line-height:32px;
+  float:left;
+  background-size:100% auto;
+  background-color:#666666;
+  background-repeat:no-repeat;
+}
+
+.banner2text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:65%;
+  padding-left:17%;
+  float:left;
+  text-align:center;
+}
+
+.banner3text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:70%;
+  padding-left:15%;
+  text-align:center;
+}
+
+.banner4text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:70%;
+  padding-left:15%;
+  text-align:center;
+}
+
+.banner5text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:65%;
+  padding-left:16%;
+  float:left;
+  text-align:center;
+}
+
+
+h2 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  font-size:24px;
+  line-height:34px;
+  color:#3366ff;
+}
+
+.quote {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  font-size:22px;
+  line-height:32px;
+  color:#3366ff;
+}
+
+.details {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  font-size:18px;
+  color:#3366ff;
+  letter-spacing:0.03em;
+  padding-bottom:1.5%;
+  padding-top:2%;
+  padding-left:11%;
+}
+
+
+hr {
+  border-bottom:0px solid;
+  width:100%;
+  opacity:0.5;
+  color:#aaaaaa;
+  height:1px;
+}
+
+.col1 {
+  width: 40%;
+  padding-left:5%;
+  padding-right:8%;
+  float:left;
+  font-family:"Roboto", sans-serif;
+  font-weight:100;
+  color:#606060;
+  line-height:20px;
+  letter-spacing:0.03em;
+  font-size:14px;
+
+}
+
+.col2 {
+  width: 40%;
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  float:left;
+  line-height:20px;
+  color:#606060;
+  letter-spacing:0.03em;
+  font-size:14px;
+
+}
+
+.fullcol {
+  width:77%;
+  margin-left:11%;
+  margin-right:10%;
+  margin-top:4%;
+  margin-bottom:6%;
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  float:left;
+  line-height:22px;
+  color:#606060;
+  letter-spacing:0.03em;
+  font-size:14px;
+}
+
+.cols {
+  width:90%;
+  margin-left:6.5%;
+  margin-top:1%;
+  margin-bottom:4%;
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  float:left;
+
+}
+
+h4 {
+  font-family:"Roboto", sans-serif;
+  font-weight:400;
+  letter-spacing:0.9;
+  font-size:20px;
+  padding-bottom:0px;
+}
+
+
+@media screen and (max-width: 910px){
+
+h1 {
+  font-family:"Roboto", sans-serif;
+  font-weight:bold;
+  line-height:36px;
+  letter-spacing:0.03em;
+  font-size:30px !important;
+  padding-bottom:0px;
+  width:80%;
+}
+
+.subhead {
+  font-size:18px;
+  font-weight:100;
+  line-height:27px;
+}
+
+.details {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  font-size:16px;
+  color:#3366ff;
+  letter-spacing:0.03em;
+  padding-bottom:2%;
+  line-height:28px;
+  padding-top:4%;
+  padding-left:10%;
+}
+
+.logo {
+    width:8%;
+}
+
+.col1 {
+  width: 90%;
+  padding-left:5%;
+  padding-right:8%;
+  float:left;
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#606060;
+  line-height:20px;
+  letter-spacing:0.03em;
+  font-size:14px;
+}
+
+.col2 {
+  width: 90%;
+  padding-left:5%;
+  padding-top:5%;
+  padding-bottom:5%;
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  float:left;
+  line-height:20px;
+  color:#606060;
+  letter-spacing:0.03em;
+  font-size:14px;
+}
+
+.banner1 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:15%;
+  padding-bottom:2%;
+  padding-left:10%;
+  font-size:18px;
+  background: url('CaseStudy_ancestry_banner1.jpg');
+  background-size:100% auto;
+}
+
+.banner2 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:4%;
+  padding-bottom:4%;
+  padding-left:0%;
+  font-size:18px;
+  letter-spacing:0.03em;
+  line-height:24px;
+  width:100%;
+  float:left;
+  background:none;
+  background-color:#666666;
+}
+
+.banner3 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:5%;
+  padding-bottom:5%;
+  font-size:18px;
+  letter-spacing:0.03em;
+  line-height:24px;
+  width:100%;
+  float:left;
+  background: url('CaseStudy_ancestry_banner3.jpg');
+}
+
+.banner4 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:5%;
+  padding-bottom:5%;
+  font-size:18px;
+  letter-spacing:0.03em;
+  line-height:24px;
+  width:100%;
+  float:left;
+  background: url('CaseStudy_ancestry_banner4.jpg');
+}
+
+.banner5 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:4%;
+  padding-bottom:4%;
+  font-size:18px;
+  letter-spacing:0.03em;
+  line-height:24px;
+  width:100%;
+  float:left;
+  background:none;
+  background-color:#666666;
+}
+
+.banner2text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:80%;
+  padding-left:10%;
+  float:left;
+  text-align:center;
+  color:#ffffff;
+}
+
+.banner3text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:80%;
+  padding-left:5%;
+  padding-top:5%;
+  padding-bottom:5%;
+  text-align:center;
+}
+
+.banner4text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:80%;
+  padding-left:10%;
+  padding-top:3%;
+  padding-bottom:3%;
+  text-align:center;
+}
+
+.banner5text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:80%;
+  padding-left:10%;
+  float:left;
+  text-align:center;
+  color:#ffffff;
+}
+
+.fullcol {
+  margin-top:6%;
+}
+
+h2 {
+  line-height:26px;
+  font-size:18px;
+}
+
+.quote {
+  font-size:18px;
+  line-height:24px;
+}
+
+.logo {
+  width:35%;
+}
+
+@media screen and (max-width: 480px){
+
+  .logo {
+    width:65%;
+    padding-bottom:5%;
+    padding-top:2%;
+  }
+}
@@ -0,0 +1,453 @@
+#caseStudyTitle {
+    margin-top: 1em !important;
+    font-family:"Roboto", sans-serif;
+}
+
+body {
+
+  background-color:#ffffff;
+}
+
+p {
+  font-family:"Roboto", sans-serif;
+  padding:5%;
+}
+
+a {
+  text-decoration:none;
+  color:#3366ff;
+}
+
+body {
+  margin:0;
+
+}
+
+h1 {
+  font-family:"Roboto", sans-serif;
+  font-weight:bold;
+  letter-spacing:0.025em;
+  font-size:42px;
+  padding-bottom:0px;
+}
+
+.subhead {
+  font-size:26px;
+  font-weight:100;
+  line-height:40px;
+  padding-bottom:1%;
+
+}
+
+.banner1 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:12%;
+  padding-bottom:0.5%;
+  padding-left:9.9%;
+  font-size:32px;
+  background: url('/images/CaseStudy_box_banner1.jpg');
+  background-size:100% auto;
+  background-repeat:no-repeat;
+
+}
+
+.banner2 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:3%;
+  padding-bottom:3%;
+  font-size:21px;
+  letter-spacing:0.03em;
+  line-height:32px;
+  float:left;
+  background-size:100% auto;
+  background-color:#666666;
+  background-repeat:no-repeat;
+
+}
+
+.banner3 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:5%;
+  padding-bottom:5%;
+  font-size:21px;
+  letter-spacing:0.03em;
+  line-height:32px;
+  float:left;
+  background: url('/images/CaseStudy_box_banner3.jpg');
+  background-size:100% auto;
+}
+
+.banner4 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:5%;
+  padding-bottom:5%;
+  font-size:21px;
+  letter-spacing:0.03em;
+  line-height:32px;
+  float:left;
+  background: url('/images/CaseStudy_box_banner4.jpg');
+  background-size:100% auto;
+}
+
+.banner5 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:3%;
+  padding-bottom:3%;
+  font-size:21px;
+  letter-spacing:0.03em;
+  line-height:32px;
+  float:left;
+  background-size:100% auto;
+  background-color:#666666;
+  background-repeat:no-repeat;
+}
+
+.banner2text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:60%;
+  padding-left:19%;
+  float:left;
+  text-align:center;
+}
+
+.banner3text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:55%;
+  padding-left:21%;
+  text-align:center;
+}
+
+.banner4text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:55%;
+  padding-left:21%;
+  text-align:center;
+}
+
+.banner5text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:60%;
+  padding-left:19%;
+  float:left;
+  text-align:center;
+}
+
+
+h2 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  font-size:24px;
+  line-height:34px;
+  color:#3366ff;
+}
+
+.quote {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  font-size:22px;
+  line-height:32px;
+  color:#3366ff;
+}
+
+.details {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  font-size:18px;
+  color:#3366ff;
+  letter-spacing:0.03em;
+  padding-bottom:1.5%;
+  padding-top:2%;
+  padding-left:10%;
+}
+
+
+
+hr {
+  border-bottom:0px solid;
+  width:100%;
+  opacity:0.5;
+  color:#aaaaaa;
+  height:1px;
+}
+
+.col1 {
+
+width: 38%;
+padding-left:5%;
+padding-right:8%;
+float:left;
+font-family:"Roboto", sans-serif;
+font-weight:100;
+color:#606060;
+line-height:20px;
+  letter-spacing:0.03em;
+font-size:14px;
+
+}
+
+.col2 {
+
+width: 44%;
+font-family:"Roboto", sans-serif;
+font-weight:300;
+float:left;
+line-height:20px;
+color:#606060;
+  letter-spacing:0.03em;
+font-size:14px;
+
+}
+
+
+
+.fullcol {
+  width:77%;
+  margin-left:11%;
+  margin-right:10%;
+  margin-top:4%;
+  margin-bottom:6%;
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  float:left;
+  line-height:22px;
+  color:#606060;
+  letter-spacing:0.03em;
+  font-size:14px;
+}
+
+.cols {
+  width:77%;
+  margin-left:6%;
+  margin-top:1%;
+  margin-bottom:4%;
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  float:left;
+
+}
+
+h4 {
+  font-family:"Roboto", sans-serif;
+  font-weight:400;
+  letter-spacing:0.9;
+  font-size:20px;
+  padding-bottom:0px;
+}
+
+
+@media screen and (max-width: 910px){
+
+h1 {
+  font-family:"Roboto", sans-serif;
+  font-weight:bold;
+  line-height:36px;
+  letter-spacing:0.03em;
+  font-size:30px !important;
+  padding-bottom:0px;
+  width:80%;
+}
+
+.subhead {
+  font-size:18px;
+  font-weight:100;
+  line-height:27px;
+}
+
+.details {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  font-size:16px;
+  color:#3366ff;
+  letter-spacing:0.03em;
+  padding-bottom:2%;
+  line-height:28px;
+  padding-top:4%;
+  padding-left:10%;
+}
+
+.logo {
+    width:8%;
+}
+
+.col1 {
+  width: 100%;
+  padding-left:5%;
+  padding-right:8%;
+  float:left;
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#606060;
+  line-height:20px;
+  letter-spacing:0.03em;
+  font-size:14px;
+}
+
+.col2 {
+  width: 100%;
+  padding-left:5%;
+  padding-top:5%;
+  padding-bottom:5%;
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  float:left;
+  line-height:20px;
+  color:#606060;
+  letter-spacing:0.03em;
+  font-size:14px;
+}
+
+.banner1 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:15%;
+  padding-bottom:2%;
+  padding-left:10%;
+  font-size:18px;
+  background: url('/images/CaseStudy_box_banner1.jpg');
+  background-size:100% auto;
+}
+
+.banner2 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:4%;
+  padding-bottom:4%;
+  padding-left:0%;
+  font-size:18px;
+  letter-spacing:0.03em;
+  line-height:24px;
+  width:100%;
+  float:left;
+  background:none;
+  background-color:#666666;
+}
+
+.banner3 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:5%;
+  padding-bottom:5%;
+  font-size:18px;
+  letter-spacing:0.03em;
+  line-height:24px;
+  width:100%;
+  float:left;
+  background: url('/images/CaseStudy_box_banner3.jpg');
+}
+
+.banner4 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:5%;
+  padding-bottom:5%;
+  font-size:18px;
+  letter-spacing:0.03em;
+  line-height:24px;
+  width:100%;
+  float:left;
+  background: url('/images/CaseStudy_box_banner4.jpg');
+}
+
+.banner5 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:4%;
+  padding-bottom:4%;
+  padding-left:0%;
+  font-size:18px;
+  letter-spacing:0.03em;
+  line-height:24px;
+  width:100%;
+  float:left;
+  background:none;
+  background-color:#666666;
+}
+
+.banner2text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:80%;
+  padding-left:10%;
+  float:left;
+  text-align:center;
+  color:#ffffff;
+}
+
+.banner4text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:80%;
+  padding-left:10%;
+  text-align:center;
+}
+
+.banner3text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:80%;
+  padding-left:10%;
+  text-align:center;
+}
+
+.banner5text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:80%;
+  padding-left:10%;
+  float:left;
+  text-align:center;
+  color:#ffffff;
+}
+
+.fullcol {
+  margin-top:6%;
+}
+
+h2 {
+  line-height:26px;
+  font-size:18px;
+}
+
+.quote {
+  font-size:18px;
+  line-height:24px;
+}
+
+.logo {
+  width:15%;
+}
+
+@media screen and (max-width: 480px){
+
+  .logo {
+    width:22%;
+    padding-bottom:2%;
+  }
+}
@@ -0,0 +1,459 @@
+
+.golfnow {
+  width:100%;
+}
+
+p {
+  font-family:"Roboto", sans-serif;
+  padding:5%;
+}
+
+a {
+  text-decoration:none;
+  color:#3366ff;
+}
+
+body {
+  margin:0;
+  background-color:#ffffff !important;
+
+}
+
+footer {
+background-color:#ffffff !important;  
+}
+
+h1 {
+  font-family:"Roboto", sans-serif;
+  font-weight:bold;
+  letter-spacing:0.025em;
+  font-size:42px;
+  padding-bottom:0px;
+}
+
+.subhead {
+  font-size:26px;
+  font-weight:100;
+  line-height:40px;
+  padding-bottom:1%;
+
+}
+
+.banner1 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:12%;
+  padding-bottom:0.5%;
+  padding-left:9.9%;
+  font-size:32px;
+  background: url('/images/CaseStudy_golfnow_banner1.jpg');
+  background-size:100% auto;
+  background-repeat:no-repeat;
+}
+
+.banner2 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:3%;
+  padding-bottom:3%;
+  font-size:21px;
+  letter-spacing:0.03em;
+  line-height:32px;
+  float:left;
+  background-size:100% auto;
+  background-color:#666666;
+  background-repeat:no-repeat;
+
+}
+
+.banner3 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-left:5%;
+  padding-right:5%;
+  padding-top:6%;
+  padding-bottom:6%;
+  font-size:21px;
+  letter-spacing:0.03em;
+  line-height:32px;
+  float:left;
+  background: url('/images/CaseStudy_golfnow_banner3.jpg');
+  background-size:100% auto;
+}
+
+.banner4 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:5%;
+  padding-bottom:5%;
+  font-size:21px;
+  letter-spacing:0.03em;
+  line-height:32px;
+  float:left;
+  background: url('/images/CaseStudy_golfnow_banner4.jpg');
+  background-size:100% auto;
+}
+
+.banner5 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:3%;
+  padding-bottom:3%;
+  font-size:21px;
+  letter-spacing:0.03em;
+  line-height:32px;
+  float:left;
+  background-size:100% auto;
+  background-color:#666666;
+  background-repeat:no-repeat;
+}
+
+.banner2text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:60%;
+  padding-left:19%;
+  float:left;
+  text-align:center;
+}
+
+.banner3text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:70%;
+  padding-left:15%;
+  text-align:center;
+}
+
+.banner4text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:55%;
+  padding-left:21%;
+  text-align:center;
+}
+
+.banner5text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:60%;
+  padding-left:19%;
+  float:left;
+  text-align:center;
+}
+
+
+h2 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  font-size:24px;
+  line-height:34px;
+  color:#3366ff;
+}
+
+.quote {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  font-size:22px;
+  line-height:32px;
+  color:#3366ff;
+}
+
+.details {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  font-size:18px;
+  color:#3366ff;
+  letter-spacing:0.03em;
+  padding-bottom:1.5%;
+  padding-top:2%;
+  padding-left:10%;
+}
+
+
+
+hr {
+  border-bottom:0px solid;
+  width:100%;
+  opacity:0.5;
+  color:#aaaaaa;
+  height:1px;
+}
+
+.col1 {
+
+width: 38%;
+padding-left:5%;
+padding-right:8%;
+float:left;
+font-family:"Roboto", sans-serif;
+font-weight:100;
+color:#606060;
+line-height:20px;
+  letter-spacing:0.03em;
+font-size:14px;
+
+}
+
+.col2 {
+
+width: 44%;
+font-family:"Roboto", sans-serif;
+font-weight:300;
+float:left;
+line-height:20px;
+color:#606060;
+  letter-spacing:0.03em;
+font-size:14px;
+
+}
+
+
+
+.fullcol {
+  width:77%;
+  margin-left:11%;
+  margin-right:10%;
+  margin-top:4%;
+  margin-bottom:6%;
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  float:left;
+  line-height:22px;
+  color:#606060;
+  letter-spacing:0.03em;
+  font-size:14px;
+}
+
+.cols {
+  width:77%;
+  margin-left:6%;
+  margin-top:1%;
+  margin-bottom:4%;
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  float:left;
+
+}
+
+h4 {
+  font-family:"Roboto", sans-serif;
+  font-weight:400;
+  letter-spacing:0.9;
+  font-size:20px;
+  padding-bottom:0px;
+}
+
+
+@media screen and (max-width: 910px){
+
+h1 {
+  font-family:"Roboto", sans-serif;
+  font-weight:bold;
+  line-height:36px;
+  letter-spacing:0.03em;
+  font-size:30px !important;
+  padding-bottom:0px;
+  width:80%;
+}
+
+.subhead {
+  font-size:18px;
+  font-weight:100;
+  line-height:27px;
+}
+
+.details {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  font-size:16px;
+  color:#3366ff;
+  letter-spacing:0.03em;
+  padding-bottom:2%;
+  line-height:28px;
+  padding-top:4%;
+  padding-left:10%;
+}
+
+.logo {
+    width:8%;
+}
+
+.col1 {
+  width: 100%;
+  padding-left:5%;
+  padding-right:8%;
+  float:left;
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#606060;
+  line-height:20px;
+  letter-spacing:0.03em;
+  font-size:14px;
+}
+
+.col2 {
+  width: 100%;
+  padding-left:5%;
+  padding-top:5%;
+  padding-bottom:5%;
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  float:left;
+  line-height:20px;
+  color:#606060;
+  letter-spacing:0.03em;
+  font-size:14px;
+}
+
+.banner1 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:15%;
+  padding-bottom:2%;
+  padding-left:10%;
+  font-size:18px;
+  background: url('/images/CaseStudy_golfnow_banner1.jpg');
+  background-size:100% auto;
+}
+
+.banner2 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:4%;
+  padding-bottom:4%;
+  padding-left:0%;
+  font-size:18px;
+  letter-spacing:0.03em;
+  line-height:24px;
+  width:100%;
+  float:left;
+  background:none;
+  background-color:#666666;
+}
+
+.banner3 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:5%;
+  padding-bottom:5%;
+  font-size:18px;
+  letter-spacing:0.03em;
+  line-height:24px;
+  width:80%;
+  padding-left:15%;
+  padding-right:10%;
+  float:left;
+  background: url('/images/CaseStudy_golfnow_banner3.jpg');
+}
+
+.banner4 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:5%;
+  padding-bottom:5%;
+  font-size:18px;
+  letter-spacing:0.03em;
+  line-height:24px;
+  width:100%;
+  float:left;
+  background: url('/images/CaseStudy_golfnow_banner4.jpg');
+}
+
+.banner5 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:4%;
+  padding-bottom:4%;
+  padding-left:0%;
+  font-size:18px;
+  letter-spacing:0.03em;
+  line-height:24px;
+  width:100%;
+  float:left;
+  background:none;
+  background-color:#666666;
+}
+
+.banner2text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:80%;
+  padding-left:10%;
+  float:left;
+  text-align:center;
+  color:#ffffff;
+}
+
+.banner3text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:80%;
+  padding-left:2%;
+  padding-right:10%;
+  padding-top:5%;
+  padding-bottom:5%;
+  text-align:center;
+}
+
+.banner4text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:80%;
+  padding-left:10%;
+  text-align:center;
+}
+
+.banner5text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:80%;
+  padding-left:10%;
+  float:left;
+  text-align:center;
+  color:#ffffff;
+}
+
+.fullcol {
+  margin-top:6%;
+}
+
+h2 {
+  line-height:26px;
+  font-size:18px;
+}
+
+.quote {
+  font-size:18px;
+  line-height:24px;
+}
+
+.logo {
+  width:35%;
+}
+
+@media screen and (max-width: 480px){
+
+  .logo {
+    width:50%;
+    padding-bottom:5%;
+  }
+}
@@ -0,0 +1,452 @@
+#caseStudyTitle {
+    margin-top: 1em !important;
+    font-family:"Roboto", sans-serif;
+}
+
+p {
+  font-family:"Roboto", sans-serif;
+  padding:5%;
+}
+
+a {
+  text-decoration:none;
+  color:#3366ff;
+}
+
+body {
+  margin:0;
+
+}
+
+h1 {
+  font-family:"Roboto", sans-serif;
+  font-weight:bold;
+  letter-spacing:0.025em;
+  font-size:42px;
+  padding-bottom:0px;
+}
+
+.subhead {
+  font-size:26px;
+  font-weight:100;
+  line-height:40px;
+  padding-bottom:1%;
+
+}
+
+.banner1 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:12%;
+  padding-bottom:0.5%;
+  padding-left:9.9%;
+  font-size:32px;
+  background: url('/images/CaseStudy_wink_banner1.jpg');
+  background-size:100% auto;
+  background-repeat:no-repeat;
+}
+
+.banner2 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:3%;
+  padding-bottom:3%;
+  font-size:19px;
+  letter-spacing:0.03em;
+  line-height:28px;
+  float:left;
+  background-size:100% auto;
+  background-color:#666666;
+  background-repeat:no-repeat;
+
+}
+
+.banner3 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-left:5%;
+  padding-right:5%;
+  padding-top:6%;
+  padding-bottom:6%;
+  font-size:21px;
+  letter-spacing:0.03em;
+  line-height:32px;
+  float:left;
+  background: url('/images/CaseStudy_wink_banner3.jpg');
+  background-size:100% auto;
+}
+
+.banner4 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:5%;
+  padding-bottom:5%;
+  font-size:21px;
+  letter-spacing:0.03em;
+  line-height:32px;
+  float:left;
+  background: url('/images/CaseStudy_wink_banner4.jpg');
+  background-size:100% auto;
+}
+
+.banner5 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:3%;
+  padding-bottom:3%;
+  font-size:21px;
+  letter-spacing:0.03em;
+  line-height:32px;
+  float:left;
+  background-size:100% auto;
+  background-color:#666666;
+  background-repeat:no-repeat;
+}
+
+.banner2text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:62%;
+  padding-left:18%;
+  float:left;
+  text-align:center;
+}
+
+.banner3text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:70%;
+  padding-left:15%;
+  text-align:center;
+}
+
+.banner4text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:60%;
+  padding-left:20%;
+  text-align:center;
+}
+
+.banner5text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:65%;
+  padding-left:16%;
+  float:left;
+  text-align:center;
+}
+
+
+h2 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  font-size:24px;
+  line-height:34px;
+  color:#3366ff;
+}
+
+.quote {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  font-size:22px;
+  line-height:32px;
+  color:#3366ff;
+}
+
+.details {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  font-size:18px;
+  color:#3366ff;
+  letter-spacing:0.03em;
+  padding-bottom:1.5%;
+  padding-top:2%;
+  padding-left:10%;
+}
+
+
+
+hr {
+  border-bottom:0px solid;
+  width:100%;
+  opacity:0.5;
+  color:#aaaaaa;
+  height:1px;
+}
+
+.col1 {
+
+width: 38%;
+padding-left:5%;
+padding-right:8%;
+float:left;
+font-family:"Roboto", sans-serif;
+font-weight:100;
+color:#606060;
+line-height:20px;
+  letter-spacing:0.03em;
+font-size:14px;
+
+}
+
+.col2 {
+
+width: 44%;
+font-family:"Roboto", sans-serif;
+font-weight:300;
+float:left;
+line-height:20px;
+color:#606060;
+letter-spacing:0.03em;
+font-size:14px;
+
+}
+
+.fullcol {
+  width:77%;
+  margin-left:11%;
+  margin-right:10%;
+  margin-top:4%;
+  margin-bottom:6%;
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  float:left;
+  line-height:22px;
+  color:#606060;
+  letter-spacing:0.03em;
+  font-size:14px;
+}
+
+.cols {
+  width:77%;
+  margin-left:6.2%;
+  margin-top:1%;
+  margin-bottom:4%;
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  float:left;
+
+}
+
+h4 {
+  font-family:"Roboto", sans-serif;
+  font-weight:400;
+  letter-spacing:0.9;
+  font-size:20px;
+  padding-bottom:0px;
+}
+
+
+@media screen and (max-width: 910px){
+
+h1 {
+  font-family:"Roboto", sans-serif;
+  font-weight:bold;
+  line-height:36px;
+  letter-spacing:0.03em;
+  font-size:30px !important;
+  padding-bottom:0px;
+  width:80%;
+}
+
+.subhead {
+  font-size:18px;
+  font-weight:100;
+  line-height:27px;
+}
+
+.details {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  font-size:16px;
+  color:#3366ff;
+  letter-spacing:0.03em;
+  padding-bottom:2%;
+  line-height:28px;
+  padding-top:4%;
+  padding-left:10%;
+}
+
+.logo {
+    width:8%;
+}
+
+.col1 {
+  width: 100%;
+  padding-left:5%;
+  padding-right:8%;
+  float:left;
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#606060;
+  line-height:20px;
+  letter-spacing:0.03em;
+  font-size:14px;
+}
+
+.col2 {
+  width: 100%;
+  padding-left:5%;
+  padding-top:5%;
+  padding-bottom:5%;
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  float:left;
+  line-height:20px;
+  color:#606060;
+  letter-spacing:0.03em;
+  font-size:14px;
+}
+
+.banner1 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:15%;
+  padding-bottom:2%;
+  padding-left:10%;
+  font-size:18px;
+  background: url('/images/CaseStudy_wink_banner1.jpg');
+  background-size:100% auto;
+}
+
+.banner2 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:4%;
+  padding-bottom:4%;
+  padding-left:0%;
+  font-size:18px;
+  letter-spacing:0.03em;
+  line-height:24px;
+  width:100%;
+  float:left;
+  background:none;
+  background-color:#666666;
+}
+
+.banner3 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:5%;
+  padding-bottom:5%;
+  font-size:18px;
+  letter-spacing:0.03em;
+  line-height:24px;
+  width:80%;
+  padding-left:15%;
+  padding-right:10%;
+  float:left;
+  background: url('/images/CaseStudy_wink_banner3.jpg');
+}
+
+.banner4 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:5%;
+  padding-bottom:5%;
+  font-size:18px;
+  letter-spacing:0.03em;
+  line-height:24px;
+  width:100%;
+  float:left;
+  background: url('/images/CaseStudy_wink_banner4.jpg');
+}
+
+.banner5 {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  padding-top:4%;
+  padding-bottom:4%;
+  padding-left:0%;
+  font-size:18px;
+  letter-spacing:0.03em;
+  line-height:24px;
+  width:100%;
+  float:left;
+  background:none;
+  background-color:#666666;
+}
+
+.banner2text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:80%;
+  padding-left:10%;
+  float:left;
+  text-align:center;
+  color:#ffffff;
+}
+
+.banner3text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:80%;
+  padding-left:2%;
+  padding-right:10%;
+  padding-top:5%;
+  padding-bottom:5%;
+  text-align:center;
+}
+
+.banner4text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:80%;
+  padding-left:10%;
+  text-align:center;
+}
+
+.banner5text {
+  font-family:"Roboto", sans-serif;
+  font-weight:300;
+  color:#ffffff;
+  width:80%;
+  padding-left:10%;
+  float:left;
+  text-align:center;
+  color:#ffffff;
+}
+
+.fullcol {
+  margin-top:6%;
+}
+
+h2 {
+  line-height:26px;
+  font-size:18px;
+}
+
+.quote {
+  font-size:18px;
+  line-height:24px;
+}
+
+.logo {
+  width:35%;
+}
+
+@media screen and (max-width: 480px){
+
+  .logo {
+    width:50%;
+    padding-bottom:5%;
+  }
+}
@@ -277,7 +277,7 @@ solution for authentication.  It does offer a few challenges:

 1.  Kubernetes has no "web interface" to trigger the authentication process.  There is no browser or interface to collect credentials which is why you need to authenticate to your identity provider first.
 2.  The `id_token` can't be revoked, its like a certificate so it should be short-lived (only a few minutes) so it can be very annoying to have to get a new token every few minutes
-3.  There's no easy way to authenticate to the Kubernetes dashboard without using the `kubectl -proxy` command or a reverse proxy that injects the `id_token`
+3.  There's no easy way to authenticate to the Kubernetes dashboard without using the `kubectl proxy` command or a reverse proxy that injects the `id_token`


 #### Configuring the API Server
@@ -30,7 +30,7 @@ Kubernetes reviews only the following API request attributes:
 * **group** - The list of group names to which the authenticated user belongs
 * **"extra"** - A map of arbitrary string keys to string values, provided by the authentication layer
 * **API** - Indicates whether the request is for an API resource
- * **Request path** - Path to miscellaneous non-resource endpoints like `/api` or `/healthz` (see [kubectl](#kubectl)).
+ * **Request path** - Path to miscellaneous non-resource endpoints like `/api` or `/healthz`.
 * **API request verb** - API verbs `get`, `list`, `create`, `update`, `patch`, `watch`, `proxy`, `redirect`, `delete`, and `deletecollection` are used for resource requests. To determine the request verb for a resource API endpoint, see **Determine the request verb** below.
 * **HTTP request verb** - HTTP verbs `get`, `post`, `put`, and `delete` are used for non-resource requests
 * **Resource** - The ID or name of the resource that is being accessed (for resource requests only)
@@ -81,7 +81,7 @@ Note that these master node sizes are currently only set at cluster startup time

 To prevent memory leaks or other resource issues in [cluster addons](https://releases.k8s.io/{{page.githubbranch}}/cluster/addons) from consuming all the resources available on a node, Kubernetes sets resource limits on addon containers to limit the CPU and Memory resources they can consume (See PR [#10653](http://pr.k8s.io/10653/files) and [#10778](http://pr.k8s.io/10778/files)).

-For [example](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml):
+For example:

 ```yaml
  containers:
@@ -94,7 +94,7 @@ you need to:
 ### Deploy an initializer controller

 You should deploy an initializer controller via the [deployment
-API](/docs/api-reference/v1.6/#deployment-v1beta1-apps).
+API](/docs/api-reference/{{page.version}}/#deployment-v1beta1-apps).

 ### Configure initializers on the fly

@@ -112,19 +112,18 @@ apiVersion: admissionregistration.k8s.io/v1alpha1
 kind: InitializerConfiguration
 metadata:
  name: example-config
-spec:
-  initializers:
-    # the name needs to be fully qualified, i.e., containing at least two "."
-    - name: podimage.example.com
-      rules:
-        # apiGroups, apiVersion, resources all support wildcard "*".
-        # "*" cannot be mixed with non-wildcard.
-        - apiGroups:
-            - ""
-          apiVersions:
-            - v1
-          resources:
-            - pods
+initializers:
+  # the name needs to be fully qualified, i.e., containing at least two "."
+  - name: podimage.example.com
+    rules:
+      # apiGroups, apiVersion, resources all support wildcard "*".
+      # "*" cannot be mixed with non-wildcard.
+      - apiGroups:
+          - ""
+        apiVersions:
+          - v1
+        resources:
+          - pods
 ```

 Make sure that all expansions of the `<apiGroup, apiVersions, resources>` tuple
@@ -217,9 +216,9 @@ See [caesarxuchao/example-webhook-admission-controller deployment](https://githu
 for an example deployment.

 The webhook admission controller should be deployed via the
-[deployment API](/docs/api-reference/v1.6/#deployment-v1beta1-apps).
+[deployment API](/docs/api-reference/{{page.version}}/#deployment-v1beta1-apps).
 You also need to create a
-[service](/docs/api-reference/v1.6/#service-v1-core) as the
+[service](/docs/api-reference/{{page.version}}/#service-v1-core) as the
 front-end of the deployment.

 ### Configure webhook admission controller on the fly
@@ -21,24 +21,27 @@ federation-apiserver
 ### Options

 ```
-      --admission-control string                                Ordered list of plug-ins to do admission control of resources into cluster. Comma-delimited list of: AlwaysAdmit, AlwaysDeny, NamespaceLifecycle, OwnerReferencesPermissionEnforcement. (default "AlwaysAdmit")
+      --admission-control stringSlice                           Ordered list of plug-ins to do admission control of resources into cluster. Comma-delimited list of: NamespaceLifecycle. (default [AlwaysAdmit])
      --admission-control-config-file string                    File with admission control configuration.
      --advertise-address ip                                    The IP address on which to advertise the apiserver to members of the cluster. This address must be reachable by the rest of the cluster. If blank, the --bind-address will be used. If --bind-address is unspecified, the host's default interface will be used.
      --anonymous-auth                                          Enables anonymous requests to the secure port of the API server. Requests that are not rejected by another authentication method are treated as anonymous requests. Anonymous requests have a username of system:anonymous, and a group name of system:unauthenticated. (default true)
      --audit-log-maxage int                                    The maximum number of days to retain old audit log files based on the timestamp encoded in their filename.
      --audit-log-maxbackup int                                 The maximum number of old audit log files to retain.
-      --audit-log-maxsize int                                   The maximum size in megabytes of the audit log file before it gets rotated. Defaults to 100MB.
-      --audit-log-path string                                   If set, all requests coming to the apiserver will be logged to this file.
-      --authentication-token-webhook-cache-ttl duration         The duration to cache responses from the webhook token authenticator. Default is 2m. (default 2m0s)
+      --audit-log-maxsize int                                   The maximum size in megabytes of the audit log file before it gets rotated.
+      --audit-log-path string                                   If set, all requests coming to the apiserver will be logged to this file.  '-' means standard out.
+      --audit-policy-file string                                Path to the file that defines the audit policy configuration. Requires the 'AdvancedAuditing' feature gate. With AdvancedAuditing, a profile is required to enable auditing.
+      --audit-webhook-config-file string                        Path to a kubeconfig formatted file that defines the audit webhook configuration. Requires the 'AdvancedAuditing' feature gate.
+      --audit-webhook-mode string                               Strategy for sending audit events. Blocking indicates sending events should block server responses. Batch causes the webhook to buffer and send events asynchronously. Known modes are batch,blocking. (default "batch")
+      --authentication-token-webhook-cache-ttl duration         The duration to cache responses from the webhook token authenticator. (default 2m0s)
      --authentication-token-webhook-config-file string         File with webhook configuration for token authentication in kubeconfig format. The API server will query the remote service to determine authentication for bearer tokens.
-      --authorization-mode string                               Ordered list of plug-ins to do authorization on secure port. Comma-delimited list of: AlwaysAllow,AlwaysDeny,ABAC,Webhook,RBAC. (default "AlwaysAllow")
+      --authorization-mode string                               Ordered list of plug-ins to do authorization on secure port. Comma-delimited list of: AlwaysAllow,AlwaysDeny,ABAC,Webhook,RBAC,Node. (default "AlwaysAllow")
      --authorization-policy-file string                        File with authorization policy in csv format, used with --authorization-mode=ABAC, on the secure port.
-      --authorization-webhook-cache-authorized-ttl duration     The duration to cache 'authorized' responses from the webhook authorizer. Default is 5m. (default 5m0s)
-      --authorization-webhook-cache-unauthorized-ttl duration   The duration to cache 'unauthorized' responses from the webhook authorizer. Default is 30s. (default 30s)
+      --authorization-webhook-cache-authorized-ttl duration     The duration to cache 'authorized' responses from the webhook authorizer. (default 5m0s)
+      --authorization-webhook-cache-unauthorized-ttl duration   The duration to cache 'unauthorized' responses from the webhook authorizer. (default 30s)
      --authorization-webhook-config-file string                File with webhook configuration in kubeconfig format, used with --authorization-mode=Webhook. The API server will query the remote service to determine access on the API server's secure port.
      --basic-auth-file string                                  If set, the file that will be used to admit requests to the secure port of the API server via http basic authentication.
      --bind-address ip                                         The IP address on which to listen for the --secure-port port. The associated interface(s) must be reachable by the rest of the cluster, and by CLI/web clients. If blank, all interfaces will be used (0.0.0.0). (default 0.0.0.0)
-      --cert-dir string                                         The directory where the TLS certs are located (by default /var/run/kubernetes). If --tls-cert-file and --tls-private-key-file are provided, this flag will be ignored. (default "/var/run/kubernetes")
+      --cert-dir string                                         The directory where the TLS certs are located. If --tls-cert-file and --tls-private-key-file are provided, this flag will be ignored. (default "/var/run/kubernetes")
      --client-ca-file string                                   If set, any request presenting a client certificate signed by one of the authorities in the client-ca-file is authenticated with an identity corresponding to the CommonName of the client certificate.
      --cloud-config string                                     The path to the cloud provider configuration file. Empty string for no configuration file.
      --cloud-provider string                                   The provider for cloud services. Empty string for no provider.
@@ -55,26 +58,32 @@ federation-apiserver
      --etcd-quorum-read                                        If true, enable quorum read.
      --etcd-servers stringSlice                                List of etcd servers to connect with (scheme://ip:port), comma separated.
      --etcd-servers-overrides stringSlice                      Per-resource etcd servers overrides, comma separated. The individual override format: group/resource#servers, where servers are http://ip:port, semicolon separated.
-      --event-ttl duration                                      Amount of time to retain events. Default is 1h. (default 1h0m0s)
+      --event-ttl duration                                      Amount of time to retain events. (default 1h0m0s)
      --experimental-bootstrap-token-auth                       Enable to allow secrets of type 'bootstrap.kubernetes.io/token' in the 'kube-system' namespace to be used for TLS bootstrapping authentication.
+      --experimental-encryption-provider-config string          The file containing configuration for encryption providers to be used for storing secrets in etcd
      --experimental-keystone-ca-file string                    If set, the Keystone server's certificate will be verified by one of the authorities in the experimental-keystone-ca-file, otherwise the host's root CA set will be used.
      --experimental-keystone-url string                        If passed, activates the keystone authentication plugin.
      --external-hostname string                                The hostname to use when generating externalized URLs for this master (e.g. Swagger API Docs).
      --feature-gates mapStringBool                             A set of key=value pairs that describe feature gates for alpha/experimental features. Options are:
 Accelerators=true|false (ALPHA - default=false)
+AdvancedAuditing=true|false (ALPHA - default=false)
 AffinityInAnnotations=true|false (ALPHA - default=false)
 AllAlpha=true|false (ALPHA - default=false)
-AllowExtTrafficLocalEndpoints=true|false (BETA - default=true)
+AllowExtTrafficLocalEndpoints=true|false (default=true)
 AppArmor=true|false (BETA - default=true)
 DynamicKubeletConfig=true|false (ALPHA - default=false)
 DynamicVolumeProvisioning=true|false (ALPHA - default=true)
 ExperimentalCriticalPodAnnotation=true|false (ALPHA - default=false)
 ExperimentalHostUserNamespaceDefaulting=true|false (BETA - default=false)
+LocalStorageCapacityIsolation=true|false (ALPHA - default=false)
+PersistentLocalVolumes=true|false (ALPHA - default=false)
+RotateKubeletClientCertificate=true|false (ALPHA - default=false)
+RotateKubeletServerCertificate=true|false (ALPHA - default=false)
 StreamingProxyRedirects=true|false (BETA - default=true)
 TaintBasedEvictions=true|false (ALPHA - default=false)
      --insecure-allow-any-token username/group1,group2         If set, your server will be INSECURE.  Any token will be allowed and user information will be parsed from the token as username/group1,group2
-      --insecure-bind-address ip                                The IP address on which to serve the --insecure-port (set to 0.0.0.0 for all interfaces). Defaults to localhost. (default 127.0.0.1)
-      --insecure-port int                                       The port on which to serve unsecured, unauthenticated access. Default 8080. It is assumed that firewall rules are set up such that this port is not reachable from outside of the cluster and that port 443 on the cluster's public address is proxied to this port. This is performed by nginx in the default setup. (default 8080)
+      --insecure-bind-address ip                                The IP address on which to serve the --insecure-port (set to 0.0.0.0 for all interfaces). (default 127.0.0.1)
+      --insecure-port int                                       The port on which to serve unsecured, unauthenticated access. It is assumed that firewall rules are set up such that this port is not reachable from outside of the cluster and that port 443 on the cluster's public address is proxied to this port. This is performed by nginx in the default setup. (default 8080)
      --master-service-namespace string                         DEPRECATED: the namespace from which the kubernetes master services should be injected into pods. (default "default")
      --max-mutating-requests-inflight int                      The maximum number of mutating requests in flight at a given time. When the server exceeds this, it rejects requests. Zero for no limit. (default 200)
      --max-requests-inflight int                               The maximum number of non-mutating requests in flight at a given time. When the server exceeds this, it rejects requests. Zero for no limit. (default 400)
@@ -93,18 +102,18 @@ TaintBasedEvictions=true|false (ALPHA - default=false)
      --runtime-config mapStringString                          A set of key=value pairs that describe runtime configuration that may be passed to apiserver. apis/<groupVersion> key can be used to turn on/off specific api versions. apis/<groupVersion>/<resource> can be used to turn on/off specific resources. api/all and api/legacy are special keys to control all and legacy api versions respectively.
      --secure-port int                                         The port on which to serve HTTPS with authentication and authorization. If 0, don't serve HTTPS at all. (default 6443)
      --service-account-key-file stringArray                    File containing PEM-encoded x509 RSA or ECDSA private or public keys, used to verify ServiceAccount tokens. If unspecified, --tls-private-key-file is used. The specified file can contain multiple keys, and the flag can be specified multiple times with different files.
-      --service-account-lookup                                  If true, validate ServiceAccount tokens exist in etcd as part of authentication.
+      --service-account-lookup                                  If true, validate ServiceAccount tokens exist in etcd as part of authentication. (default true)
      --storage-backend string                                  The storage backend for persistence. Options: 'etcd3' (default), 'etcd2'.
      --storage-media-type string                               The media type to use to store objects in storage. Some resources or storage backends may only support a specific media type and will ignore this setting. (default "application/vnd.kubernetes.protobuf")
-      --storage-versions string                                 The per-group version to store resources in. Specified in the format "group1/version1,group2/version2,...". In the case where objects are moved from one group to the other, you may specify the format "group1=group2/v1beta1,group3/v1beta1,...". You only need to pass the groups you wish to change from the defaults. It defaults to a list of preferred versions of all registered groups, which is derived from the KUBE_API_VERSIONS environment variable. (default "apps/v1beta1,authentication.k8s.io/v1,authorization.k8s.io/v1,autoscaling/v1,batch/v1,certificates.k8s.io/v1beta1,componentconfig/v1alpha1,extensions/v1beta1,federation/v1beta1,policy/v1beta1,rbac.authorization.k8s.io/v1beta1,settings.k8s.io/v1alpha1,storage.k8s.io/v1beta1,v1")
+      --storage-versions string                                 The per-group version to store resources in. Specified in the format "group1/version1,group2/version2,...". In the case where objects are moved from one group to the other, you may specify the format "group1=group2/v1beta1,group3/v1beta1,...". You only need to pass the groups you wish to change from the defaults. It defaults to a list of preferred versions of all registered groups, which is derived from the KUBE_API_VERSIONS environment variable. (default "admissionregistration.k8s.io/v1alpha1,apps/v1beta1,authentication.k8s.io/v1,authorization.k8s.io/v1,autoscaling/v1,batch/v1,certificates.k8s.io/v1beta1,componentconfig/v1alpha1,extensions/v1beta1,federation/v1beta1,networking.k8s.io/v1,policy/v1beta1,rbac.authorization.k8s.io/v1beta1,settings.k8s.io/v1alpha1,storage.k8s.io/v1,v1")
      --target-ram-mb int                                       Memory limit for apiserver in MB (used to configure sizes of caches, etc.)
      --tls-ca-file string                                      If set, this certificate authority will used for secure access from Admission Controllers. This must be a valid PEM-encoded CA bundle. Altneratively, the certificate authority can be appended to the certificate provided by --tls-cert-file.
      --tls-cert-file string                                    File containing the default x509 Certificate for HTTPS. (CA cert, if any, concatenated after server cert). If HTTPS serving is enabled, and --tls-cert-file and --tls-private-key-file are not provided, a self-signed certificate and key are generated for the public address and saved to /var/run/kubernetes.
      --tls-private-key-file string                             File containing the default x509 private key matching --tls-cert-file.
-      --tls-sni-cert-key namedCertKey                           A pair of x509 certificate and private key file paths, optionally suffixed with a list of domain patterns which are fully qualified domain names, possibly with prefixed wildcard segments. If no domain patterns are provided, the names of the certificate are extracted. Non-wildcard matches trump over wildcard matches, explicit domain patterns trump over extracted names. For multiple key/certificate pairs, use the --tls-sni-cert-key multiple times. Examples: "example.key,example.crt" or "*.foo.com,foo.com:foo.key,foo.crt". (default [])
+      --tls-sni-cert-key namedCertKey                           A pair of x509 certificate and private key file paths, optionally suffixed with a list of domain patterns which are fully qualified domain names, possibly with prefixed wildcard segments. If no domain patterns are provided, the names of the certificate are extracted. Non-wildcard matches trump over wildcard matches, explicit domain patterns trump over extracted names. For multiple key/certificate pairs, use the --tls-sni-cert-key multiple times. Examples: "example.crt,example.key" or "foo.crt,foo.key:*.foo.com,foo.com". (default [])
      --token-auth-file string                                  If set, the file that will be used to secure the secure port of the API server via token authentication.
      --watch-cache                                             Enable watch caching in the apiserver (default true)
      --watch-cache-sizes stringSlice                           List of watch cache sizes for every resource (pods, nodes, etc.), comma separated. The individual override format: resource#size, where size is a number. It takes effect when watch-cache is enabled.
 ```

-###### Auto generated by spf13/cobra on 21-Mar-2017
+###### Auto generated by spf13/cobra on 11-Jul-2017
@@ -40,6 +40,7 @@ federation-controller-manager
      --leader-elect                           Start a leader election client and gain leadership before executing the main loop. Enable this when running replicated components for high availability.
      --leader-elect-lease-duration duration   The duration that non-leader candidates will wait after observing a leadership renewal until attempting to acquire leadership of a led but unrenewed leader slot. This is effectively the maximum duration that a leader can be stopped before it is replaced by another candidate. This is only applicable if leader election is enabled. (default 15s)
      --leader-elect-renew-deadline duration   The interval between attempts by the acting master to renew a leadership slot before it stops leading. This must be less than or equal to the lease duration. This is only applicable if leader election is enabled. (default 10s)
+      --leader-elect-resource-lock endpoints   The type of resource resource object that is used for locking duringleader election. Supported options are endpoints (default) and `configmap`. (default "endpoints")
      --leader-elect-retry-period duration     The duration the clients should wait between attempting acquisition and renewal of a leadership. This is only applicable if leader election is enabled. (default 2s)
      --master string                          The address of the federation API server (overrides any value in kubeconfig)
      --port int                               The port that the controller-manager's http service runs on (default 10253)
@@ -49,4 +50,4 @@ federation-controller-manager
      --zone-name string                       Zone name, like example.com.
 ```

-###### Auto generated by spf13/cobra on 21-Mar-2017
+###### Auto generated by spf13/cobra on 11-Jul-2017
@@ -131,12 +131,12 @@ $ federation/deploy/deploy.sh deploy_federation
 This spins up the federation control components as pods managed by
 [`Deployments`](/docs/concepts/workloads/controllers/deployment/) on your
 existing Kubernetes cluster. It also starts a
-[`type: LoadBalancer`](http://kubernetes.io/docs/user-guide/services/#type-loadbalancer)
-[`Service`](http://kubernetes.io/docs/user-guide/services/) for the
+[`type: LoadBalancer`](/docs/concepts/services-networking/service/#type-loadbalancer)
+[`Service`](/docs/concepts/services-networking/service/) for the
 `federation-apiserver` and a
-[`PVC`](http://kubernetes.io/docs/user-guide/persistent-volumes/) backed
+[`PVC`](/docs/concepts/storage/persistent-volumes/) backed
 by a dynamically provisioned
-[`PV`](http://kubernetes.io/docs/user-guide/persistent-volumes/) for
+[`PV`](/docs/concepts/storage/persistent-volumes/) for
 `etcd`. All these components are created in the `federation` namespace.

 You can verify that the pods are available by running the following
@@ -247,7 +247,7 @@ federation, and
 in your federation DNS.

 You can find more details about config maps in general at
-[config map](http://kubernetes.io/docs/user-guide/configmap/).
+[config map](/docs/tasks/configure-pod-container/configmap/).

 ### Kubernetes 1.4 and earlier: Setting federations flag on kube-dns-rc

@@ -21,7 +21,7 @@ kube-apiserver
 ### Options

 ```
-      --admission-control string                                Ordered list of plug-ins to do admission control of resources into cluster. Comma-delimited list of: AlwaysAdmit, AlwaysDeny, AlwaysPullImages, DefaultStorageClass, DefaultTolerationSeconds, DenyEscalatingExec, DenyExecOnPrivileged, ImagePolicyWebhook, InitialResources, LimitPodHardAntiAffinityTopology, LimitRanger, NamespaceAutoProvision, NamespaceExists, NamespaceLifecycle, OwnerReferencesPermissionEnforcement, PersistentVolumeLabel, PodNodeSelector, PodPreset, PodSecurityPolicy, ResourceQuota, SecurityContextDeny, ServiceAccount. (default "AlwaysAdmit")
+      --admission-control stringSlice                           Ordered list of plug-ins to do admission control of resources into cluster. Comma-delimited list of: NamespaceLifecycle. (default [AlwaysAdmit])
      --admission-control-config-file string                    File with admission control configuration.
      --advertise-address ip                                    The IP address on which to advertise the apiserver to members of the cluster. This address must be reachable by the rest of the cluster. If blank, the --bind-address will be used. If --bind-address is unspecified, the host's default interface will be used.
      --allow-privileged                                        If true, allow privileged containers.
@@ -29,19 +29,22 @@ kube-apiserver
      --apiserver-count int                                     The number of apiservers running in the cluster, must be a positive number. (default 1)
      --audit-log-maxage int                                    The maximum number of days to retain old audit log files based on the timestamp encoded in their filename.
      --audit-log-maxbackup int                                 The maximum number of old audit log files to retain.
-      --audit-log-maxsize int                                   The maximum size in megabytes of the audit log file before it gets rotated. Defaults to 100MB.
-      --audit-log-path string                                   If set, all requests coming to the apiserver will be logged to this file.
-      --authentication-token-webhook-cache-ttl duration         The duration to cache responses from the webhook token authenticator. Default is 2m. (default 2m0s)
+      --audit-log-maxsize int                                   The maximum size in megabytes of the audit log file before it gets rotated.
+      --audit-log-path string                                   If set, all requests coming to the apiserver will be logged to this file.  '-' means standard out.
+      --audit-policy-file string                                Path to the file that defines the audit policy configuration. Requires the 'AdvancedAuditing' feature gate. With AdvancedAuditing, a profile is required to enable auditing.
+      --audit-webhook-config-file string                        Path to a kubeconfig formatted file that defines the audit webhook configuration. Requires the 'AdvancedAuditing' feature gate.
+      --audit-webhook-mode string                               Strategy for sending audit events. Blocking indicates sending events should block server responses. Batch causes the webhook to buffer and send events asynchronously. Known modes are batch,blocking. (default "batch")
+      --authentication-token-webhook-cache-ttl duration         The duration to cache responses from the webhook token authenticator. (default 2m0s)
      --authentication-token-webhook-config-file string         File with webhook configuration for token authentication in kubeconfig format. The API server will query the remote service to determine authentication for bearer tokens.
-      --authorization-mode string                               Ordered list of plug-ins to do authorization on secure port. Comma-delimited list of: AlwaysAllow,AlwaysDeny,ABAC,Webhook,RBAC. (default "AlwaysAllow")
+      --authorization-mode string                               Ordered list of plug-ins to do authorization on secure port. Comma-delimited list of: AlwaysAllow,AlwaysDeny,ABAC,Webhook,RBAC,Node. (default "AlwaysAllow")
      --authorization-policy-file string                        File with authorization policy in csv format, used with --authorization-mode=ABAC, on the secure port.
-      --authorization-webhook-cache-authorized-ttl duration     The duration to cache 'authorized' responses from the webhook authorizer. Default is 5m. (default 5m0s)
-      --authorization-webhook-cache-unauthorized-ttl duration   The duration to cache 'unauthorized' responses from the webhook authorizer. Default is 30s. (default 30s)
+      --authorization-webhook-cache-authorized-ttl duration     The duration to cache 'authorized' responses from the webhook authorizer. (default 5m0s)
+      --authorization-webhook-cache-unauthorized-ttl duration   The duration to cache 'unauthorized' responses from the webhook authorizer. (default 30s)
      --authorization-webhook-config-file string                File with webhook configuration in kubeconfig format, used with --authorization-mode=Webhook. The API server will query the remote service to determine access on the API server's secure port.
      --azure-container-registry-config string                  Path to the file container Azure container registry configuration information.
      --basic-auth-file string                                  If set, the file that will be used to admit requests to the secure port of the API server via http basic authentication.
      --bind-address ip                                         The IP address on which to listen for the --secure-port port. The associated interface(s) must be reachable by the rest of the cluster, and by CLI/web clients. If blank, all interfaces will be used (0.0.0.0). (default 0.0.0.0)
-      --cert-dir string                                         The directory where the TLS certs are located (by default /var/run/kubernetes). If --tls-cert-file and --tls-private-key-file are provided, this flag will be ignored. (default "/var/run/kubernetes")
+      --cert-dir string                                         The directory where the TLS certs are located. If --tls-cert-file and --tls-private-key-file are provided, this flag will be ignored. (default "/var/run/kubernetes")
      --client-ca-file string                                   If set, any request presenting a client certificate signed by one of the authorities in the client-ca-file is authenticated with an identity corresponding to the CommonName of the client certificate.
      --cloud-config string                                     The path to the cloud provider configuration file. Empty string for no configuration file.
      --cloud-provider string                                   The provider for cloud services. Empty string for no provider.
@@ -49,7 +52,9 @@ kube-apiserver
      --cors-allowed-origins stringSlice                        List of allowed origins for CORS, comma separated.  An allowed origin can be a regular expression to support subdomain matching. If this list is empty CORS will not be enabled.
      --delete-collection-workers int                           Number of workers spawned for DeleteCollection call. These are used to speed up namespace cleanup. (default 1)
      --deserialization-cache-size int                          Number of deserialized json objects to cache in memory.
+      --enable-aggregator-routing                               Turns on aggregator routing requests to endoints IP rather than cluster IP.
      --enable-garbage-collector                                Enables the generic garbage collector. MUST be synced with the corresponding flag of the kube-controller-manager. (default true)
+      --enable-logs-handler                                     If true, install a /logs handler for the apiserver logs. (default true)
      --enable-swagger-ui                                       Enables swagger ui on the apiserver at /swagger-ui
      --etcd-cafile string                                      SSL Certificate Authority file used to secure etcd communication.
      --etcd-certfile string                                    SSL certification file used to secure etcd communication.
@@ -58,32 +63,38 @@ kube-apiserver
      --etcd-quorum-read                                        If true, enable quorum read.
      --etcd-servers stringSlice                                List of etcd servers to connect with (scheme://ip:port), comma separated.
      --etcd-servers-overrides stringSlice                      Per-resource etcd servers overrides, comma separated. The individual override format: group/resource#servers, where servers are http://ip:port, semicolon separated.
-      --event-ttl duration                                      Amount of time to retain events. Default is 1h. (default 1h0m0s)
+      --event-ttl duration                                      Amount of time to retain events. (default 1h0m0s)
      --experimental-bootstrap-token-auth                       Enable to allow secrets of type 'bootstrap.kubernetes.io/token' in the 'kube-system' namespace to be used for TLS bootstrapping authentication.
+      --experimental-encryption-provider-config string          The file containing configuration for encryption providers to be used for storing secrets in etcd
      --experimental-keystone-ca-file string                    If set, the Keystone server's certificate will be verified by one of the authorities in the experimental-keystone-ca-file, otherwise the host's root CA set will be used.
      --experimental-keystone-url string                        If passed, activates the keystone authentication plugin.
      --external-hostname string                                The hostname to use when generating externalized URLs for this master (e.g. Swagger API Docs).
      --feature-gates mapStringBool                             A set of key=value pairs that describe feature gates for alpha/experimental features. Options are:
 Accelerators=true|false (ALPHA - default=false)
+AdvancedAuditing=true|false (ALPHA - default=false)
 AffinityInAnnotations=true|false (ALPHA - default=false)
 AllAlpha=true|false (ALPHA - default=false)
-AllowExtTrafficLocalEndpoints=true|false (BETA - default=true)
+AllowExtTrafficLocalEndpoints=true|false (default=true)
 AppArmor=true|false (BETA - default=true)
 DynamicKubeletConfig=true|false (ALPHA - default=false)
 DynamicVolumeProvisioning=true|false (ALPHA - default=true)
 ExperimentalCriticalPodAnnotation=true|false (ALPHA - default=false)
 ExperimentalHostUserNamespaceDefaulting=true|false (BETA - default=false)
+LocalStorageCapacityIsolation=true|false (ALPHA - default=false)
+PersistentLocalVolumes=true|false (ALPHA - default=false)
+RotateKubeletClientCertificate=true|false (ALPHA - default=false)
+RotateKubeletServerCertificate=true|false (ALPHA - default=false)
 StreamingProxyRedirects=true|false (BETA - default=true)
 TaintBasedEvictions=true|false (ALPHA - default=false)
      --google-json-key string                                  The Google Cloud Platform Service Account JSON Key to use for authentication.
      --insecure-allow-any-token username/group1,group2         If set, your server will be INSECURE.  Any token will be allowed and user information will be parsed from the token as username/group1,group2
-      --insecure-bind-address ip                                The IP address on which to serve the --insecure-port (set to 0.0.0.0 for all interfaces). Defaults to localhost. (default 127.0.0.1)
-      --insecure-port int                                       The port on which to serve unsecured, unauthenticated access. Default 8080. It is assumed that firewall rules are set up such that this port is not reachable from outside of the cluster and that port 443 on the cluster's public address is proxied to this port. This is performed by nginx in the default setup. (default 8080)
+      --insecure-bind-address ip                                The IP address on which to serve the --insecure-port (set to 0.0.0.0 for all interfaces). (default 127.0.0.1)
+      --insecure-port int                                       The port on which to serve unsecured, unauthenticated access. It is assumed that firewall rules are set up such that this port is not reachable from outside of the cluster and that port 443 on the cluster's public address is proxied to this port. This is performed by nginx in the default setup. (default 8080)
      --kubelet-certificate-authority string                    Path to a cert file for the certificate authority.
      --kubelet-client-certificate string                       Path to a client cert file for TLS.
      --kubelet-client-key string                               Path to a client key file for TLS.
      --kubelet-https                                           Use https for kubelet connections. (default true)
-      --kubelet-preferred-address-types stringSlice             List of the preferred NodeAddressTypes to use for kubelet connections. (default [Hostname,InternalDNS,InternalIP,ExternalDNS,ExternalIP,LegacyHostIP])
+      --kubelet-preferred-address-types stringSlice             List of the preferred NodeAddressTypes to use for kubelet connections. (default [Hostname,InternalDNS,InternalIP,ExternalDNS,ExternalIP])
      --kubelet-read-only-port uint                             DEPRECATED: kubelet port. (default 10255)
      --kubelet-timeout duration                                Timeout for kubelet operations. (default 5s)
      --kubernetes-service-node-port int                        If non-zero, the Kubernetes master service (which apiserver creates/maintains) will be of type NodePort, using this as the value of the port. If zero, the Kubernetes master service will be of type ClusterIP.
@@ -98,6 +109,8 @@ TaintBasedEvictions=true|false (ALPHA - default=false)
      --oidc-issuer-url string                                  The URL of the OpenID issuer, only HTTPS scheme will be accepted. If set, it will be used to verify the OIDC JSON Web Token (JWT).
      --oidc-username-claim string                              The OpenID claim to use as the user name. Note that claims other than the default ('sub') is not guaranteed to be unique and immutable. This flag is experimental, please see the authentication documentation for further details. (default "sub")
      --profiling                                               Enable profiling via web interface host:port/debug/pprof/ (default true)
+      --proxy-client-cert-file string                           Client certificate used to prove the identity of the aggregator or kube-apiserver when it must call out during a request. This includes proxying requests to a user api-server and calling out to webhook admission plugins. It is expected that this cert includes a signature from the CA in the --requestheader-client-ca-file flag. That CA is published in the 'extension-apiserver-authentication' configmap in the kube-system namespace. Components recieving calls from kube-aggregator should use that CA to perform their half of the mutual TLS verification.
+      --proxy-client-key-file string                            Private key for the client certificate used to prove the identity of the aggregator or kube-apiserver when it must call out during a request. This includes proxying requests to a user api-server and calling out to webhook admission plugins.
      --repair-malformed-updates                                If true, server will do its best to fix the update request to pass the validation, e.g., setting empty UID in update request to its existing value. This flag can be turned off after we fix all the clients that send malformed updates. (default true)
      --requestheader-allowed-names stringSlice                 List of client certificate common names to allow to provide usernames in headers specified by --requestheader-username-headers. If empty, any client certificate validated by the authorities in --requestheader-client-ca-file is allowed.
      --requestheader-client-ca-file string                     Root certificate bundle to use to verify client certificates on incoming requests before trusting usernames in headers specified by --requestheader-username-headers
@@ -107,22 +120,23 @@ TaintBasedEvictions=true|false (ALPHA - default=false)
      --runtime-config mapStringString                          A set of key=value pairs that describe runtime configuration that may be passed to apiserver. apis/<groupVersion> key can be used to turn on/off specific api versions. apis/<groupVersion>/<resource> can be used to turn on/off specific resources. api/all and api/legacy are special keys to control all and legacy api versions respectively.
      --secure-port int                                         The port on which to serve HTTPS with authentication and authorization. If 0, don't serve HTTPS at all. (default 6443)
      --service-account-key-file stringArray                    File containing PEM-encoded x509 RSA or ECDSA private or public keys, used to verify ServiceAccount tokens. If unspecified, --tls-private-key-file is used. The specified file can contain multiple keys, and the flag can be specified multiple times with different files.
-      --service-account-lookup                                  If true, validate ServiceAccount tokens exist in etcd as part of authentication.
+      --service-account-lookup                                  If true, validate ServiceAccount tokens exist in etcd as part of authentication. (default true)
      --service-cluster-ip-range ipNet                          A CIDR notation IP range from which to assign service cluster IPs. This must not overlap with any IP ranges assigned to nodes for pods.
      --service-node-port-range portRange                       A port range to reserve for services with NodePort visibility. Example: '30000-32767'. Inclusive at both ends of the range. (default 30000-32767)
      --ssh-keyfile string                                      If non-empty, use secure SSH proxy to the nodes, using this user keyfile
      --ssh-user string                                         If non-empty, use secure SSH proxy to the nodes, using this user name
      --storage-backend string                                  The storage backend for persistence. Options: 'etcd3' (default), 'etcd2'.
      --storage-media-type string                               The media type to use to store objects in storage. Some resources or storage backends may only support a specific media type and will ignore this setting. (default "application/vnd.kubernetes.protobuf")
-      --storage-versions string                                 The per-group version to store resources in. Specified in the format "group1/version1,group2/version2,...". In the case where objects are moved from one group to the other, you may specify the format "group1=group2/v1beta1,group3/v1beta1,...". You only need to pass the groups you wish to change from the defaults. It defaults to a list of preferred versions of all registered groups, which is derived from the KUBE_API_VERSIONS environment variable. (default "apps/v1beta1,authentication.k8s.io/v1,authorization.k8s.io/v1,autoscaling/v1,batch/v1,certificates.k8s.io/v1beta1,componentconfig/v1alpha1,extensions/v1beta1,imagepolicy.k8s.io/v1alpha1,policy/v1beta1,rbac.authorization.k8s.io/v1beta1,settings.k8s.io/v1alpha1,storage.k8s.io/v1beta1,v1")
+      --storage-versions string                                 The per-group version to store resources in. Specified in the format "group1/version1,group2/version2,...". In the case where objects are moved from one group to the other, you may specify the format "group1=group2/v1beta1,group3/v1beta1,...". You only need to pass the groups you wish to change from the defaults. It defaults to a list of preferred versions of all registered groups, which is derived from the KUBE_API_VERSIONS environment variable. (default "admission.k8s.io/v1alpha1,admissionregistration.k8s.io/v1alpha1,apps/v1beta1,authentication.k8s.io/v1,authorization.k8s.io/v1,autoscaling/v1,batch/v1,certificates.k8s.io/v1beta1,componentconfig/v1alpha1,extensions/v1beta1,federation/v1beta1,imagepolicy.k8s.io/v1alpha1,networking.k8s.io/v1,policy/v1beta1,rbac.authorization.k8s.io/v1beta1,settings.k8s.io/v1alpha1,storage.k8s.io/v1,v1")
      --target-ram-mb int                                       Memory limit for apiserver in MB (used to configure sizes of caches, etc.)
      --tls-ca-file string                                      If set, this certificate authority will used for secure access from Admission Controllers. This must be a valid PEM-encoded CA bundle. Altneratively, the certificate authority can be appended to the certificate provided by --tls-cert-file.
      --tls-cert-file string                                    File containing the default x509 Certificate for HTTPS. (CA cert, if any, concatenated after server cert). If HTTPS serving is enabled, and --tls-cert-file and --tls-private-key-file are not provided, a self-signed certificate and key are generated for the public address and saved to /var/run/kubernetes.
      --tls-private-key-file string                             File containing the default x509 private key matching --tls-cert-file.
-      --tls-sni-cert-key namedCertKey                           A pair of x509 certificate and private key file paths, optionally suffixed with a list of domain patterns which are fully qualified domain names, possibly with prefixed wildcard segments. If no domain patterns are provided, the names of the certificate are extracted. Non-wildcard matches trump over wildcard matches, explicit domain patterns trump over extracted names. For multiple key/certificate pairs, use the --tls-sni-cert-key multiple times. Examples: "example.key,example.crt" or "*.foo.com,foo.com:foo.key,foo.crt". (default [])
+      --tls-sni-cert-key namedCertKey                           A pair of x509 certificate and private key file paths, optionally suffixed with a list of domain patterns which are fully qualified domain names, possibly with prefixed wildcard segments. If no domain patterns are provided, the names of the certificate are extracted. Non-wildcard matches trump over wildcard matches, explicit domain patterns trump over extracted names. For multiple key/certificate pairs, use the --tls-sni-cert-key multiple times. Examples: "example.crt,example.key" or "foo.crt,foo.key:*.foo.com,foo.com". (default [])
      --token-auth-file string                                  If set, the file that will be used to secure the secure port of the API server via token authentication.
+      --version version[=true]                                  Print version information and quit
      --watch-cache                                             Enable watch caching in the apiserver (default true)
      --watch-cache-sizes stringSlice                           List of watch cache sizes for every resource (pods, nodes, etc.), comma separated. The individual override format: resource#size, where size is a number. It takes effect when watch-cache is enabled.
 ```

-###### Auto generated by spf13/cobra on 21-Mar-2017
+###### Auto generated by spf13/cobra on 11-Jul-2017
@@ -29,6 +29,7 @@ kube-controller-manager
      --allocate-node-cidrs                                               Should CIDRs for Pods be allocated and set on the cloud provider.
      --attach-detach-reconcile-sync-period duration                      The reconciler sync wait time between volume attach detach. This duration must be larger than one second, and increasing this value from the default may allow for volumes to be mismatched with pods. (default 1m0s)
      --azure-container-registry-config string                            Path to the file container Azure container registry configuration information.
+      --cidr-allocator-type string                                        Type of CIDR allocator to use (default "RangeAllocator")
      --cloud-config string                                               The path to the cloud provider configuration file.  Empty string for no configuration file.
      --cloud-provider string                                             The provider for cloud services.  Empty string for no provider.
      --cluster-cidr string                                               CIDR Range for Pods in cluster.
@@ -38,7 +39,7 @@ kube-controller-manager
      --concurrent-deployment-syncs int32                                 The number of deployment objects that are allowed to sync concurrently. Larger number = more responsive deployments, but more CPU (and network) load (default 5)
      --concurrent-endpoint-syncs int32                                   The number of endpoint syncing operations that will be done concurrently. Larger number = faster endpoint updating, but more CPU (and network) load (default 5)
      --concurrent-gc-syncs int32                                         The number of garbage collector workers that are allowed to sync concurrently. (default 20)
-      --concurrent-namespace-syncs int32                                  The number of namespace objects that are allowed to sync concurrently. Larger number = more responsive namespace termination, but more CPU (and network) load (default 2)
+      --concurrent-namespace-syncs int32                                  The number of namespace objects that are allowed to sync concurrently. Larger number = more responsive namespace termination, but more CPU (and network) load (default 10)
      --concurrent-replicaset-syncs int32                                 The number of replica sets that are allowed to sync concurrently. Larger number = more responsive replica management, but more CPU (and network) load (default 5)
      --concurrent-resource-quota-syncs int32                             The number of resource quotas that are allowed to sync concurrently. Larger number = more responsive quota management, but more CPU (and network) load (default 5)
      --concurrent-service-syncs int32                                    The number of services that are allowed to sync concurrently. Larger number = more responsive service management, but more CPU (and network) load (default 1)
@@ -48,31 +49,39 @@ kube-controller-manager
      --contention-profiling                                              Enable lock contention profiling, if profiling is enabled
      --controller-start-interval duration                                Interval between starting controller managers.
      --controllers stringSlice                                           A list of controllers to enable.  '*' enables all on-by-default controllers, 'foo' enables the controller named 'foo', '-foo' disables the controller named 'foo'.
-All controllers: attachdetach, bootstrapsigner, certificatesigningrequests, cronjob, daemonset, deployment, disruption, endpoint, garbagecollector, horizontalpodautoscaling, job, namespace, node, persistentvolume-binder, podgc, replicaset, replicationcontroller, resourcequota, route, service, serviceaccount, serviceaccount-token, statefuleset, tokencleaner, ttl
+All controllers: attachdetach, bootstrapsigner, cronjob, csrapproving, csrsigning, daemonset, deployment, disruption, endpoint, garbagecollector, horizontalpodautoscaling, job, namespace, node, persistentvolume-binder, podgc, replicaset, replicationcontroller, resourcequota, route, service, serviceaccount, serviceaccount-token, statefulset, tokencleaner, ttl
 Disabled-by-default controllers: bootstrapsigner, tokencleaner (default [*])
      --deployment-controller-sync-period duration                        Period for syncing the deployments. (default 30s)
      --disable-attach-detach-reconcile-sync                              Disable volume attach detach reconciler sync. Disabling this may cause volumes to be mismatched with pods. Use wisely.
      --enable-dynamic-provisioning                                       Enable dynamic provisioning for environments that support it. (default true)
      --enable-garbage-collector                                          Enables the generic garbage collector. MUST be synced with the corresponding flag of the kube-apiserver. (default true)
      --enable-hostpath-provisioner                                       Enable HostPath PV provisioning when running without a cloud provider. This allows testing and development of provisioning features.  HostPath provisioning is not supported in any way, won't work in a multi-node cluster, and should not be used for anything other than testing or development.
-      --enable-taint-manager                                              WARNING: Beta feature. If set to true, enables NoExecute Taints and will evict all not-tolerating Pods running on Nodes tainted with these kinds of Taints. (default true)
+      --enable-taint-manager                                              WARNING: Beta feature. If set to true enables NoExecute Taints and will evict all not-tolerating Pod running on Nodes tainted with this kind of Taints. (default true)
+      --experimental-cluster-signing-duration duration                    The length of duration signed certificates will be given. (default 8760h0m0s)
      --feature-gates mapStringBool                                       A set of key=value pairs that describe feature gates for alpha/experimental features. Options are:
 Accelerators=true|false (ALPHA - default=false)
+AdvancedAuditing=true|false (ALPHA - default=false)
 AffinityInAnnotations=true|false (ALPHA - default=false)
 AllAlpha=true|false (ALPHA - default=false)
-AllowExtTrafficLocalEndpoints=true|false (BETA - default=true)
+AllowExtTrafficLocalEndpoints=true|false (default=true)
 AppArmor=true|false (BETA - default=true)
 DynamicKubeletConfig=true|false (ALPHA - default=false)
 DynamicVolumeProvisioning=true|false (ALPHA - default=true)
 ExperimentalCriticalPodAnnotation=true|false (ALPHA - default=false)
 ExperimentalHostUserNamespaceDefaulting=true|false (BETA - default=false)
+LocalStorageCapacityIsolation=true|false (ALPHA - default=false)
+PersistentLocalVolumes=true|false (ALPHA - default=false)
+RotateKubeletClientCertificate=true|false (ALPHA - default=false)
+RotateKubeletServerCertificate=true|false (ALPHA - default=false)
 StreamingProxyRedirects=true|false (BETA - default=true)
 TaintBasedEvictions=true|false (ALPHA - default=false)
      --flex-volume-plugin-dir string                                     Full path of the directory in which the flex volume plugin should search for additional third party volume plugins. (default "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/")
      --google-json-key string                                            The Google Cloud Platform Service Account JSON Key to use for authentication.
+      --horizontal-pod-autoscaler-downscale-delay duration                The period since last downscale, before another downscale can be performed in horizontal pod autoscaler. (default 5m0s)
      --horizontal-pod-autoscaler-sync-period duration                    The period for syncing the number of pods in horizontal pod autoscaler. (default 30s)
+      --horizontal-pod-autoscaler-upscale-delay duration                  The period since last upscale, before another upscale can be performed in horizontal pod autoscaler. (default 3m0s)
      --horizontal-pod-autoscaler-use-rest-clients                        WARNING: alpha feature.  If set to true, causes the horizontal pod autoscaler controller to use REST clients through the kube-aggregator, instead of using the legacy metrics client through the API server proxy.  This is required for custom metrics support in the horizonal pod autoscaler.
-      --insecure-experimental-approve-all-kubelet-csrs-for-group string   The group for which the controller-manager will auto approve all CSRs for kubelet client certificates.
+      --insecure-experimental-approve-all-kubelet-csrs-for-group string   This flag does nothing.
      --kube-api-burst int32                                              Burst to use while talking with kubernetes apiserver (default 30)
      --kube-api-content-type string                                      Content type of requests sent to apiserver. (default "application/vnd.kubernetes.protobuf")
      --kube-api-qps float32                                              QPS to use while talking with kubernetes apiserver (default 20)
@@ -81,6 +90,7 @@ TaintBasedEvictions=true|false (ALPHA - default=false)
      --leader-elect                                                      Start a leader election client and gain leadership before executing the main loop. Enable this when running replicated components for high availability. (default true)
      --leader-elect-lease-duration duration                              The duration that non-leader candidates will wait after observing a leadership renewal until attempting to acquire leadership of a led but unrenewed leader slot. This is effectively the maximum duration that a leader can be stopped before it is replaced by another candidate. This is only applicable if leader election is enabled. (default 15s)
      --leader-elect-renew-deadline duration                              The interval between attempts by the acting master to renew a leadership slot before it stops leading. This must be less than or equal to the lease duration. This is only applicable if leader election is enabled. (default 10s)
+      --leader-elect-resource-lock endpoints                              The type of resource resource object that is used for locking duringleader election. Supported options are endpoints (default) and `configmap`. (default "endpoints")
      --leader-elect-retry-period duration                                The duration the clients should wait between attempting acquisition and renewal of a leadership. This is only applicable if leader election is enabled. (default 2s)
      --master string                                                     The address of the Kubernetes API server (overrides any value in kubeconfig)
      --min-resync-period duration                                        The resync period in reflectors will be random between MinResyncPeriod and 2*MinResyncPeriod (default 12h0m0s)
@@ -110,6 +120,7 @@ TaintBasedEvictions=true|false (ALPHA - default=false)
      --terminated-pod-gc-threshold int32                                 Number of terminated pods that can exist before the terminated pod garbage collector starts deleting terminated pods. If <= 0, the terminated pod garbage collector is disabled. (default 12500)
      --unhealthy-zone-threshold float32                                  Fraction of Nodes in a zone which needs to be not Ready (minimum 3) for zone to be treated as unhealthy.  (default 0.55)
      --use-service-account-credentials                                   If true, use individual service account credentials for each controller.
+      --version version[=true]                                            Print version information and quit
 ```

-###### Auto generated by spf13/cobra on 21-Mar-2017
+###### Auto generated by spf13/cobra on 11-Jul-2017
@@ -28,6 +28,7 @@ kube-proxy
      --bind-address ip                              The IP address for the proxy server to serve on (set to 0.0.0.0 for all interfaces) (default 0.0.0.0)
      --cleanup-iptables                             If true cleanup iptables rules and exit.
      --cluster-cidr string                          The CIDR range of pods in the cluster. It is used to bridge traffic coming from outside of the cluster. If not provided, no off-cluster bridging will be performed.
+      --config string                                The path to the configuration file.
      --config-sync-period duration                  How often configuration from the apiserver is refreshed.  Must be greater than 0. (default 15m0s)
      --conntrack-max-per-core int32                 Maximum number of NAT connections to track per CPU core (0 to leave the limit as-is and ignore conntrack-min). (default 32768)
      --conntrack-min int32                          Minimum number of conntrack entries to allocate, regardless of conntrack-max-per-core (set conntrack-max-per-core=0 to leave the limit as-is). (default 131072)
@@ -35,33 +36,41 @@ kube-proxy
      --conntrack-tcp-timeout-established duration   Idle timeout for established TCP connections (0 to leave as-is) (default 24h0m0s)
      --feature-gates mapStringBool                  A set of key=value pairs that describe feature gates for alpha/experimental features. Options are:
 Accelerators=true|false (ALPHA - default=false)
+AdvancedAuditing=true|false (ALPHA - default=false)
 AffinityInAnnotations=true|false (ALPHA - default=false)
 AllAlpha=true|false (ALPHA - default=false)
-AllowExtTrafficLocalEndpoints=true|false (BETA - default=true)
+AllowExtTrafficLocalEndpoints=true|false (default=true)
 AppArmor=true|false (BETA - default=true)
 DynamicKubeletConfig=true|false (ALPHA - default=false)
 DynamicVolumeProvisioning=true|false (ALPHA - default=true)
 ExperimentalCriticalPodAnnotation=true|false (ALPHA - default=false)
 ExperimentalHostUserNamespaceDefaulting=true|false (BETA - default=false)
+LocalStorageCapacityIsolation=true|false (ALPHA - default=false)
+PersistentLocalVolumes=true|false (ALPHA - default=false)
+RotateKubeletClientCertificate=true|false (ALPHA - default=false)
+RotateKubeletServerCertificate=true|false (ALPHA - default=false)
 StreamingProxyRedirects=true|false (BETA - default=true)
 TaintBasedEvictions=true|false (ALPHA - default=false)
      --google-json-key string                       The Google Cloud Platform Service Account JSON Key to use for authentication.
-      --healthz-bind-address ip                      The IP address for the health check server to serve on, defaulting to 127.0.0.1 (set to 0.0.0.0 for all interfaces) (default 127.0.0.1)
-      --healthz-port int32                           The port to bind the health check server. Use 0 to disable. (default 10249)
+      --healthz-bind-address ip                      The IP address and port for the health check server to serve on (set to 0.0.0.0 for all interfaces) (default 0.0.0.0:10256)
+      --healthz-port int32                           The port to bind the health check server. Use 0 to disable. (default 10256)
      --hostname-override string                     If non-empty, will use this string as identification instead of the actual hostname.
      --iptables-masquerade-bit int32                If using the pure iptables proxy, the bit of the fwmark space to mark packets requiring SNAT with.  Must be within the range [0, 31]. (default 14)
      --iptables-min-sync-period duration            The minimum interval of how often the iptables rules can be refreshed as endpoints and services change (e.g. '5s', '1m', '2h22m').
      --iptables-sync-period duration                The maximum interval of how often iptables rules are refreshed (e.g. '5s', '1m', '2h22m').  Must be greater than 0. (default 30s)
-      --kube-api-burst int32                         Burst to use while talking with kubernetes apiserver (default 10)
+      --kube-api-burst int                           Burst to use while talking with kubernetes apiserver (default 10)
      --kube-api-content-type string                 Content type of requests sent to apiserver. (default "application/vnd.kubernetes.protobuf")
      --kube-api-qps float32                         QPS to use while talking with kubernetes apiserver (default 5)
      --kubeconfig string                            Path to kubeconfig file with authorization information (the master location is set by the master flag).
-      --masquerade-all                               If using the pure iptables proxy, SNAT everything
+      --masquerade-all                               If using the pure iptables proxy, SNAT everything (this not commonly needed)
      --master string                                The address of the Kubernetes API server (overrides any value in kubeconfig)
      --oom-score-adj int32                          The oom-score-adj value for kube-proxy process. Values must be within the range [-1000, 1000] (default -999)
+      --profiling                                    If true enables profiling via web interface on /debug/pprof handler.
      --proxy-mode ProxyMode                         Which proxy mode to use: 'userspace' (older) or 'iptables' (faster). If blank, use the best-available proxy (currently iptables).  If the iptables proxy is selected, regardless of how, but the system's kernel or iptables versions are insufficient, this always falls back to the userspace proxy.
      --proxy-port-range port-range                  Range of host ports (beginPort-endPort, inclusive) that may be consumed in order to proxy service traffic. If unspecified (0-0) then ports will be randomly chosen.
      --udp-timeout duration                         How long an idle UDP connection will be kept open (e.g. '250ms', '2s').  Must be greater than 0. Only applicable for proxy-mode=userspace (default 250ms)
+      --version version[=true]                       Print version information and quit
+      --write-config-to string                       If set, write the default configuration values to this file and exit.
 ```

-###### Auto generated by spf13/cobra on 21-Mar-2017
+###### Auto generated by spf13/cobra on 11-Jul-2017
@@ -26,38 +26,47 @@ kube-scheduler

 ```
      --address string                           The IP address to serve on (set to 0.0.0.0 for all interfaces) (default "0.0.0.0")
-      --algorithm-provider string                The scheduling algorithm provider to use, one of: DefaultProvider | ClusterAutoscalerProvider (default "DefaultProvider")
-      --failure-domains string                   Indicate the "all topologies" set for an empty topologyKey when it's used for PreferredDuringScheduling pod anti-affinity. (default "kubernetes.io/hostname,failure-domain.beta.kubernetes.io/zone,failure-domain.beta.kubernetes.io/region")
-      --feature-gates value                      A set of key=value pairs that describe feature gates for alpha/experimental features. Options are:
+      --algorithm-provider string                The scheduling algorithm provider to use, one of: ClusterAutoscalerProvider | DefaultProvider (default "DefaultProvider")
+      --azure-container-registry-config string   Path to the file container Azure container registry configuration information.
+      --contention-profiling                     Enable lock contention profiling, if profiling is enabled
+      --feature-gates mapStringBool              A set of key=value pairs that describe feature gates for alpha/experimental features. Options are:
+Accelerators=true|false (ALPHA - default=false)
+AdvancedAuditing=true|false (ALPHA - default=false)
+AffinityInAnnotations=true|false (ALPHA - default=false)
 AllAlpha=true|false (ALPHA - default=false)
-AllowExtTrafficLocalEndpoints=true|false (ALPHA - default=false)
+AllowExtTrafficLocalEndpoints=true|false (default=true)
 AppArmor=true|false (BETA - default=true)
 DynamicKubeletConfig=true|false (ALPHA - default=false)
 DynamicVolumeProvisioning=true|false (ALPHA - default=true)
+ExperimentalCriticalPodAnnotation=true|false (ALPHA - default=false)
+ExperimentalHostUserNamespaceDefaulting=true|false (BETA - default=false)
+LocalStorageCapacityIsolation=true|false (ALPHA - default=false)
+PersistentLocalVolumes=true|false (ALPHA - default=false)
+RotateKubeletClientCertificate=true|false (ALPHA - default=false)
+RotateKubeletServerCertificate=true|false (ALPHA - default=false)
+StreamingProxyRedirects=true|false (BETA - default=true)
+TaintBasedEvictions=true|false (ALPHA - default=false)
      --google-json-key string                   The Google Cloud Platform Service Account JSON Key to use for authentication.
-      --hard-pod-affinity-symmetric-weight int   RequiredDuringScheduling affinity is not symmetric, but there is an implicit PreferredDuringScheduling affinity rule corresponding to every RequiredDuringScheduling affinity rule. --hard-pod-affinity-symmetric-weight represents the weight of implicit PreferredDuringScheduling affinity rule. (default 1)
-      --kube-api-burst value                     Burst to use while talking with kubernetes apiserver (default 100)
+      --kube-api-burst int32                     Burst to use while talking with kubernetes apiserver (default 100)
      --kube-api-content-type string             Content type of requests sent to apiserver. (default "application/vnd.kubernetes.protobuf")
-      --kube-api-qps value                       QPS to use while talking with kubernetes apiserver (default 50)
+      --kube-api-qps float32                     QPS to use while talking with kubernetes apiserver (default 50)
      --kubeconfig string                        Path to kubeconfig file with authorization and master location information.
      --leader-elect                             Start a leader election client and gain leadership before executing the main loop. Enable this when running replicated components for high availability. (default true)
      --leader-elect-lease-duration duration     The duration that non-leader candidates will wait after observing a leadership renewal until attempting to acquire leadership of a led but unrenewed leader slot. This is effectively the maximum duration that a leader can be stopped before it is replaced by another candidate. This is only applicable if leader election is enabled. (default 15s)
      --leader-elect-renew-deadline duration     The interval between attempts by the acting master to renew a leadership slot before it stops leading. This must be less than or equal to the lease duration. This is only applicable if leader election is enabled. (default 10s)
+      --leader-elect-resource-lock endpoints     The type of resource object that is used for locking during leader election. Supported options are endpoints (default) and `configmap`. (default "endpoints")
      --leader-elect-retry-period duration       The duration the clients should wait between attempting acquisition and renewal of a leadership. This is only applicable if leader election is enabled. (default 2s)
+      --lock-object-name string                  Define the name of the lock object. (default "kube-scheduler")
+      --lock-object-namespace string             Define the namespace of the lock object. (default "kube-system")
      --master string                            The address of the Kubernetes API server (overrides any value in kubeconfig)
-      --policy-config-file string                File with scheduler policy configuration
-      --port value                               The port that the scheduler's http service runs on (default 10251)
+      --policy-config-file string                File with scheduler policy configuration. This file is used if policy ConfigMap is not provided or --use-legacy-policy-config==true
+      --policy-configmap string                  Name of the ConfigMap object that contains scheduler's policy configuration. It must exist in the system namespace before scheduler initialization if --use-legacy-policy-config==false. The config must be provided as the value of an element in 'Data' map with the key='policy.cfg'
+      --policy-configmap-namespace string        The namespace where policy ConfigMap is located. The system namespace will be used if this is not provided or is empty. (default "kube-system")
+      --port int32                               The port that the scheduler's http service runs on (default 10251)
      --profiling                                Enable profiling via web interface host:port/debug/pprof/ (default true)
-      --scheduler-name string                    Name of the scheduler, used to select which pods will be processed by this scheduler, based on pod's annotation with key 'scheduler.alpha.kubernetes.io/name' (default "default-scheduler")
+      --scheduler-name string                    Name of the scheduler, used to select which pods will be processed by this scheduler, based on pod's "spec.SchedulerName". (default "default-scheduler")
+      --use-legacy-policy-config                 When set to true, scheduler will ignore policy ConfigMap and uses policy config file
+      --version version[=true]                   Print version information and quit
 ```

-###### Auto generated by spf13/cobra on 24-Oct-2016
-
-
-
-
-
-
-<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
-[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/admin/kube-scheduler.md?pixel)]()
-<!-- END MUNGE: GENERATED_ANALYTICS -->
+###### Auto generated by spf13/cobra on 11-Jul-2017
@@ -485,23 +485,6 @@ EOF

 Now `kubelet` is ready to use the specified CRI runtime, and you can continue with `kubeadm init` and `kubeadm join` workflow to deploy Kubernetes cluster.

-## Using custom certificates
-
-By default kubeadm will generate all the certificates needed for a cluster to run.
-You can override this behaviour by providing your own certificates.
-
-To do so, you must place them in whatever directory is specified by the
-`--cert-dir` flag or `CertificatesDir` configuration file key. By default this
-is `/etc/kubernetes/pki`.
-
-If a given certificate and private key pair both exist, kubeadm will skip the
-generation step and those files will be validated and used for the prescribed
-use-case.
-
-This means you can, for example, prepopulate `/etc/kubernetes/pki/ca.crt`
-and `/etc/kubernetes/pki/ca.key` with an existing CA, which then will be used
-for signing the rest of the certs.
-
 ## Running kubeadm without an internet connection

 All of the control plane components run in Pods started by the kubelet and
@@ -525,12 +508,65 @@ Here `v1.7.x` means the "latest patch release of the v1.7 branch".

 `${ARCH}` can be one of: `amd64`, `arm`, `arm64`, `ppc64le` or `s390x`.

+## Managing the kubeadm drop-in file for the kubelet
+
+The kubeadm deb package ships with configuration for how the kubelet should
+be run. Note that the `kubeadm` CLI command will never touch this drop-in file.
+This drop-in file belongs to the kubeadm deb/rpm package.
+
+This is what it looks like in v1.7:
+
+```
+[Service]
+Environment="KUBELET_KUBECONFIG_ARGS=--kubeconfig=/etc/kubernetes/kubelet.conf --require-kubeconfig=true"
+Environment="KUBELET_SYSTEM_PODS_ARGS=--pod-manifest-path=/etc/kubernetes/manifests --allow-privileged=true"
+Environment="KUBELET_NETWORK_ARGS=--network-plugin=cni --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin"
+Environment="KUBELET_DNS_ARGS=--cluster-dns=10.96.0.10 --cluster-domain=cluster.local"
+Environment="KUBELET_AUTHZ_ARGS=--authorization-mode=Webhook --client-ca-file=/etc/kubernetes/pki/ca.crt"
+Environment="KUBELET_CADVISOR_ARGS=--cadvisor-port=0"
+ExecStart=
+ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_SYSTEM_PODS_ARGS $KUBELET_NETWORK_ARGS $KUBELET_DNS_ARGS $KUBELET_AUTHZ_ARGS $KUBELET_CADVISOR_ARGS $KUBELET_EXTRA_ARGS
+```
+
+A breakdown of what/why:
+
+* `--kubeconfig=/etc/kubernetes/kubelet.conf` points to the kubeconfig file that
+   tells the kubelet where the API server is. This file also has the kubelet's
+   credentials.
+* `--require-kubeconfig=true` the kubelet should fail fast if the kubeconfig file
+   is not present. This makes the kubelet crashloop during the time the service is
+   started until `kubeadm init` is run.
+* `--pod-manifest-path=/etc/kubernetes/manifests` specifies from where to read
+   Static Pod manifests used for spinning up the control plane
+* `--allow-privileged=true` allows this kubelet to run privileged Pods
+* `--network-plugin=cni` uses CNI networking
+* `--cni-conf-dir=/etc/cni/net.d` specifies where to look for the
+   [CNI spec file(s)](https://github.com/containernetworking/cni/blob/master/SPEC.md)
+* `--cni-bin-dir=/opt/cni/bin` specifies where to look for the actual CNI binaries
+* `--cluster-dns=10.96.0.10` use this cluster-internal DNS server for `nameserver`
+   entries in Pods' `/etc/resolv.conf`
+* `--cluster-domain=cluster.local` uses this cluster-internal DNS domain for
+   `search` entries in Pods' `/etc/resolv.conf`
+* `--client-ca-file=/etc/kubernetes/pki/ca.crt` authenticates requests to the Kubelet
+   API using this CA certificate.
+* `--authorization-mode=Webhook` authorizes requests to the Kubelet API by `POST`-ing
+   a `SubjectAccessReview` to the API Server
+* `--cadvisor-port=0` disables cAdvisor from listening to `0.0.0.0:4194` by default.
+   cAdvisor will still be run inside of the kubelet and its API can be accessed at
+   `https://{node-ip}:10250/stats/`. If you want to enable cAdvisor to listen on a
+   wide-open port, run:
+
+   ```
+   sed -e "/cadvisor-port=0/d" -i /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
+   systemctl daemon-reload
+   systemctl restart kubelet
+   ```

 ## Cloudprovider integrations (experimental)

 Enabling specific cloud providers is a common request. This currently requires
 manual configuration and is therefore not yet fully supported. If you wish to do
-so, edit the kubeadm dropin for the kubelet service
+so, edit the kubeadm drop-in for the kubelet service
 (`/etc/systemd/system/kubelet.service.d/10-kubeadm.conf`) on all nodes,
 including the master. If your cloud provider requires any extra packages
 installed on the host, for example for volume mounting/unmounting, install those
@@ -620,31 +656,6 @@ export no_proxy="localhost,127.0.0.1,localaddress,.localdomain.com,example.com,1
 Remember to change `proxy_ip` and add a kube master node IP address to
 `no_proxy`.

-## Use Kubeadm with other CRI runtimes
-
-Since [Kubernetes 1.6 release](https://git.k8s.io/kubernetes/CHANGELOG.md#node-components-1), Kubernetes container runtimes have been transferred to using CRI by default. Currently, the build-in container runtime is Docker which is enabled by build-in `dockershim` in `kubelet`.
-
-Using other CRI based runtimes with kubeadm is very simple, and currently supported runtimes are:
-
- [cri-o](https://github.com/kubernetes-incubator/cri-o)
- [frakti](https://github.com/kubernetes/frakti)
- [rkt](https://github.com/kubernetes-incubator/rktlet)
-
-After you have successfully installed `kubeadm` and `kubelet`, please follow these two steps:
-
-1. Install runtime shim on every node. You will need to follow the installation document in the runtime shim project listing above.
-
-2. Configure kubelet to use remote CRI runtime. Please remember to change `RUNTIME_ENDPOINT` to your own value like `/var/run/{your_runtime}.sock`:
-
-```shell
-  $ cat > /etc/systemd/system/kubelet.service.d/20-cri.conf <<EOF
-Environment="KUBELET_EXTRA_ARGS=--container-runtime=remote --container-runtime-endpoint=$RUNTIME_ENDPOINT --feature-gates=AllAlpha=true"
-EOF
-  $ systemctl daemon-reload
-```
-
-Now `kubelet` is ready to use the specified CRI runtime, and you can continue with `kubeadm init` and `kubeadm join` workflow to deploy Kubernetes cluster.
-
 ## Using custom certificates

 By default kubeadm will generate all the certificates needed for a cluster to run.
@@ -38,7 +38,7 @@ name should be as depicted:
 ```

 Add the `--token-auth-file=FILENAME` flag to the kube-apiserver command (in your systemd unit file perhaps) to enable the token file.
-See docs [here](http://kubernetes.io/docs/admin/authentication/#static-token-file) for further details.
+See docs [here](/docs/admin/authentication/#static-token-file) for further details.

 ### Client certificate CA bundle

@@ -16,16 +16,18 @@ various mechanisms (primarily through the apiserver) and ensures that the contai
 described in those PodSpecs are running and healthy. The kubelet doesn't manage
 containers which were not created by Kubernetes.

-Other than from a PodSpec, there are three ways that a container
-manifest can be provided to the Kubelet from the apiserver.
+Other than from an PodSpec from the apiserver, there are three ways that a container
+manifest can be provided to the Kubelet.

-File: Path passed as a flag on the command line. This file is rechecked every 20
-seconds (configurable with a flag).
+File: Path passed as a flag on the command line. Files under this path will be monitored
+periodically for updates. The monitoring period is 20s by default and is configurable
+via a flag.

 HTTP endpoint: HTTP endpoint passed as a parameter on the command line. This endpoint
 is checked every 20 seconds (also configurable with a flag).

-HTTP server: The kubelet can also listen for HTTP requests and respond to a simple API call to submit a new manifest.
+HTTP server: The kubelet can also listen for HTTP and respond to a simple API
+(underspec'd currently) to submit a new manifest.

 ```
 kubelet
@@ -35,7 +37,7 @@ kubelet

 ```
      --address ip                                              The IP address for the Kubelet to serve on (set to 0.0.0.0 for all interfaces) (default 0.0.0.0)
-      --allow-privileged                                        If true, allow containers to request privileged mode. [default=false]
+      --allow-privileged                                        If true, allow containers to request privileged mode.
      --anonymous-auth                                          Enables anonymous requests to the Kubelet server. Requests that are not rejected by another authentication method are treated as anonymous requests. Anonymous requests have a username of system:anonymous, and a group name of system:unauthenticated. (default true)
      --authentication-token-webhook                            Use the TokenReview API to determine authentication for bearer tokens.
      --authentication-token-webhook-cache-ttl duration         The duration to cache responses from the webhook token authenticator. (default 2m0s)
@@ -43,33 +45,35 @@ kubelet
      --authorization-webhook-cache-authorized-ttl duration     The duration to cache 'authorized' responses from the webhook authorizer. (default 5m0s)
      --authorization-webhook-cache-unauthorized-ttl duration   The duration to cache 'unauthorized' responses from the webhook authorizer. (default 30s)
      --azure-container-registry-config string                  Path to the file container Azure container registry configuration information.
+      --bootstrap-kubeconfig string                             Path to a kubeconfig file that will be used to get client certificate for kubelet. If the file specified by --kubeconfig does not exist, the bootstrap kubeconfig is used to request a client certificate from the API server. On success, a kubeconfig file referencing the generated client certificate and key is written to the path specified by --kubeconfig. The client certificate and key file will be stored in the directory pointed by --cert-dir.
      --cadvisor-port int32                                     The port of the localhost cAdvisor endpoint (default 4194)
-      --cert-dir string                                         The directory where the TLS certs are located (by default /var/run/kubernetes). If --tls-cert-file and --tls-private-key-file are provided, this flag will be ignored. (default "/var/run/kubernetes")
+      --cert-dir string                                         The directory where the TLS certs are located. If --tls-cert-file and --tls-private-key-file are provided, this flag will be ignored. (default "/var/run/kubernetes")
      --cgroup-driver string                                    Driver that the kubelet uses to manipulate cgroups on the host.  Possible values: 'cgroupfs', 'systemd' (default "cgroupfs")
      --cgroup-root string                                      Optional root cgroup to use for pods. This is handled by the container runtime on a best effort basis. Default: '', which means use the container runtime default.
-      --cgroups-per-qos                                         Enable creation of QoS cgroup hierarchy, if true top level QoS and pod cgroups are created. [default: true] (default true)
-      --chaos-chance float                                      If > 0.0, introduce random client errors and latency. Intended for testing. [default=0.0]
+      --cgroups-per-qos                                         Enable creation of QoS cgroup hierarchy, if true top level QoS and pod cgroups are created. (default true)
+      --chaos-chance float                                      If > 0.0, introduce random client errors and latency. Intended for testing.
      --client-ca-file string                                   If set, any request presenting a client certificate signed by one of the authorities in the client-ca-file is authenticated with an identity corresponding to the CommonName of the client certificate.
      --cloud-config string                                     The path to the cloud provider configuration file.  Empty string for no configuration file.
-      --cloud-provider string                                   The provider for cloud services. By default, kubelet will attempt to auto-detect the cloud provider. Specify empty string for running with no cloud provider. [default=auto-detect] (default "auto-detect")
+      --cloud-provider string                                   The provider for cloud services. By default, kubelet will attempt to auto-detect the cloud provider. Specify empty string for running with no cloud provider. (default "auto-detect")
      --cluster-dns stringSlice                                 Comma-separated list of DNS server IP address.  This value is used for containers DNS server in case of Pods with "dnsPolicy=ClusterFirst". Note: all DNS servers appearing in the list MUST serve the same set of records otherwise name resolution within the cluster may not work correctly. There is no guarantee as to which DNS server may be contacted for name resolution.
      --cluster-domain string                                   Domain for this cluster.  If set, kubelet will configure all containers to search this domain in addition to the host's search domains
      --cni-bin-dir string                                      <Warning: Alpha feature> The full path of the directory in which to search for CNI plugin binaries. Default: /opt/cni/bin
      --cni-conf-dir string                                     <Warning: Alpha feature> The full path of the directory in which to search for CNI config files. Default: /etc/cni/net.d
-      --container-runtime string                                The container runtime to use. Possible values: 'docker', 'rkt'. Default: 'docker'. (default "docker")
-      --container-runtime-endpoint string                       [Experimental] The unix socket endpoint of remote runtime service. The endpoint is used only when CRI integration is enabled (--enable-cri)
-      --containerized                                           Experimental support for running kubelet in a container.  Intended for testing. [default=false]
+      --container-runtime string                                The container runtime to use. Possible values: 'docker', 'rkt'. (default "docker")
+      --container-runtime-endpoint string                       [Experimental] The endpoint of remote runtime service. Currently unix socket is supported on Linux, and tcp is supported on windows.  Examples:'unix:///var/run/dockershim.sock', 'tcp://localhost:3735' (default "unix:///var/run/dockershim.sock")
+      --containerized                                           Experimental support for running kubelet in a container.  Intended for testing.
      --contention-profiling                                    Enable lock contention profiling, if profiling is enabled
      --cpu-cfs-quota                                           Enable CPU CFS quota enforcement for containers that specify CPU limits (default true)
+      --docker-disable-shared-pid                               The Container Runtime Interface (CRI) defaults to using a shared PID namespace for containers in a pod when running with Docker 1.13.1 or higher. Setting this flag reverts to the previous behavior of isolated PID namespaces. This ability will be removed in a future Kubernetes release.
      --docker-endpoint string                                  Use this for the docker endpoint to communicate with (default "unix:///var/run/docker.sock")
      --enable-controller-attach-detach                         Enables the Attach/Detach controller to manage attachment/detachment of volumes scheduled to this node, and disables kubelet from executing any attach/detach operations (default true)
      --enable-custom-metrics                                   Support for gathering custom metrics.
      --enable-debugging-handlers                               Enables server endpoints for log collection and local running of containers and commands (default true)
      --enable-server                                           Enable the Kubelet's server (default true)
-      --enforce-node-allocatable stringSlice                    A comma separated list of levels of node allocatable enforcement to be enforced by kubelet. Acceptible options are 'pods', 'system-reserved' & 'kube-reserved'. If the latter two options are specified, '--system-reserved-cgroup' & '--kube-reserved-cgroup' must also be set respectively. See https://git.k8s.io/community/contributors/design-proposals/node-allocatable.md for more details. [default='pods'] (default [pods])
+      --enforce-node-allocatable stringSlice                    A comma separated list of levels of node allocatable enforcement to be enforced by kubelet. Acceptible options are 'pods', 'system-reserved' & 'kube-reserved'. If the latter two options are specified, '--system-reserved-cgroup' & '--kube-reserved-cgroup' must also be set respectively. See https://git.k8s.io/community/contributors/design-proposals/node-allocatable.md for more details. (default [pods])
      --event-burst int32                                       Maximum size of a bursty event records, temporarily allows event records to burst to this number, while still not exceeding event-qps. Only used if --event-qps > 0 (default 10)
      --event-qps int32                                         If > 0, limit event creations per second to this value. If 0, unlimited. (default 5)
-      --eviction-hard string                                    A set of eviction thresholds (e.g. memory.available<1Gi) that if met would trigger a pod eviction. (default "memory.available<100Mi")
+      --eviction-hard string                                    A set of eviction thresholds (e.g. memory.available<1Gi) that if met would trigger a pod eviction. (default "memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%")
      --eviction-max-pod-grace-period int32                     Maximum allowed grace period (in seconds) to use when terminating pods in response to a soft eviction threshold being met.  If negative, defer to pod specified value.
      --eviction-minimum-reclaim string                         A set of minimum reclaims (e.g. imagefs.available=2Gi) that describes the minimum amount of resource the kubelet will reclaim when performing a pod eviction if that resource is under pressure.
      --eviction-pressure-transition-period duration            Duration for which the kubelet has to wait before transitioning out of an eviction pressure condition. (default 5m0s)
@@ -78,7 +82,7 @@ kubelet
      --exit-on-lock-contention                                 Whether kubelet should exit upon lock-file contention.
      --experimental-allocatable-ignore-eviction                When set to 'true', Hard Eviction Thresholds will be ignored while calculating Node Allocatable. See https://git.k8s.io/community/contributors/design-proposals/node-allocatable.md for more details. [default=false]
      --experimental-allowed-unsafe-sysctls stringSlice         Comma-separated whitelist of unsafe sysctls or unsafe sysctl patterns (ending in *). Use these at your own risk.
-      --experimental-bootstrap-kubeconfig string                <Warning: Experimental feature> Path to a kubeconfig file that will be used to get client certificate for kubelet. If the file specified by --kubeconfig does not exist, the bootstrap kubeconfig is used to request a client certificate from the API server. On success, a kubeconfig file referencing the generated key and obtained certificate is written to the path specified by --kubeconfig. The certificate and key file will be stored in the directory pointed by --cert-dir.
+      --experimental-bootstrap-kubeconfig string                deprecated: use --bootstrap-kubeconfig
      --experimental-check-node-capabilities-before-mount       [Experimental] if set true, the kubelet will check the underlying node for required componenets (binaries, etc.) before performing the mount
      --experimental-fail-swap-on                               Makes the Kubelet fail to start if swap is enabled on the node. This is a temporary opton to maintain legacy behavior, failing due to swap enabled will happen by default in v1.6.
      --experimental-kernel-memcg-notification                  If enabled, the kubelet will integrate with the kernel memcg notification to determine if memory eviction thresholds are crossed rather than polling.
@@ -86,37 +90,42 @@ kubelet
      --experimental-qos-reserved mapStringString               A set of ResourceName=Percentage (e.g. memory=50%) pairs that describe how pod resource requests are reserved at the QoS level. Currently only memory is supported. [default=none]
      --feature-gates string                                    A set of key=value pairs that describe feature gates for alpha/experimental features. Options are:
 Accelerators=true|false (ALPHA - default=false)
+AdvancedAuditing=true|false (ALPHA - default=false)
 AffinityInAnnotations=true|false (ALPHA - default=false)
 AllAlpha=true|false (ALPHA - default=false)
-AllowExtTrafficLocalEndpoints=true|false (BETA - default=true)
+AllowExtTrafficLocalEndpoints=true|false (default=true)
 AppArmor=true|false (BETA - default=true)
 DynamicKubeletConfig=true|false (ALPHA - default=false)
 DynamicVolumeProvisioning=true|false (ALPHA - default=true)
 ExperimentalCriticalPodAnnotation=true|false (ALPHA - default=false)
 ExperimentalHostUserNamespaceDefaulting=true|false (BETA - default=false)
+LocalStorageCapacityIsolation=true|false (ALPHA - default=false)
+PersistentLocalVolumes=true|false (ALPHA - default=false)
+RotateKubeletClientCertificate=true|false (ALPHA - default=false)
+RotateKubeletServerCertificate=true|false (ALPHA - default=false)
 StreamingProxyRedirects=true|false (BETA - default=true)
 TaintBasedEvictions=true|false (ALPHA - default=false)
      --file-check-frequency duration                           Duration between checking config files for new data (default 20s)
      --google-json-key string                                  The Google Cloud Platform Service Account JSON Key to use for authentication.
      --hairpin-mode string                                     How should the kubelet setup hairpin NAT. This allows endpoints of a Service to loadbalance back to themselves if they should try to access their own Service. Valid values are "promiscuous-bridge", "hairpin-veth" and "none". (default "promiscuous-bridge")
-      --healthz-bind-address ip                                 The IP address for the healthz server to serve on, defaulting to 127.0.0.1 (set to 0.0.0.0 for all interfaces) (default 127.0.0.1)
+      --healthz-bind-address ip                                 The IP address for the healthz server to serve on. (set to 0.0.0.0 for all interfaces) (default 127.0.0.1)
      --healthz-port int32                                      The port of the localhost healthz endpoint (default 10248)
-      --host-ipc-sources stringSlice                            Comma-separated list of sources from which the Kubelet allows pods to use the host ipc namespace. [default="*"] (default [*])
-      --host-network-sources stringSlice                        Comma-separated list of sources from which the Kubelet allows pods to use of host network. [default="*"] (default [*])
-      --host-pid-sources stringSlice                            Comma-separated list of sources from which the Kubelet allows pods to use the host pid namespace. [default="*"] (default [*])
+      --host-ipc-sources stringSlice                            Comma-separated list of sources from which the Kubelet allows pods to use the host ipc namespace. (default [*])
+      --host-network-sources stringSlice                        Comma-separated list of sources from which the Kubelet allows pods to use of host network. (default [*])
+      --host-pid-sources stringSlice                            Comma-separated list of sources from which the Kubelet allows pods to use the host pid namespace. (default [*])
      --hostname-override string                                If non-empty, will use this string as identification instead of the actual hostname.
      --http-check-frequency duration                           Duration between checking http for new data (default 20s)
-      --image-gc-high-threshold int32                           The percent of disk usage after which image garbage collection is always run. Default: 90% (default 90)
-      --image-gc-low-threshold int32                            The percent of disk usage before which image garbage collection is never run. Lowest disk usage to garbage collect to. Default: 80% (default 80)
-      --image-pull-progress-deadline duration                   If no pulling progress is made before this deadline, the image pulling will be cancelled. Default: 1m0s. (default 1m0s)
-      --image-service-endpoint string                           [Experimental] The unix socket endpoint of remote image service. If not specified, it will be the same with container-runtime-endpoint by default. The endpoint is used only when CRI integration is enabled (--enable-cri)
+      --image-gc-high-threshold int32                           The percent of disk usage after which image garbage collection is always run. (default 85)
+      --image-gc-low-threshold int32                            The percent of disk usage before which image garbage collection is never run. Lowest disk usage to garbage collect to. (default 80)
+      --image-pull-progress-deadline duration                   If no pulling progress is made before this deadline, the image pulling will be cancelled. (default 1m0s)
+      --image-service-endpoint string                           [Experimental] The endpoint of remote image service. If not specified, it will be the same with container-runtime-endpoint by default. Currently unix socket is supported on Linux, and tcp is supported on windows.  Examples:'unix:///var/run/dockershim.sock', 'tcp://localhost:3735'
      --iptables-drop-bit int32                                 The bit of the fwmark space to mark packets for dropping. Must be within the range [0, 31]. (default 15)
      --iptables-masquerade-bit int32                           The bit of the fwmark space to mark packets for SNAT. Must be within the range [0, 31]. Please match this parameter with corresponding parameter in kube-proxy. (default 14)
      --keep-terminated-pod-volumes                             Keep terminated pod volumes mounted to the node after the pod terminates.  Can be useful for debugging volume related issues.
      --kube-api-burst int32                                    Burst to use while talking with kubernetes apiserver (default 10)
      --kube-api-content-type string                            Content type of requests sent to apiserver. (default "application/vnd.kubernetes.protobuf")
      --kube-api-qps int32                                      QPS to use while talking with kubernetes apiserver (default 5)
-      --kube-reserved mapStringString                           A set of ResourceName=ResourceQuantity (e.g. cpu=200m,memory=150G) pairs that describe resources reserved for kubernetes system components. Currently only cpu and memory are supported. See http://kubernetes.io/docs/user-guide/compute-resources for more detail. [default=none]
+      --kube-reserved mapStringString                           A set of ResourceName=ResourceQuantity (e.g. cpu=200m,memory=500Mi, storage=1Gi) pairs that describe resources reserved for kubernetes system components. Currently cpu, memory and local storage for root file system are supported. See http://kubernetes.io/docs/user-guide/compute-resources for more detail. [default=none]
      --kube-reserved-cgroup string                             Absolute name of the top level cgroup that is used to manage kubernetes components for which compute resources were reserved via '--kube-reserved' flag. Ex. '/kube-reserved'. [default='']
      --kubeconfig string                                       Path to a kubeconfig file, specifying how to connect to the API server. --api-servers will be used for the location unless --require-kubeconfig is set. (default "/var/lib/kubelet/kubeconfig")
      --kubelet-cgroups string                                  Optional absolute name of cgroups to create and run the Kubelet in.
@@ -124,17 +133,14 @@ TaintBasedEvictions=true|false (ALPHA - default=false)
      --make-iptables-util-chains                               If true, kubelet will ensure iptables utility rules are present on host. (default true)
      --manifest-url string                                     URL for accessing the container manifest
      --manifest-url-header string                              HTTP header to use when accessing the manifest URL, with the key separated from the value with a ':', as in 'key:value'
-      --master-service-namespace string                         The namespace from which the kubernetes master services should be injected into pods (default "default")
-      --max-open-files int                                      Number of files that can be opened by Kubelet process. [default=1000000] (default 1000000)
+      --max-open-files int                                      Number of files that can be opened by Kubelet process. (default 1000000)
      --max-pods int32                                          Number of Pods that can run on this Kubelet. (default 110)
-      --minimum-image-ttl-duration duration                     Minimum age for an unused image before it is garbage collected.  Examples: '300ms', '10s' or '2h45m'. Default: '2m' (default 2m0s)
+      --minimum-image-ttl-duration duration                     Minimum age for an unused image before it is garbage collected.  Examples: '300ms', '10s' or '2h45m'. (default 2m0s)
      --network-plugin string                                   <Warning: Alpha feature> The name of the network plugin to be invoked for various events in kubelet/pod lifecycle
-      --network-plugin-dir string                               <Warning: Alpha feature> The full path of the directory in which to search for network plugins or CNI config
      --network-plugin-mtu int32                                <Warning: Alpha feature> The MTU to be passed to the network plugin, to override the default. Set to 0 to use the default 1460 MTU.
      --node-ip string                                          IP address of the node. If set, kubelet will use this IP address for the node
      --node-labels mapStringString                             <Warning: Alpha feature> Labels to add when registering the node in the cluster.  Labels must be key=value pairs separated by ','.
-      --node-status-update-frequency duration                   Specifies how often kubelet posts node status to master. Note: be cautious when changing the constant, it must work with nodeMonitorGracePeriod in nodecontroller. Default: 10s (default 10s)
-      --non-masquerade-cidr string                              Traffic to IPs outside this range will use IP masquerade. (default "10.0.0.0/8")
+      --node-status-update-frequency duration                   Specifies how often kubelet posts node status to master. Note: be cautious when changing the constant, it must work with nodeMonitorGracePeriod in nodecontroller. (default 10s)
      --oom-score-adj int32                                     The oom-score-adj value for kubelet process. Values must be within the range [-1000, 1000] (default -999)
      --pod-cidr string                                         The CIDR to use for pod IP addresses, only used in standalone mode.  In cluster mode, this is obtained from the master.
      --pod-infra-container-image string                        The image whose network/ipc namespaces containers in each pod will use. (default "gcr.io/google_containers/pause-amd64:3.0")
@@ -142,12 +148,13 @@ TaintBasedEvictions=true|false (ALPHA - default=false)
      --pods-per-core int32                                     Number of Pods per core that can run on this Kubelet. The total number of Pods on this Kubelet cannot exceed max-pods, so max-pods will be used if this calculation results in a larger number of Pods allowed on the Kubelet. A value of 0 disables this limit.
      --port int32                                              The port for the Kubelet to serve on. (default 10250)
      --protect-kernel-defaults                                 Default kubelet behaviour for kernel tuning. If set, kubelet errors if any of kernel tunables is different than kubelet defaults.
+      --provider-id string                                      Unique identifier for identifying the node in a machine database, i.e cloudprovider
      --read-only-port int32                                    The read-only port for the Kubelet to serve on with no authentication/authorization (set to 0 to disable) (default 10255)
      --really-crash-for-testing                                If true, when panics occur crash. Intended for testing.
      --register-node                                           Register the node with the apiserver (defaults to true if --api-servers is set) (default true)
-      --register-with-taints []api.Taint                        Register the node with the given list of taints (comma seperated "<key>=<value>:<effect>"). No-op if register-node is false.
-      --registry-burst int32                                    Maximum size of a bursty pulls, temporarily allows pulls to burst to this number, while still not exceeding registry-qps.  Only used if --registry-qps > 0 (default 10)
-      --registry-qps int32                                      If > 0, limit registry pull QPS to this value.  If 0, unlimited. [default=5.0] (default 5)
+      --register-with-taints []api.Taint                        Register the node with the given list of taints (comma separated "<key>=<value>:<effect>"). No-op if register-node is false.
+      --registry-burst int32                                    Maximum size of a bursty pulls, temporarily allows pulls to burst to this number, while still not exceeding registry-qps. Only used if --registry-qps > 0 (default 10)
+      --registry-qps int32                                      If > 0, limit registry pull QPS to this value.  If 0, unlimited. (default 5)
      --require-kubeconfig                                      If true the Kubelet will exit if there are configuration errors, and will ignore the value of --api-servers in favor of the server defined in the kubeconfig file.
      --resolv-conf string                                      Resolver configuration file used as the basis for the container DNS resolution configuration. (default "/etc/resolv.conf")
      --rkt-api-endpoint string                                 The endpoint of the rkt API service to communicate with. Only used if --container-runtime='rkt'. (default "localhost:15441")
@@ -155,18 +162,19 @@ TaintBasedEvictions=true|false (ALPHA - default=false)
      --root-dir string                                         Directory path for managing kubelet files (volume mounts,etc). (default "/var/lib/kubelet")
      --runonce                                                 If true, exit after spawning pods from local manifests or remote urls. Exclusive with --api-servers, and --enable-server
      --runtime-cgroups string                                  Optional absolute name of cgroups to create and run the runtime in.
-      --runtime-request-timeout duration                        Timeout of all runtime requests except long running request - pull, logs, exec and attach. When timeout exceeded, kubelet will cancel the request, throw out an error and retry later. Default: 2m0s (default 2m0s)
+      --runtime-request-timeout duration                        Timeout of all runtime requests except long running request - pull, logs, exec and attach. When timeout exceeded, kubelet will cancel the request, throw out an error and retry later. (default 2m0s)
      --seccomp-profile-root string                             Directory path for seccomp profiles. (default "/var/lib/kubelet/seccomp")
-      --serialize-image-pulls                                   Pull images one at a time. We recommend *not* changing the default value on nodes that run docker daemon with version < 1.9 or an Aufs storage backend. Issue #10959 has more details. [default=true] (default true)
+      --serialize-image-pulls                                   Pull images one at a time. We recommend *not* changing the default value on nodes that run docker daemon with version < 1.9 or an Aufs storage backend. Issue #10959 has more details. (default true)
      --streaming-connection-idle-timeout duration              Maximum time a streaming connection can be idle before the connection is automatically closed. 0 indicates no timeout. Example: '5m' (default 4h0m0s)
      --sync-frequency duration                                 Max period between synchronizing running containers and config (default 1m0s)
-      --system-cgroups /                                        Optional absolute name of cgroups in which to place all non-kernel processes that are not already inside a cgroup under /. Empty for no container. Rolling back the flag requires a reboot. (Default: "").
-      --system-reserved mapStringString                         A set of ResourceName=ResourceQuantity (e.g. cpu=200m,memory=150G) pairs that describe resources reserved for non-kubernetes components. Currently only cpu and memory are supported. See http://kubernetes.io/docs/user-guide/compute-resources for more detail. [default=none]
+      --system-cgroups /                                        Optional absolute name of cgroups in which to place all non-kernel processes that are not already inside a cgroup under /. Empty for no container. Rolling back the flag requires a reboot.
+      --system-reserved mapStringString                         A set of ResourceName=ResourceQuantity (e.g. cpu=200m,memory=500Mi) pairs that describe resources reserved for non-kubernetes components. Currently only cpu and memory are supported. See http://kubernetes.io/docs/user-guide/compute-resources for more detail. [default=none]
      --system-reserved-cgroup string                           Absolute name of the top level cgroup that is used to manage non-kubernetes components for which compute resources were reserved via '--system-reserved' flag. Ex. '/system-reserved'. [default='']
-      --tls-cert-file string                                    File containing x509 Certificate for HTTPS.  (CA cert, if any, concatenated after server cert). If --tls-cert-file and --tls-private-key-file are not provided, a self-signed certificate and key are generated for the public address and saved to the directory passed to --cert-dir.
+      --tls-cert-file string                                    File containing x509 Certificate used for serving HTTPS (with intermediate certs, if any, concatenated after server cert). If --tls-cert-file and --tls-private-key-file are not provided, a self-signed certificate and key are generated for the public address and saved to the directory passed to --cert-dir.
      --tls-private-key-file string                             File containing x509 private key matching --tls-cert-file.
+      --version version[=true]                                  Print version information and quit
      --volume-plugin-dir string                                <Warning: Alpha feature> The full path of the directory in which to search for additional third party volume plugins (default "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/")
-      --volume-stats-agg-period duration                        Specifies interval for kubelet to calculate and cache the volume disk usage for all pods and volumes.  To disable volume calculations, set to 0.  Default: '1m' (default 1m0s)
+      --volume-stats-agg-period duration                        Specifies interval for kubelet to calculate and cache the volume disk usage for all pods and volumes.  To disable volume calculations, set to 0. (default 1m0s)
 ```

-###### Auto generated by spf13/cobra on 21-Mar-2017
+###### Auto generated by spf13/cobra on 11-Jul-2017
@@ -41,7 +41,7 @@
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -79,7 +79,7 @@
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -120,7 +120,7 @@
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -154,7 +154,7 @@
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -209,7 +209,7 @@
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -250,7 +250,7 @@
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -305,7 +305,7 @@
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -353,7 +353,7 @@
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -408,7 +408,7 @@
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -477,7 +477,7 @@
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -518,7 +518,7 @@
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -573,7 +573,7 @@
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -614,7 +614,7 @@
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -666,7 +666,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -710,7 +710,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -765,7 +765,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -802,7 +802,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -850,7 +850,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -912,7 +912,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -960,7 +960,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1022,7 +1022,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1063,7 +1063,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1097,7 +1097,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1250,7 +1250,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1314,7 +1314,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1348,7 +1348,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1410,7 +1410,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1556,7 +1556,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1622,7 +1622,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1656,7 +1656,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1704,7 +1704,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1773,7 +1773,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1813,7 +1813,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1861,7 +1861,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1923,7 +1923,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1992,7 +1992,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2036,7 +2036,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2091,7 +2091,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2132,7 +2132,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2173,7 +2173,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2221,7 +2221,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2283,7 +2283,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2327,7 +2327,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2375,7 +2375,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2427,7 +2427,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2468,7 +2468,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2530,7 +2530,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2585,7 +2585,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2626,7 +2626,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2674,7 +2674,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2736,7 +2736,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2777,7 +2777,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2842,7 +2842,7 @@ The StatefulSet guarantees that a given network identity will always map to the
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2904,7 +2904,7 @@ The StatefulSet guarantees that a given network identity will always map to the
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3099,7 +3099,7 @@ The StatefulSet guarantees that a given network identity will always map to the
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3147,7 +3147,7 @@ The StatefulSet guarantees that a given network identity will always map to the
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3230,7 +3230,7 @@ The StatefulSet guarantees that a given network identity will always map to the
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3278,7 +3278,7 @@ The StatefulSet guarantees that a given network identity will always map to the
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3333,7 +3333,7 @@ The StatefulSet guarantees that a given network identity will always map to the
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3374,7 +3374,7 @@ The StatefulSet guarantees that a given network identity will always map to the
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3461,7 +3461,7 @@ The StatefulSet guarantees that a given network identity will always map to the
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3509,7 +3509,7 @@ The StatefulSet guarantees that a given network identity will always map to the
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3564,7 +3564,7 @@ The StatefulSet guarantees that a given network identity will always map to the
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3710,7 +3710,7 @@ The StatefulSet guarantees that a given network identity will always map to the
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3772,7 +3772,7 @@ The StatefulSet guarantees that a given network identity will always map to the
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3813,7 +3813,7 @@ The StatefulSet guarantees that a given network identity will always map to the
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3854,7 +3854,7 @@ The StatefulSet guarantees that a given network identity will always map to the
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3902,7 +3902,7 @@ The StatefulSet guarantees that a given network identity will always map to the
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3950,7 +3950,7 @@ The StatefulSet guarantees that a given network identity will always map to the
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4009,7 +4009,7 @@ The StatefulSet guarantees that a given network identity will always map to the
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4096,4 +4096,4 @@ Last updated 2016-11-06 03:50:37 UTC
 </div>
 </div>
 </body>
-</html>
+</html>
@@ -43,7 +43,7 @@ title: Batch API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -81,7 +81,7 @@ title: Batch API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -122,7 +122,7 @@ title: Batch API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -156,7 +156,7 @@ title: Batch API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -211,7 +211,7 @@ title: Batch API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -252,7 +252,7 @@ title: Batch API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -307,7 +307,7 @@ title: Batch API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -355,7 +355,7 @@ title: Batch API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -424,7 +424,7 @@ title: Batch API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -465,7 +465,7 @@ title: Batch API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -520,7 +520,7 @@ title: Batch API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -561,7 +561,7 @@ title: Batch API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -616,7 +616,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -671,7 +671,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -708,7 +708,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -756,7 +756,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -818,7 +818,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -866,7 +866,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -928,7 +928,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -969,7 +969,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1003,7 +1003,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1156,7 +1156,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1220,7 +1220,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1254,7 +1254,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1323,7 +1323,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1469,7 +1469,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1535,7 +1535,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1569,7 +1569,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1617,7 +1617,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1686,7 +1686,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1726,7 +1726,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1774,7 +1774,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1843,7 +1843,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1887,7 +1887,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1942,7 +1942,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1983,7 +1983,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2024,7 +2024,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2086,7 +2086,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2148,7 +2148,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2189,7 +2189,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2258,7 +2258,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2316,7 +2316,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2364,7 +2364,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2412,7 +2412,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2453,7 +2453,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2515,7 +2515,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2570,7 +2570,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2611,7 +2611,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2659,7 +2659,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2721,7 +2721,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2762,7 +2762,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2831,7 +2831,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2893,7 +2893,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3088,7 +3088,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3136,7 +3136,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3219,7 +3219,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3267,7 +3267,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3322,7 +3322,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3363,7 +3363,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3450,7 +3450,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3498,7 +3498,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3553,7 +3553,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3699,7 +3699,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3761,7 +3761,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3802,7 +3802,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3843,7 +3843,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3891,7 +3891,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3943,7 +3943,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4030,4 +4030,4 @@ Last updated 2016-11-05 07:45:07 UTC
 </div>
 </div>
 </body>
-</html>
+</html>
@@ -91,7 +91,7 @@ title: Extensions API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -160,7 +160,7 @@ title: Extensions API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -215,7 +215,7 @@ title: Extensions API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -277,7 +277,7 @@ title: Extensions API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -311,7 +311,7 @@ title: Extensions API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -352,7 +352,7 @@ title: Extensions API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -407,7 +407,7 @@ title: Extensions API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -462,7 +462,7 @@ title: Extensions API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -510,7 +510,7 @@ title: Extensions API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -551,7 +551,7 @@ title: Extensions API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -606,7 +606,7 @@ title: Extensions API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -675,7 +675,7 @@ title: Extensions API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -709,7 +709,7 @@ title: Extensions API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -750,7 +750,7 @@ title: Extensions API Definitions
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -802,7 +802,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -864,7 +864,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -922,7 +922,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -977,7 +977,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1018,7 +1018,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1055,7 +1055,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1103,7 +1103,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1151,7 +1151,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1220,7 +1220,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1261,7 +1261,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1295,7 +1295,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1329,7 +1329,7 @@ Examples:<br>
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1475,7 +1475,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1530,7 +1530,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1571,7 +1571,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1633,7 +1633,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1685,7 +1685,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1754,7 +1754,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1788,7 +1788,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1843,7 +1843,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1883,7 +1883,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1924,7 +1924,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -1965,7 +1965,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2006,7 +2006,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2068,7 +2068,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2106,7 +2106,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2143,7 +2143,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2191,7 +2191,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2246,7 +2246,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2308,7 +2308,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2377,7 +2377,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2418,7 +2418,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2452,7 +2452,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2514,7 +2514,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2562,7 +2562,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2603,7 +2603,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2665,7 +2665,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2860,7 +2860,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2915,7 +2915,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -2963,7 +2963,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3046,7 +3046,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3136,7 +3136,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3191,7 +3191,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3236,7 +3236,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3284,7 +3284,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3339,7 +3339,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3401,7 +3401,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3547,7 +3547,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3588,7 +3588,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3636,7 +3636,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3684,7 +3684,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3725,7 +3725,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3780,7 +3780,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3842,7 +3842,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3925,7 +3925,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -3963,7 +3963,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4015,7 +4015,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4056,7 +4056,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4101,7 +4101,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4142,7 +4142,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4190,7 +4190,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4245,7 +4245,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4307,7 +4307,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4348,7 +4348,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4410,7 +4410,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4465,7 +4465,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4527,7 +4527,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4561,7 +4561,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4602,7 +4602,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4648,7 +4648,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4700,7 +4700,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4741,7 +4741,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4803,7 +4803,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4865,7 +4865,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4896,7 +4896,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -4930,7 +4930,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -5083,7 +5083,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -5147,7 +5147,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -5188,7 +5188,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -5250,7 +5250,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -5319,7 +5319,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -5381,7 +5381,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -5415,7 +5415,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -5477,7 +5477,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -5525,7 +5525,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -5601,7 +5601,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -5656,7 +5656,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -5711,7 +5711,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -5773,7 +5773,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -5821,7 +5821,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -5862,7 +5862,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -5900,7 +5900,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -5941,7 +5941,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -6010,7 +6010,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -6079,7 +6079,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -6127,7 +6127,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -6210,7 +6210,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -6265,7 +6265,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -6306,7 +6306,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -6347,7 +6347,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -6409,7 +6409,7 @@ Both these may change in the future. Incoming requests are matched against the h
 <col style="width:20%;">
 <col style="width:20%;">
 <col style="width:20%;">
-<col style="width:20%;"> 
+<col style="width:20%;">
 </colgroup>
 <thead>
 <tr>
@@ -6472,4 +6472,4 @@ Last updated 2016-11-08 08:09:17 UTC
 </div>
 </div>
 </body>
-</html>
+</html>
@@ -4,4 +4,4 @@ title: Well-Known Labels, Annotations and Taints

 {% include api-reference-content-moved.md %}

-* [Well-Known Labels, Annotations and Taints](/docs/reference/labels-annotations-taints/)
+* [Well-Known Labels, Annotations and Taints](/docs/reference/labels-annotations-taints/)
@@ -187,7 +187,7 @@ Appears In <a href="#podspec-v1-core">PodSpec</a> </aside>
 </tr>
 <tr>
 <td>securityContext <br /> <em><a href="#securitycontext-v1-core">SecurityContext</a></em></td>
-<td>Security options the pod should run with. More info: <a href="https://kubernetes.io/docs/concepts/policy/security-context/">https://kubernetes.io/docs/concepts/policy/security-context/</a> More info: <a href="https://git.k8s.io/community/contributors/design-proposals/security_context.md">https://git.k8s.io/community/contributors/design-proposals/security_context.md</a></td>
+<td>Security options the pod should run with. More info: <a href="https://kubernetes.io/docs/tasks/configure-pod-container/security-context/">https://kubernetes.io/docs/tasks/configure-pod-container/security-context/</a> More info: <a href="https://git.k8s.io/community/contributors/design-proposals/security_context.md">https://git.k8s.io/community/contributors/design-proposals/security_context.md</a></td>
 </tr>
 <tr>
 <td>stdin <br /> <em>boolean</em></td>
@@ -72131,4 +72131,4 @@ Appears In <a href="#tokenreviewstatus-v1beta1-authentication">TokenReviewStatus
 <!--<script src="actions.js"></script>-->
 <script src="tabvisibility.js"></script>
 </body>
-</html>
+</html>
@@ -70,7 +70,7 @@ The node condition is represented as a JSON object. For example, the following r

 If the Status of the Ready condition is "Unknown" or "False" for longer than the `pod-eviction-timeout`, an argument passed to the [kube-controller-manager](/docs/admin/kube-controller-manager/), all of the Pods on the node are scheduled for deletion by the Node Controller. The default eviction timeout duration is **five minutes**. In some cases when the node is unreachable, the apiserver is unable to communicate with the kubelet on it. The decision to delete the pods cannot be communicated to the kubelet until it re-establishes communication with the apiserver. In the meantime, the pods which are scheduled for deletion may continue to run on the partitioned node. 

-In versions of Kubernetes prior to 1.5, the node controller would [force delete](/docs/user-guide/pods/#force-deletion-of-pods) these unreachable pods from the apiserver. However, in 1.5 and higher, the node controller does not force delete pods until it is confirmed that they have stopped running in the cluster. One can see these pods which may be running on an unreachable node as being in the "Terminating" or "Unknown" states. In cases where Kubernetes cannot deduce from the underlying infrastructure if a node has permanently left a cluster, the cluster administrator may need to delete the node object by hand.  Deleting the node object from Kubernetes causes all the Pod objects running on it to be deleted from the apiserver, freeing up their names.
+In versions of Kubernetes prior to 1.5, the node controller would [force delete](/docs/concepts/workloads/pods/pod/#force-deletion-of-pods) these unreachable pods from the apiserver. However, in 1.5 and higher, the node controller does not force delete pods until it is confirmed that they have stopped running in the cluster. One can see these pods which may be running on an unreachable node as being in the "Terminating" or "Unknown" states. In cases where Kubernetes cannot deduce from the underlying infrastructure if a node has permanently left a cluster, the cluster administrator may need to delete the node object by hand.  Deleting the node object from Kubernetes causes all the Pod objects running on it to be deleted from the apiserver, freeing up their names.

 ### Capacity

@@ -141,7 +141,7 @@ ConditionUnknown and 5m after that to start evicting pods.) The node controller
 checks the state of each node every `--node-monitor-period` seconds.

 In Kubernetes 1.4, we updated the logic of the node controller to better handle
-cases when a big number of nodes have problems with reaching the master
+cases when a large number of nodes have problems with reaching the master
 (e.g. because the master has networking problem). Starting with 1.4, the node
 controller will look at the state of all nodes in the cluster when making a
 decision about pod eviction.
@@ -232,7 +232,7 @@ you are doing [manual node administration](#manual-node-administration), then yo
 capacity when adding a node.

 The Kubernetes scheduler ensures that there are enough resources for all the pods on a node.  It
-checks that the sum of the limits of containers on the node is no greater than the node capacity.  It
+checks that the sum of the requests of containers on the node is no greater than the node capacity.  It
 includes all containers started by the kubelet, but not containers started directly by Docker nor
 processes not in containers.

@@ -249,7 +249,7 @@ spec:
  - name: sleep-forever
    image: gcr.io/google_containers/pause:0.8.0
    resources:
-      limits:
+      requests:
        cpu: 100m
        memory: 100Mi
 ```
@@ -263,4 +263,4 @@ on each kubelet where you want to reserve resources.

 Node is a top-level resource in the Kubernetes REST API. More details about the
 API object can be found at: [Node API
-object](/docs/api-reference/v1.6/#node-v1-core).
+object](/docs/api-reference/{{page.version}}/#node-v1-core).
@@ -49,7 +49,7 @@ $ kubectl logs counter
 ...
 ```

-You can use `kubectl logs` to retrieve logs from a previous instantiation of a container with `--previous` flag, in case the container has crashed. If your pod has multiple containers, you should specify which container's logs you want to access by appending a container name to the command. See the [`kubectl logs` documentation](/docs/user-guide/kubectl/v1.6/#logs) for more details.
+You can use `kubectl logs` to retrieve logs from a previous instantiation of a container with `--previous` flag, in case the container has crashed. If your pod has multiple containers, you should specify which container's logs you want to access by appending a container name to the command. See the [`kubectl logs` documentation](/docs/user-guide/kubectl/{{page.version}}/#logs) for more details.

 ## Logging at the node level

@@ -77,7 +77,7 @@ As an example, you can find detailed information about how `kube-up.sh` sets
 up logging for COS image on GCP in the corresponding [script]
 [cosConfigureHelper].

-When you run [`kubectl logs`](/docs/user-guide/kubectl/v1.6/#logs) as in
+When you run [`kubectl logs`](/docs/user-guide/kubectl/{{page.version}}/#logs) as in
 the basic logging example, the kubelet on the node handles the request and
 reads directly from the log file, returning the contents in the response.
 **Note:** currently, if some external system has performed the rotation,
@@ -259,7 +259,7 @@ my-nginx-2035384211-u3t6x   1/1       Running   0          23m       fe

 This outputs all "app=nginx" pods, with an additional label column of pods' tier (specified with `-L` or `--label-columns`).

-For more information, please see [labels](/docs/user-guide/labels/) and [kubectl label](/docs/user-guide/kubectl/v1.6/#label) document.
+For more information, please see [labels](/docs/user-guide/labels/) and [kubectl label](/docs/user-guide/kubectl/{{page.version}}/#label) document.

 ## Updating annotations

@@ -276,7 +276,7 @@ metadata:
 ...
 ```

-For more information, please see [annotations](/docs/concepts/overview/working-with-objects/annotations/) and [kubectl annotate](/docs/user-guide/kubectl/v1.6/#annotate) document.
+For more information, please see [annotations](/docs/concepts/overview/working-with-objects/annotations/) and [kubectl annotate](/docs/user-guide/kubectl/{{page.version}}/#annotate) document.

 ## Scaling your application

@@ -304,7 +304,7 @@ deployment "my-nginx" autoscaled

 Now your nginx replicas will be scaled up and down as needed, automatically.

-For more information, please see [kubectl scale](/docs/user-guide/kubectl/v1.6/#scale), [kubectl autoscale](/docs/user-guide/kubectl/v1.6/#autoscale) and [horizontal pod autoscaler](/docs/tasks/run-application/horizontal-pod-autoscale/) document.
+For more information, please see [kubectl scale](/docs/user-guide/kubectl/{{page.version}}/#scale), [kubectl autoscale](/docs/user-guide/kubectl/v1.6/#autoscale) and [horizontal pod autoscaler](/docs/tasks/run-application/horizontal-pod-autoscale/) document.


 ## In-place updates of resources
@@ -315,7 +315,7 @@ Sometimes it's necessary to make narrow, non-disruptive updates to resources you

 It is suggested to maintain a set of configuration files in source control (see [configuration as code](http://martinfowler.com/bliki/InfrastructureAsCode.html)),
 so that they can be maintained and versioned along with the code for the resources they configure.
-Then, you can use [`kubectl apply`](/docs/user-guide/kubectl/v1.6/#apply) to push your configuration changes to the cluster.
+Then, you can use [`kubectl apply`](/docs/user-guide/kubectl/{{page.version}}/#apply) to push your configuration changes to the cluster.

 This command will compare the version of the configuration that you're pushing with the previous version and apply the changes you've made, without overwriting any automated changes to properties you haven't specified.

@@ -353,7 +353,7 @@ $ rm /tmp/nginx.yaml

 This allows you to do more significant changes more easily. Note that you can specify the editor with your `EDITOR` or `KUBE_EDITOR` environment variables.

-For more information, please see [kubectl edit](/docs/user-guide/kubectl/v1.6/#edit) document.
+For more information, please see [kubectl edit](/docs/user-guide/kubectl/{{page.version}}/#edit) document.

 ### kubectl patch

@@ -401,7 +401,7 @@ The patch is specified using json.

 The system ensures that you don't clobber changes made by other users or components by confirming that the `resourceVersion` doesn't differ from the version you edited. If you want to update regardless of other changes, remove the `resourceVersion` field when you edit the resource. However, if you do this, don't use your original configuration file as the source since additional fields most likely were set in the live state.

-For more information, please see [kubectl patch](/docs/user-guide/kubectl/v1.6/#patch) document.
+For more information, please see [kubectl patch](/docs/user-guide/kubectl/{{page.version}}/#patch) document.

 ## Disruptive updates

@@ -52,7 +52,7 @@ with privileged containers.
 **Note**: it is good practice to consider nodes with special sysctl settings as
 _tainted_ within a cluster, and only schedule pods onto them which need those
 sysctl settings. It is suggested to use the Kubernetes [_taints and toleration_
-feature](/docs/user-guide/kubectl/v1.6/#taint) to implement this.
+feature](/docs/user-guide/kubectl/{{page.version}}/#taint) to implement this.

 ## Safe vs. Unsafe Sysctls

@@ -222,7 +222,7 @@ marks that the node should not accept any pods that do not tolerate the taints.
 Tolerations are applied to pods, and allow (but do not require) the pods to schedule
 onto nodes with matching taints.

-You add a taint to a node using [kubectl taint](/docs/user-guide/kubectl/v1.6/#taint).
+You add a taint to a node using [kubectl taint](/docs/user-guide/kubectl/v1.7/#taint).
 For example,

 ```shell
@@ -348,7 +348,7 @@ pods that shouldn't be running. A few of the use cases are
 a particular set of users, you can add a taint to those nodes (say, 
 `kubectl taint nodes nodename dedicated=groupName:NoSchedule`) and then add a corresponding
 toleration to their pods (this would be done most easily by writing a custom
-[admission controller](https://kubernetes.io/docs/admin/admission-controllers/)).
+[admission controller](/docs/admin/admission-controllers/)).
 The pods with the tolerations will then be allowed to use the tainted (dedicated) nodes as
 well as any other nodes in the cluster. If you want to dedicate the nodes to them *and*
 ensure they *only* use the dedicated nodes, then you should additionally add a label similar
@@ -364,14 +364,14 @@ hardware (e.g. `kubectl taint nodes nodename special=true:NoSchedule` or
 `kubectl taint nodes nodename special=true:PreferNoSchedule`) and adding a corresponding
 toleration to pods that use the special hardware. As in the dedicated nodes use case,
 it is probably easiest to apply the tolerations using a custom
-[admission controller](https://kubernetes.io/docs/admin/admission-controllers/)).
+[admission controller](/docs/admin/admission-controllers/)).
 For example, the admission controller could use
 some characteristic(s) of the pod to determine that the pod should be allowed to use
 the special nodes and hence the admission controller should add the toleration.
 To ensure that the pods that need
 the special hardware *only* schedule onto the nodes that have the special hardware, you will need some
 additional mechanism, e.g. you could represent the special resource using
-[opaque integer resources](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#opaque-integer-resources-alpha-feature)
+[opaque integer resources](/docs/concepts/configuration/manage-compute-resources-container/#opaque-integer-resources-alpha-feature)
 and request it as a resource in the PodSpec, or you could label the nodes that have
 the special hardware and use node affinity on the pods that need the hardware.

@@ -397,7 +397,7 @@ is enabled (you can do this by including `TaintBasedEvictions=true` in `--featur
 `--feature-gates=FooBar=true,TaintBasedEvictions=true`), the taints are automatically
 added by the NodeController and the normal logic for evicting pods from nodes
 based on the Ready NodeCondition is disabled.
-(Note: To maintain the existing [rate limiting](https://kubernetes.io/docs/admin/node/#node-controller)
+(Note: To maintain the existing [rate limiting](/docs/concepts/architecture/nodes/)
 behavior of pod evictions due to node problems, the system actually adds the taints
 in a rate-limited way. This prevents massive pod evictions in scenarios such
 as the master becoming partitioned from the nodes.)
@@ -434,7 +434,7 @@ problems is detected is maintained.
 The two default tolerations are added by the [DefaultTolerationSeconds
 admission controller](https://git.k8s.io/kubernetes/plugin/pkg/admission/defaulttolerationseconds).

-[DaemonSet](https://kubernetes.io/docs/admin/daemons/) pods are created with
+[DaemonSet](/docs/concepts/workloads/controllers/daemonset/) pods are created with
 `NoExecute` tolerations for `node.alpha.kubernetes.io/unreachable` and `node.alpha.kubernetes.io/notReady`
 with no `tolerationSeconds`. This ensures that DaemonSet pods are never evicted due
 to these problems, which matches the behavior when this feature is disabled.
@@ -197,7 +197,7 @@ is pending with a message of this type, there are several things to try:
 - Add more nodes to the cluster.
 - Terminate unneeded Pods to make room for pending Pods.
 - Check that the Pod is not larger than all the nodes. For example, if all the
-  nodes have a capacity of `cpu: 1`, then a Pod with a limit of `cpu: 1.1` will
+  nodes have a capacity of `cpu: 1`, then a Pod with a request of `cpu: 1.1` will
  never be scheduled.

 You can check node capacities and amounts allocated with the
@@ -241,7 +241,7 @@ the node.

 The amount of resources available to Pods is less than the node capacity, because
 system daemons use a portion of the available resources. The `allocatable` field
-[NodeStatus](/docs/resources-reference/v1.6/#nodestatus-v1-core)
+[NodeStatus](/docs/resources-reference/{{page.version}}/#nodestatus-v1-core)
 gives the amount of resources that are available to Pods. For more information, see
 [Node Allocatable Resources](https://git.k8s.io/community/contributors/design-proposals/node-allocatable.md).

@@ -430,9 +430,9 @@ consistency across providers and platforms.
 * Get hands-on experience
 [assigning CPU and RAM resources to a container](/docs/tasks/configure-pod-container/assign-cpu-ram-container/).

-* [Container](/docs/api-reference/v1.6/#container-v1-core)
+* [Container](/docs/api-reference/{{page.version}}/#container-v1-core)

-* [ResourceRequirements](/docs/resources-reference/v1.6/#resourcerequirements-v1-core)
+* [ResourceRequirements](/docs/resources-reference/{{page.version}}/#resourcerequirements-v1-core)

 {% endcapture %}

@@ -69,7 +69,7 @@ This is a living document. If you think of something that is not on this list bu

  Note that the [Deployment](/docs/concepts/workloads/controllers/deployment/) object obviates the need to manage replication controller 'version names'. A desired state of an object is described by a Deployment, and if changes to that spec are _applied_, the deployment controller changes the actual state to the desired state at a controlled rate. (Deployment objects are currently part of the [`extensions` API Group](/docs/concepts/overview/kubernetes-api/#api-groups).)

- You can manipulate labels for debugging. Because Kubernetes replication controllers and services match to pods using labels, this allows you to remove a pod from being considereby a controller, or served traffic by a service, by removing the relevant selectolabels. If you remove the labels of an existing pod, its controller will create a new pod to takits place. This is a useful way to debug a previously "live" pod in a quarantine environmentSee the [`kubectl label`](/docs/concepts/overview/working-with-objects/labels/) command.
+- You can manipulate labels for debugging. Because Kubernetes replication controllers and services match to pods using labels, this allows you to remove a pod from being considered by a controller, or served traffic by a service, by removing the relevant selector labels. If you remove the labels of an existing pod, its controller will create a new pod to take its place. This is a useful way to debug a previously "live" pod in a quarantine environment. See the [`kubectl label`](/docs/concepts/overview/working-with-objects/labels/) command.

 ## Container Images

@@ -77,7 +77,9 @@ This is a living document. If you think of something that is not on this list bu

  That is, if you're specifying an image with other than the `:latest` tag, for example `myimage:v1`, and there is an image update to that same tag, the Kubelet won't pull the updated image. You can address this by ensuring that any updates to an image bump the image tag as well (for example, `myimage:v2`), and ensuring that your configs point to the correct version.

-  **Note:** you should avoid using `:latest` tag when deploying containers in production, because this makes it hard to track which version of the image is running and hard to roll back.
+  **Note:** You should avoid using `:latest` tag when deploying containers in production, because this makes it hard to track which version of the image is running and hard to roll back.
+
+- To work only with a specific version of an image, you can specify an image with its digest (SHA256). This approach guarantees that the image will never update. For detailed information about working with image digests, see [the Docker documentation](https://docs.docker.com/engine/reference/commandline/pull/#pull-an-image-by-digest-immutable-identifier).

 ## Using kubectl

@@ -124,7 +124,7 @@ The data field is a map.  Its keys must match
 [`DNS_SUBDOMAIN`](https://git.k8s.io/community/contributors/design-proposals/identifiers.md), except that leading dots are also
 allowed.  The values are arbitrary data, encoded using base64.

-Create the secret using [`kubectl create`](/docs/user-guide/kubectl/v1.6/#create):
+Create the secret using [`kubectl create`](/docs/user-guide/kubectl/v1.7/#create):

 ```shell
 $ kubectl create -f ./secret.yaml
@@ -23,7 +23,7 @@ With Kubernetes, you are able to quickly and efficiently respond to customer dem

 Our goal is to foster an ecosystem of components and tools that relieve the burden of running applications in public and private clouds.

-#### Kubernetes is:
+#### Kubernetes is

 * **Portable**: public, private, hybrid, multi-cloud
 * **Extensible**: modular, pluggable, hookable, composable
@@ -124,7 +124,7 @@ The name **Kubernetes** originates from Greek, meaning *helmsman* or *pilot*, an

 {% capture whatsnext %}
 *   Ready to [Get Started](/docs/getting-started-guides/)?
-*   For more details, see the [Kubernetes Documentation](/docs/user-guide/).
+*   For more details, see the [Kubernetes Documentation](/docs/home/).
 {% endcapture %}
 {% include templates/concept.md %}

@@ -40,7 +40,7 @@ Here's an example `.yaml` file that shows the required fields and object spec fo

 {% include code.html language="yaml" file="nginx-deployment.yaml" ghlink="/docs/concepts/overview/working-with-objects/nginx-deployment.yaml" %}

-One way to create a Deployment using a `.yaml` file like the one above is to use the [`kubectl create`](/docs/user-guide/kubectl/v1.6/#create) command in the `kubectl` command-line interface, passing the `.yaml` file as an argument. Here's an example:
+One way to create a Deployment using a `.yaml` file like the one above is to use the [`kubectl create`](/docs/user-guide/kubectl/v1.7/#create) command in the `kubectl` command-line interface, passing the `.yaml` file as an argument. Here's an example:

 ```shell
 $ kubectl create -f docs/user-guide/nginx-deployment.yaml --record
@@ -35,7 +35,6 @@ administrator to control the following:
 | The use of host ports                                         | `hostPorts`                       |
 | The use of host's PID namespace                               | `hostPID`                         |
 | The use of host's IPC namespace                               | `hostIPC`                         |
-| The use of host paths                                         | [`allowedHostPaths`](#allowed-host-paths)    |
 | The SELinux context of the container                          | [`seLinux`](#selinux)             |
 | The user ID                                                   | [`runAsUser`](#runasuser)         |
 | Configuring allowable supplemental groups                     | [`supplementalGroups`](#supplementalgroups) |
@@ -128,10 +127,7 @@ configMap, downwardAPI, emptyDir, persistentVolumeClaim, secret, and projected.

 ### Host Network
 - *HostPorts*, default `empty`. List of `HostPortRange`, defined by `min`(inclusive) and `max`(inclusive), which define the allowed host ports.
-
-### Allowed Host Paths
- - *AllowedHostPaths* is a white list of allowed host path prefixes. Empty indicates that all host paths may be used.
-
+ 
 ## Admission

 _Admission control_ with `PodSecurityPolicy` allows for control over the
@@ -208,4 +204,4 @@ following

 In Kubernetes 1.5 and newer, you can use PodSecurityPolicy to control access to privileged containers based on user role and groups. Access to different PodSecurityPolicy objects can be controlled via authorization. To limit access to PodSecurityPolicy objects for pods created via a Deployment, ReplicaSet, etc, the [Controller Manager](/docs/admin/kube-controller-manager/) must be run against the secured API port, and must not have superuser permissions.

-PodSecurityPolicy authorization uses the union of all policies available to the user creating the pod and the service account specified on the pod. When pods are created via a Deployment, ReplicaSet, etc, it is Controller Manager that creates the pod, so if it is running against the unsecured API port, all PodSecurityPolicy objects would be allowed, and you could not effectively subdivide access. Access to given PSP policies for a user will be effective only when deploying Pods directly. For more details, see the [PodSecurityPolicy RBAC example](https://git.k8s.io/kubernetes/examples/podsecuritypolicy/rbac/README.md) of applying PodSecurityPolicy to control access to privileged containers based on role and groups when deploying Pods directly.
+PodSecurityPolicy authorization uses the union of all policies available to the user creating the pod and the service account specified on the pod. When pods are created via a Deployment, ReplicaSet, etc, it is Controller Manager that creates the pod, so if it is running against the unsecured API port, all PodSecurityPolicy objects would be allowed, and you could not effectively subdivide access. Access to given PSP policies for a user will be effective only when deploying Pods directly. For more details, see the [PodSecurityPolicy RBAC example](https://git.k8s.io/examples/staging/podsecuritypolicy/rbac/README.md) of applying PodSecurityPolicy to control access to privileged containers based on role and groups when deploying Pods directly.
@@ -67,7 +67,7 @@ This is equivalent to `kubectl create -f` the following yaml:

 {% include code.html language="yaml" file="nginx-svc.yaml" ghlink="/docs/concepts/services-networking/nginx-svc.yaml" %}

-This specification will create a Service which targets TCP port 80 on any Pod with the `run: my-nginx` label, and expose it on an abstracted Service port (`targetPort`: is the port the container accepts traffic on, `port`: is the abstracted Service port, which can be any port other pods use to access the Service). View [service API object](/docs/api-reference/v1.6/#service-v1-core) to see the list of supported fields in service definition.
+This specification will create a Service which targets TCP port 80 on any Pod with the `run: my-nginx` label, and expose it on an abstracted Service port (`targetPort`: is the port the container accepts traffic on, `port`: is the abstracted Service port, which can be any port other pods use to access the Service). View [service API object](/docs/api-reference/{{page.version}}/#service-v1-core) to see the list of supported fields in service definition.
 Check your Service:

 ```shell
@@ -181,7 +181,7 @@ secret "nginxsecret" created
 $ kubectl get secrets
 NAME                  TYPE                                  DATA      AGE
 default-token-il9rc   kubernetes.io/service-account-token   1         1d
-nginxsecret           Opaque                                2         1m     
+nginxsecret           Opaque                                2         1m
 ```

 Now modify your nginx replicas to start an https server using the certificate in the secret, and the Service, to expose both ports (80 and 443):
@@ -51,7 +51,7 @@ selection from the set.
 #### SRV records

 SRV Records are created for named ports that are part of normal or [Headless
-Services](https://kubernetes.io/docs/user-guide/services/#headless-services).
+Services](/docs/concepts/services-networking/service/#headless-services).
 For each named port, the SRV record would have the form
 `_my-port-name._my-port-protocol.my-svc.my-namespace.svc.cluster.local`.
 For a regular service, this resolves to the port number and the CNAME:
@@ -60,6 +60,8 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
  name: test-ingress
+  annotations:
+    ingress.kubernetes.io/rewrite-target: /
 spec:
  rules:
  - http:
@@ -72,13 +74,13 @@ spec:

 *POSTing this to the API server will have no effect if you have not configured an [Ingress controller](#ingress-controllers).*

-__Lines 1-4__: As with all other Kubernetes config, an Ingress needs `apiVersion`, `kind`, and `metadata` fields.  For general information about working with config files, see [here](/docs/user-guide/deploying-applications), [here](/docs/user-guide/configuring-containers), and [here](/docs/user-guide/working-with-resources).
+__Lines 1-6__: As with all other Kubernetes config, an Ingress needs `apiVersion`, `kind`, and `metadata` fields.  For general information about working with config files, see [deploying applications](/docs/tasks/run-application/run-stateless-application-deployment/), [configuring containers](/docs/tasks/configure-pod-container/configmap/), [managing resources](/docs/concepts/cluster-administration/manage-deployment/) and [ingress configuration rewrite](https://github.com/kubernetes/ingress/blob/master/controllers/nginx/configuration.md#rewrite).

-__Lines 5-7__: Ingress [spec](https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status) has all the information needed to configure a loadbalancer or proxy server. Most importantly, it contains a list of rules matched against all incoming requests. Currently the Ingress resource only supports http rules.
+__Lines 7-9__: Ingress [spec](https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status) has all the information needed to configure a loadbalancer or proxy server. Most importantly, it contains a list of rules matched against all incoming requests. Currently the Ingress resource only supports http rules.

-__Lines 8-9__: Each http rule contains the following information: A host (e.g.: foo.bar.com, defaults to * in this example), a list of paths (e.g.: /testpath) each of which has an associated backend (test:80). Both the host and path must match the content of an incoming request before the loadbalancer directs traffic to the backend.
+__Lines 10-11__: Each http rule contains the following information: A host (e.g.: foo.bar.com, defaults to * in this example), a list of paths (e.g.: /testpath) each of which has an associated backend (test:80). Both the host and path must match the content of an incoming request before the loadbalancer directs traffic to the backend.

-__Lines 10-12__: A backend is a service:port combination as described in the [services doc](/docs/user-guide/services). Ingress traffic is typically sent directly to the endpoints matching a backend.
+__Lines 12-14__: A backend is a service:port combination as described in the [services doc](/docs/concepts/services-networking/service/). Ingress traffic is typically sent directly to the endpoints matching a backend.

 __Global Parameters__: For the sake of simplicity the example Ingress has no global parameters, see the [api-reference](https://releases.k8s.io/{{page.githubbranch}}/pkg/apis/extensions/v1beta1/types.go) for a full definition of the resource. One can specify a global default backend in the absence of which requests that don't match a path in the spec are sent to the default backend of the Ingress controller.

@@ -124,6 +126,8 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
  name: test
+  annotations:
+    ingress.kubernetes.io/rewrite-target: /
 spec:
  rules:
  - host: foo.bar.com
@@ -28,7 +28,7 @@ Pods become isolated by having a NetworkPolicy that selects them. Once there is

 ## The `NetworkPolicy` Resource

-See the [api-reference](/docs/api-reference/networking/v1/definitions/#_v1_networkpolicy) for a full definition of the resource.
+See the [api-reference](/docs/api-reference/{{page.version}}/#networkpolicy-v1-networking) for a full definition of the resource.

 An example `NetworkPolicy` might look like this:

@@ -51,7 +51,7 @@ spec:
        matchLabels:
          role: frontend
    ports:
-    - protocol: tcp
+    - protocol: TCP
      port: 6379
 ```

@@ -78,7 +78,7 @@ See the [NetworkPolicy getting started guide](/docs/getting-started-guides/netwo
 You can create a "default" isolation policy for a Namespace by creating a NetworkPolicy that selects all pods but does not allow any traffic:

 ```yaml
-apiVersion: networking/v1
+apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
  name: default-deny
@@ -91,7 +91,7 @@ This ensures that even pods that aren't selected by any other NetworkPolicy will
 Alternatively, if you want to allow all traffic for all pods in a Namespace (even if policies are added that cause some pods to be treated as "isolated"), you can create a policy that explicitly allows all traffic:

 ```yaml
-apiVersion: networking/v1
+apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
  name: allow-all
@@ -100,3 +100,8 @@ spec:
  ingress:
  - {}
 ```
+
+## What's next?
+
+- See the [Declare Network Policy](/docs/tasks/administer-cluster/declare-network-policy/)
+  walkthrough for further examples.
@@ -10,7 +10,7 @@ redirect_from:
 Kubernetes [`Pods`](/docs/user-guide/pods) are mortal. They are born and when they die, they
 are not resurrected.  [`ReplicationControllers`](/docs/user-guide/replication-controller) in
 particular create and destroy `Pods` dynamically (e.g. when scaling up or down
-or when doing [rolling updates](/docs/user-guide/kubectl/v1.6/#rolling-update)).  While each `Pod` gets its own IP address, even
+or when doing [rolling updates](/docs/user-guide/kubectl/v1.7/#rolling-update)).  While each `Pod` gets its own IP address, even
 those IP addresses cannot be relied upon to be stable over time. This leads to
 a problem: if some set of `Pods` (let's call them backends) provides
 functionality to other `Pods` (let's call them frontends) inside the Kubernetes
@@ -427,10 +427,18 @@ with the user-specified `loadBalancerIP`. If the `loadBalancerIP` field is not s
 an ephemeral IP will be assigned to the loadBalancer. If the `loadBalancerIP` is specified, but the
 cloud provider does not support the feature, the field will be ignored.

-#### Internal load balancer on AWS
-In a mixed environment it is sometimes necessary to route traffic from services inside the same VPC.
-This can be achieved by adding the following annotation to the service:
+Special notes for Azure: To use user-specified public type `loadBalancerIP`, a static type
+public IP address resource needs to be created first, and it should be in the same resource
+group of the cluster. Then you could specify the assigned IP address as `loadBalancerIP`.

+#### Internal load balancer
+In a mixed environment it is sometimes necessary to route traffic from services inside the same VPC.
+
+In a split-horizon DNS environment you would need two services to be able to route both external and internal traffic to your endpoints.
+
+This can be achieved by adding the following annotations to the service based on cloud provider.
+
+For AWS:
 ```yaml
 [...]
 metadata: 
@@ -439,7 +447,16 @@ metadata:
        service.beta.kubernetes.io/aws-load-balancer-internal: 0.0.0.0/0
 [...]
 ```
-In a split-horizon DNS environment you would need two services to be able to route both external and internal traffic to your endpoints.
+
+For Azure:
+```yaml
+[...]
+metadata: 
+    name: my-service
+    annotations: 
+        service.beta.kubernetes.io/azure-load-balancer-internal: "true"
+[...]
+```


 #### SSL support on AWS
@@ -612,7 +629,7 @@ through a load-balancer, though in those cases the client IP does get altered.

 Service is a top-level resource in the Kubernetes REST API. More details about the
 API object can be found at: [Service API
-object](/docs/api-reference/v1.6/#service-v1-core).
+object](/docs/api-reference/{{page.version}}/#service-v1-core).

 ## For More Information

@@ -67,13 +67,17 @@ Pods use claims as volumes. The cluster inspects the claim to find the bound vol

 Once a user has a claim and that claim is bound, the bound PV belongs to the user for as long as they need it. Users schedule Pods and access their claimed PVs by including a persistentVolumeClaim in their Pod's volumes block. [See below for syntax details](#claims-as-volumes).

-### Releasing
-
-When a user is done with their volume, they can delete the PVC objects from the API which allows reclamation of the resource.  The volume is considered "released" when the claim is deleted, but it is not yet available for another claim.  The previous claimant's data remains on the volume which must be handled according to policy.
-
 ### Reclaiming

-The reclaim policy for a `PersistentVolume` tells the cluster what to do with the volume after it has been released of its claim.  Currently, volumes can either be Retained, Recycled or Deleted.  Retention allows for manual reclamation of the resource.  For those volume plugins that support it, deletion removes both the `PersistentVolume` object from Kubernetes, as well as deleting the associated storage asset in external infrastructure (such as an AWS EBS, GCE PD, Azure Disk, or Cinder volume).  Volumes that were dynamically provisioned are always deleted.
+When a user is done with their volume, they can delete the PVC objects from the API which allows reclamation of the resource. The reclaim policy for a `PersistentVolume` tells the cluster what to do with the volume after it has been released of its claim. Currently, volumes can either be Retained, Recycled or Deleted.
+
+#### Retaining
+
+The Retain reclaim policy allows for manual reclamation of the resource. When the `PersistentVolumeClaim` is deleted, the `PersistentVolume` still exists and the volume is considered "released". But it is not yet available for another claim because the previous claimant's data remains on the volume. An administrator can manually reclaim the volume with the following steps.
+
+1. Delete the `PersistentVolume`. The associated storage asset in external infrastructure (such as an AWS EBS, GCE PD, Azure Disk, or Cinder volume) still exists after the PV is deleted.
+1. Manually clean up the data on the associated storage asset accordingly.
+1. Manually delete the associated storage asset, or if you want to reuse the same storage asset, create a new `PersistentVolume` with the storage asset definition.

 #### Recycling

@@ -104,6 +108,10 @@ spec:

 However, the particular path specified in the custom recycler pod template in the `volumes` part is replaced with the particular path of the volume that is being recycled.

+#### Deleting
+
+For volume plugins that support the Delete reclaim policy, deletion removes both the `PersistentVolume` object from Kubernetes, as well as deleting the associated storage asset in the external infrastructure, such as an AWS EBS, GCE PD, Azure Disk, or Cinder volume. Volumes that were dynamically provisioned are always deleted. If that is not desired, currently, the only option is to edit or patch the PV after it is created. See [Change the Reclaim Policy of a PersistentVolume](https://kubernetes.io/docs/tasks/administer-cluster/change-pv-reclaim-policy/).
+
 ## Types of Persistent Volumes

 `PersistentVolume` types are implemented as plugins.  Kubernetes currently supports the following plugins:
@@ -416,7 +424,7 @@ for provisioning PVs. This field must be specified.
 | Volume Plugin        | Internal Provisioner| Config Example                       |
 | :---                 |     :---:           |    :---:                             |
 | AWSElasticBlockStore | &#x2713;            | [AWS](#aws)                          |
-| AzureFile            | &#x2713;            | -                                    |
+| AzureFile            | &#x2713;            | [Azure File](#azure-file)            |
 | AzureDisk            | &#x2713;            | [Azure Disk](#azure-disk)            |
 | CephFS               | -                   | -                                    |
 | Cinder               | &#x2713;            | [OpenStack Cinder](#openstack-cinder)|
@@ -563,7 +571,7 @@ parameters:
  availability: nova
 ```

-* `type`: [VolumeType](http://docs.openstack.org/admin-guide/dashboard-manage-volumes.html) created in Cinder. Default is empty.
+* `type`: [VolumeType](https://docs.openstack.org/user-guide/dashboard-manage-volumes.html) created in Cinder. Default is empty.
 * `availability`: Availability Zone. If not specified, volumes are generally round-robin-ed across all active zones where Kubernetes cluster has a node.

 #### vSphere
@@ -706,6 +714,27 @@ parameters:
 * `location`: Azure storage account location. Default is empty.
 * `storageAccount`: Azure storage account name. If storage account is not provided, all storage accounts associated with the resource group are searched to find one that matches `skuName` and `location`. If storage account is provided, it must reside in the same resource group as the cluster, and `skuName` and `location` are ignored.

+#### Azure File
+
+```yaml
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+  name: azurefile
+provisioner: kubernetes.io/azure-file
+parameters:
+  skuName: Standard_LRS
+  location: eastus
+  storageAccount: azure_storage_account_name
+```
+
+* `skuName`: Azure storage account Sku tier. Default is empty.
+* `location`: Azure storage account location. Default is empty.
+* `storageAccount`: Azure storage account name.  Default is empty.
+If storage account is not provided, all storage accounts associated with the resource group are searched to find one that matches `skuName` and `location`. If storage account is provided, it must reside in the same resource group as the cluster, and `skuName` and `location` are ignored.
+
+During provision, a secret will be created for mounting credentials. If the cluster has enabled both [RBAC](/docs/admin/authorization/rbac/) and [Controller Roles](/docs/admin/authorization/rbac/#controller-roles), you will first need to add `create` permission of resource `secret` for clusterrole `system:controller:persistent-volume-binder`.
+ 
 #### Portworx Volume

 ```yaml
@@ -753,11 +782,11 @@ parameters:
 * `protectionDomain`: the name of the ScaleIO protection domain
 * `storagePool`: the name of the volume storage pool
 * `storageMode`: the storage provision mode: `ThinProvisionned` (default) or `ThickProvisionned`
-* `secretRef`: reference to a configuered Secret object (required, see detail below)
+* `secretRef`: reference to a configured Secret object (required, see detail below)
 * `readOnly`: specifies the access mode to the mounted volume
 * `fsType`: the file system to use for the volume

-The ScaleIO Kubernetes volume plugin requires a configuered Secret object. 
+The ScaleIO Kubernetes volume plugin requires a configured Secret object. 
 The secret must be created with type `kubernetes.io/scaleio` and use the same namespace value as that of the PVC where it is referenced
 as shown in the following command:

@@ -42,7 +42,7 @@ A Kubernetes volume, on the other hand, has an explicit lifetime - the same as
 the pod that encloses it.  Consequently, a volume outlives any containers that run
 within the Pod, and data is preserved across Container restarts. Of course, when a
 Pod ceases to exist, the volume will cease to exist, too.  Perhaps more
-importantly than this, Kubernetes supports many type of volumes, and a Pod can
+importantly than this, Kubernetes supports many types of volumes, and a Pod can
 use any number of them simultaneously.

 At its core, a volume is just a directory, possibly with some data in it, which
@@ -575,7 +575,7 @@ More details can be found [here](https://github.com/kubernetes/kubernetes/tree/{
 ### vsphereVolume

 __Prerequisite: Kubernetes with vSphere Cloud Provider configured.
-For cloudprovider configuration please refer [vSphere getting started guide](http://kubernetes.io/docs/getting-started-guides/vsphere/).__
+For cloudprovider configuration please refer [vSphere getting started guide](/docs/getting-started-guides/vsphere/).__

 A `vsphereVolume` is used to mount a vSphere VMDK Volume into your Pod.  The contents
 of a volume are preserved when it is unmounted. It supports both VMFS and VSAN datastore.
@@ -785,6 +785,9 @@ spec:
      path: /mnt/disks/ssd1
 ```

+Note that local PersistentVolume cleanup and deletion requires manual
+intervention without the external provisioner.
+
 For details on the `local` volume type, see the [Local Persistent Storage 
 user guide](https://github.com/kubernetes-incubator/external-storage/tree/master/local-volume)

@@ -21,7 +21,7 @@ Some typical uses of a DaemonSet are:
 - running a cluster storage daemon, such as `glusterd`, `ceph`, on each node.
 - running a logs collection daemon on every node, such as `fluentd` or `logstash`.
 - running a node monitoring daemon on every node, such as [Prometheus Node Exporter](
-  https://github.com/prometheus/node_exporter), `collectd`, New Relic agent, or Ganglia `gmond`.
+  https://github.com/prometheus/node_exporter), `collectd`, Datadog agent, New Relic agent, or Ganglia `gmond`.

 In a simple case, one DaemonSet, covering all nodes, would be used for each type of daemon.
 A more complex setup might use multiple DaemonSets for a single type of daemon, but with
@@ -106,7 +106,7 @@ Some possible patterns for communicating with pods in a DaemonSet are:

 - **Push**: Pods in the DaemonSet are configured to send updates to another service, such
  as a stats database.  They do not have clients.
- **NodeIP and Known Port**: Pods in the DaemonSet use a `hostPort`, so that the pods are reachable via the node IPs.  Clients know the list of nodes ips somehow, and know the port by convention.
+- **NodeIP and Known Port**: Pods in the DaemonSet can use a `hostPort`, so that the pods are reachable via the node IPs.  Clients know the list of nodes ips somehow, and know the port by convention.
 - **DNS**: Create a [headless service](/docs/user-guide/services/#headless-services) with the same pod selector,
  and then discover DaemonSets using the `endpoints` resource or retrieve multiple A records from
  DNS.
@@ -394,7 +394,7 @@ $ kubectl rollout undo deployment/nginx-deployment --to-revision=2
 deployment "nginx-deployment" rolled back
 ```

-For more details about rollout related commands, read [`kubectl rollout`](/docs/user-guide/kubectl/v1.6/#rollout).
+For more details about rollout related commands, read [`kubectl rollout`](/docs/user-guide/kubectl/{{page.version}}/#rollout).

 The Deployment is now rolled back to a previous stable revision. As you can see, a `DeploymentRollback` event
 for rolling back to revision 2 is generated from Deployment controller.
@@ -526,13 +526,13 @@ deployment "nginx-deployment" paused

 Then update the image of the Deployment:
 ```shell
-$ kubectl set image deploy/nginx nginx=nginx:1.9.1
+$ kubectl set image deploy/nginx-deployment nginx=nginx:1.9.1
 deployment "nginx-deployment" image updated
 ```

 Notice that no new rollout started:
 ```shell
-$ kubectl rollout history deploy/nginx
+$ kubectl rollout history deploy/nginx-deployment
 deployments "nginx"
 REVISION  CHANGE-CAUSE
 1   <none>
@@ -553,7 +553,7 @@ the Deployment will not have any effect as long as the Deployment is paused.

 Eventually, resume the Deployment and observe a new ReplicaSet coming up with all the new updates:
 ```shell
-$ kubectl rollout resume deploy nginx
+$ kubectl rollout resume deploy/nginx-deployment
 deployment "nginx" resumed
 $ kubectl get rs -w
 NAME               DESIRED   CURRENT   READY     AGE
@@ -609,7 +609,7 @@ You can check if a Deployment has completed by using `kubectl rollout status`. I
 successfully, `kubectl rollout status` returns a zero exit code.

 ```shell
-$ kubectl rollout status deploy/nginx
+$ kubectl rollout status deploy/nginx-deployment
 Waiting for rollout to finish: 2 of 3 updated replicas are available...
 deployment "nginx" successfully rolled out
 $ echo $?
@@ -738,7 +738,7 @@ You can check if a Deployment has failed to progress by using `kubectl rollout s
 returns a non-zero exit code if the Deployment has exceeded the progression deadline.

 ```shell
-$ kubectl rollout status deploy/nginx
+$ kubectl rollout status deploy/nginx-deployment
 Waiting for rollout to finish: 2 out of 3 new replicas have been updated...
 error: deployment "nginx" exceeded its progress deadline
 $ echo $?
@@ -914,6 +914,6 @@ it is created.

 ### kubectl rolling update

-[Kubectl rolling update](/docs/user-guide/kubectl/v1.6/#rolling-update) updates Pods and ReplicationControllers
+[Kubectl rolling update](/docs/user-guide/kubectl/{{page.version}}/#rolling-update) updates Pods and ReplicationControllers
 in a similar fashion. But Deployments are recommended, since they are declarative, server side, and have
 additional features, such as rolling back to any previous revision even after the rolling update is done.
@@ -381,4 +381,4 @@ object, but complete control over what pods are created and how work is assigned

 ## Cron Jobs

-Support for creating Jobs at specified times/dates (i.e. cron) is available in Kubernetes [1.4](https://github.com/kubernetes/kubernetes/pull/11980). More information is available in the [cron job documents](http://kubernetes.io/docs/user-guide/cron-jobs/)
+Support for creating Jobs at specified times/dates (i.e. cron) is available in Kubernetes [1.4](https://github.com/kubernetes/kubernetes/pull/11980). More information is available in the [cron job documents](/docs/concepts/workloads/controllers/cron-jobs/)
@@ -149,7 +149,7 @@ pvc-902733c2-3717-11e6-a46e-42010af00002   1Gi        RWO           Bound     de

 ### Network identity

-The network identity has 2 parts. First, we created a headless Service that controls the domain within which we create Pets. The domain managed by this Service takes the form: `$(service name).$(namespace).svc.cluster.local`, where "cluster.local" is the [cluster domain](http://releases.k8s.io/{{page.githubbranch}}/build/kube-dns/README.md#how-do-i-configure-it). As each pet is created, it gets a matching DNS subdomain, taking the form: `$(petname).$(governing service domain)`, where the governing service is defined by the `serviceName` field on the PetSet.
+The network identity has 2 parts. First, we created a headless Service that controls the domain within which we create Pets. The domain managed by this Service takes the form: `$(service name).$(namespace).svc.cluster.local`, where "cluster.local" is the [cluster domain](/docs/concepts/services-networking/dns-pod-service/). As each pet is created, it gets a matching DNS subdomain, taking the form: `$(petname).$(governing service domain)`, where the governing service is defined by the `serviceName` field on the PetSet.

 Here are some examples of choices for Cluster Domain, Service name, PetSet name, and how that affects the DNS names for the Pets and the hostnames in the Pet's pods:

@@ -159,7 +159,7 @@ Cluster Domain | Service (ns/name) | PetSet (ns/name)  | PetSet Domain  | Pet DN
 cluster.local | foo/nginx         | foo/web           | nginx.foo.svc.cluster.local     | web-{0..N-1}.nginx.foo.svc.cluster.local     | web-{0..N-1} |
 kube.local    | foo/nginx         | foo/web           | nginx.foo.svc.kube.local        | web-{0..N-1}.nginx.foo.svc.kube.local        | web-{0..N-1} |

-Note that Cluster Domain will be set to `cluster.local` unless [otherwise configured](http://releases.k8s.io/{{page.githubbranch}}/build/kube-dns/README.md#how-do-i-configure-it).
+Note that Cluster Domain will be set to `cluster.local` unless [otherwise configured](https://github.com/kubernetes/kubernetes/blob/master/examples/cluster-dns/README.md).

 Let's verify our assertion with a simple test.

@@ -23,12 +23,12 @@ whereas a Replication Controller only supports equality-based selector requireme

 Most [`kubectl`](/docs/user-guide/kubectl/) commands that support
 Replication Controllers also support ReplicaSets. One exception is the
-[`rolling-update`](/docs/user-guide/kubectl/v1.6/#rolling-update) command. If
+[`rolling-update`](/docs/user-guide/kubectl/{{page.version}}/#rolling-update) command. If
 you want the rolling update functionality please consider using Deployments
 instead. Also, the
-[`rolling-update`](/docs/user-guide/kubectl/v1.6/#rolling-update) command is
+[`rolling-update`](/docs/user-guide/kubectl/{{page.version}}/#rolling-update) command is
 imperative whereas Deployments are declarative, so we recommend using Deployments
-through the [`rollout`](/docs/user-guide/kubectl/v1.6/#rollout) command.
+through the [`rollout`](/docs/user-guide/kubectl/{{page.version}}/#rollout) command.

 While ReplicaSets can be used independently, today it's mainly used by
 [Deployments](/docs/concepts/workloads/controllers/deployment/) as a mechanism to orchestrate pod
@@ -149,7 +149,7 @@ If you do not specify `.spec.replicas`, then it defaults to 1.
 ### Deleting a ReplicationController and its Pods

 To delete a ReplicationController and all its pods, use [`kubectl
-delete`](/docs/user-guide/kubectl/v1.6/#delete).  Kubectl will scale the ReplicationController to zero and wait
+delete`](/docs/user-guide/kubectl/{{page.version}}/#delete).  Kubectl will scale the ReplicationController to zero and wait
 for it to delete each pod before deleting the ReplicationController itself.  If this kubectl
 command is interrupted, it can be restarted.

@@ -160,7 +160,7 @@ When using the REST API or go client library, you need to do the steps explicitl

 You can delete a ReplicationController without affecting any of its pods.

-Using kubectl, specify the `--cascade=false` option to [`kubectl delete`](/docs/user-guide/kubectl/v1.6/#delete).
+Using kubectl, specify the `--cascade=false` option to [`kubectl delete`](/docs/user-guide/kubectl/{{page.version}}/#delete).

 When using the REST API or go client library, simply delete the ReplicationController object.

@@ -194,7 +194,7 @@ Ideally, the rolling update controller would take application readiness into acc
 The two ReplicationControllers would need to create pods with at least one differentiating label, such as the image tag of the primary container of the pod, since it is typically image updates that motivate rolling updates.

 Rolling update is implemented in the client tool
-[`kubectl rolling-update`](/docs/user-guide/kubectl/v1.6/#rolling-update). Visit [`kubectl rolling-update` task](/docs/tasks/run-application/rolling-update-replication-controller/) for more concrete examples. 
+[`kubectl rolling-update`](/docs/user-guide/kubectl/{{page.version}}/#rolling-update). Visit [`kubectl rolling-update` task](/docs/tasks/run-application/rolling-update-replication-controller/) for more concrete examples. 

 ### Multiple release tracks

@@ -226,7 +226,7 @@ The ReplicationController is intended to be a composable building-block primitiv

 Replication controller is a top-level resource in the Kubernetes REST API. More details about the
 API object can be found at: [ReplicationController API
-object](/docs/api-reference/v1.6/#replicationcontroller-v1-core).
+object](/docs/api-reference/{{page.version}}/#replicationcontroller-v1-core).

 ## Alternatives to ReplicationController

@@ -102,7 +102,7 @@ voluntary disruptions.  For example, a quorum-based application would
 like to ensure that the number of replicas running is never brought below the
 number needed for a quorum. A web front end might want to
 ensure that the number of replicas serving load never falls below a certain
-percentage of the total.  
+percentage of the total.

 Cluster managers and hosting providers should use tools which
 respect Pod Disruption Budgets by calling the [Eviction API](/docs/tasks/administer-cluster/safely-drain-node/#the-eviction-api)
@@ -136,7 +136,7 @@ during application updates is configured in the controller spec.
 (Learn about [updating a deployment](/docs/concepts/cluster-administration/manage-deployment/#updating-your-application-without-a-service-outage).)

 When a pod is evicted using the eviction API, it is gracefully terminated (see
-`terminationGracePeriodSeconds` in [PodSpec](/docs/resources-reference/v1.6/#podspec-v1-core).)
+`terminationGracePeriodSeconds` in [PodSpec](/docs/resources-reference/{{page.version}}/#podspec-v1-core).)

 ## PDB Example

@@ -200,14 +200,14 @@ The cluster state now looks like this:
 |                      | pod-d *available*   | pod-y              |

 Now, the cluster admin tries to drain `node-2`.
-The drain command will try to evict the two pods in some order, say 
+The drain command will try to evict the two pods in some order, say
 `pod-b` first and then `pod-d`.  It will succeed at evicting `pod-b`.
 But, when it tries to evict `pod-d`, it will be refused because that would leave only
 one pod available for the deployment.

 The deployment creates a replacement for `pod-b` called `pod-e`.
 However, not there are not enough resources in the cluster to schedule
-`pod-e`.  So, the drain  then the drain will block.  The cluster may end up in this
+`pod-e`.  So, the drain will again block.  The cluster may end up in this
 state:

 |    node-1 *drained*  |       node-2        |       node-3       | *no node*          |
@@ -234,7 +234,7 @@ and Application Owner as separate roles with limited knowledge
 of each other.   This separation of responsibilities
 may make sense in these scenarios:

- when there are many application teams sharing a Kubernetes cluster, and 
+- when there are many application teams sharing a Kubernetes cluster, and
  there is natural specialization of roles
 - when third-party tools or services are used to automate cluster management

@@ -244,12 +244,12 @@ interface between the roles.
 If you do not have such a separation of responsibilities in your organization,
 you may not need to use Pod Disruption Budgets.

-## How to perform Distruptive Actions your Cluster
+## How to perform Disruptive Actions on your Cluster

 If you are a Cluster Administrator, and you need to perform a disruptive action on all
 the nodes in your cluster, such as a node or system software upgrade, here are some options:

- Accept downtime during the upgrade. 
+- Accept downtime during the upgrade.
 - Fail over to another complete replica cluster.
   -  No downtime, but may be costly both for the duplicated nodes,
     and for human effort to orchestrate the switchover.
@@ -270,7 +270,7 @@ the nodes in your cluster, such as a node or system software upgrade, here are s

 * Learn more about [draining nodes](/docs/tasks/administer-cluster//safely-drain-node.md)

-{% endcapture %} 
+{% endcapture %}


 {% include templates/concept.md %}
@@ -36,7 +36,7 @@ Init Containers are exactly like regular Containers, except:
 If an Init Container fails for a Pod, Kubernetes restarts the Pod repeatedly until the Init
 Container succeeds. However, if the Pod has a `restartPolicy` of Never, it is not restarted.

-To specify a Container as an Init Container, add the `initContainers` field on the PodSpec as a JSON array of objects of type [v1.Container](/docs/api-reference/v1.6/#container-v1-core) alongside the app `containers` array.
+To specify a Container as an Init Container, add the `initContainers` field on the PodSpec as a JSON array of objects of type [v1.Container](/docs/api-reference/{{page.version}}/#container-v1-core) alongside the app `containers` array.
 The status of the init containers is returned in `status.initContainerStatuses`
 field as an array of the container statuses (similar to the `status.containerStatuses`
 field).
@@ -185,7 +185,7 @@ pod "myapp-pod" created
 $ kubectl get -f myapp.yaml
 NAME        READY     STATUS     RESTARTS   AGE
 myapp-pod   0/1       Init:0/2   0          6m
-$ kubectl describe -f myapp.yaml 
+$ kubectl describe -f myapp.yaml
 Name:          myapp-pod
 Namespace:     default
 [...]
@@ -20,7 +20,7 @@ This page describes the lifecycle of a Pod.
 ## Pod phase

 A Pod's `status` field is a
-[PodStatus](/docs/resources-reference/v1.6/#podstatus-v1-core)
+[PodStatus](/docs/resources-reference/{{page.version}}/#podstatus-v1-core)
 object, which has a `phase` field.

 The phase of a Pod is a simple, high-level summary of where the Pod is in its
@@ -55,7 +55,7 @@ Here are the possible values for `phase`:
 ## Pod conditions

 A Pod has a PodStatus, which has an array of
-[PodConditions](/docs/resources-reference/v1.6/#podcondition-v1-core). Each element
+[PodConditions](/docs/resources-reference/{{page.version}}/#podcondition-v1-core). Each element
 of the PodCondition array has a `type` field and a `status` field. The `type`
 field is a string, with possible values PodScheduled, Ready, Initialized, and
 Unschedulable. The `status` field is a string, with possible values True, False,
@@ -63,22 +63,22 @@ and Unknown.

 ## Container probes

-A [Probe](/docs/resources-reference/v1.6/#probe-v1-core) is a diagnostic
+A [Probe](/docs/resources-reference/{{page.version}}/#probe-v1-core) is a diagnostic
 performed periodically by the [kubelet](/docs/admin/kubelet/)
 on a Container. To perform a diagnostic,
 the kubelet calls a
 [Handler](https://godoc.org/k8s.io/kubernetes/pkg/api/v1#Handler) implemented by
 the Container. There are three types of handlers:

-* [ExecAction](/docs/resources-reference/v1.6/#execaction-v1-core):
+* [ExecAction](/docs/resources-reference/{{page.version}}/#execaction-v1-core):
  Executes a specified command inside the Container. The diagnostic
  is considered successful if the command exits with a status code of 0.

-* [TCPSocketAction](/docs/resources-reference/v1.6/#tcpsocketaction-v1-core):
+* [TCPSocketAction](/docs/resources-reference/{{page.version}}/#tcpsocketaction-v1-core):
  Performs a TCP check against the Container's IP address on
  a specified port. The diagnostic is considered successful if the port is open.

-* [HTTPGetAction](/docs/resources-reference/v1.6/#httpgetaction-v1-core):
+* [HTTPGetAction](/docs/resources-reference/{{page.version}}/#httpgetaction-v1-core):
  Performs an HTTP Get request against the Container's IP
  address on a specified port and path. The diagnostic is considered successful
  if the response has a status code greater than or equal to 200 and less than 400.
@@ -132,11 +132,11 @@ to stop.
 ## Pod and Container status

 For detailed information about Pod Container status, see
-[PodStatus](/docs/resources-reference/v1.6/#podstatus-v1-core)
+[PodStatus](/docs/resources-reference/{{page.version}}/#podstatus-v1-core)
 and
-[ContainerStatus](/docs/resources-reference/v1.6/#containerstatus-v1-core).
+[ContainerStatus](/docs/resources-reference/{{page.version}}/#containerstatus-v1-core).
 Note that the information reported as Pod status depends on the current
-[ContainerState](/docs/resources-reference/v1.6/#containerstatus-v1-core).
+[ContainerState](/docs/resources-reference/{{page.version}}/#containerstatus-v1-core).

 ## Restart policy

@@ -17,7 +17,7 @@ managed in Kubernetes.

 A _pod_ (as in a pod of whales or pea pod) is a group of one or more containers
 (such as Docker containers), the shared storage for those containers, and
-options about how to run the containers.  Pods are always co-located and
+options about how to run the containers.  A pod's contents are always co-located and
 co-scheduled, and run in a shared context.  A pod models an
 application-specific "logical host" - it contains one or more application
 containers which are relatively tightly coupled &mdash; in a pre-container
@@ -153,7 +153,7 @@ Pod is exposed as a primitive in order to facilitate:
 * clean composition of Kubelet-level functionality with cluster-level functionality &mdash; Kubelet is effectively the "pod controller"
 * high-availability applications, which will expect pods to be replaced in advance of their termination and certainly in advance of deletion, such as in the case of planned evictions, image prefetching, or live pod migration [#3949](http://issue.k8s.io/3949)

-There is new first-class support for stateful pods with the [StatefulSet](/docs/concepts/abstractions/controllers/statefulsets/) controller (currently in beta). The feature was alpha in 1.4 and was called [PetSet](/docs/concepts/workloads/controllers/petset/). For prior versions of Kubernetes, best practice for having stateful pods is to create a replication controller with `replicas` equal to `1` and a corresponding service, see [this MySQL deployment example](/docs/tutorials/stateful-application/run-stateful-application/). 
+There is new first-class support for stateful pods with the [StatefulSet](/docs/concepts/abstractions/controllers/statefulsets/) controller (currently in beta). The feature was alpha in 1.4 and was called [PetSet](/docs/concepts/workloads/controllers/petset/). For prior versions of Kubernetes, best practice for having stateful pods is to create a replication controller with `replicas` equal to `1` and a corresponding service, see [this MySQL deployment example](/docs/tutorials/stateful-application/run-stateful-application/).

 ## Termination of Pods

@@ -171,13 +171,13 @@ An example flow:
 6. When the grace period expires, any processes still running in the Pod are killed with SIGKILL.
 7. The Kubelet will finish deleting the Pod on the API server by setting grace period 0 (immediate deletion). The Pod disappears from the API and is no longer visible from the client.

-By default, all deletes are graceful within 30 seconds. The `kubectl delete` command supports the `--grace-period=<seconds>` option which allows a user to override the default and specify their own value. The value `0` [force deletes](/docs/user-guide/pods/#force-termination-of-pods) the pod. In kubectl version >= 1.5, you must specify an additional flag `--force` along with `--grace-period=0` in order to perform force deletions.
+By default, all deletes are graceful within 30 seconds. The `kubectl delete` command supports the `--grace-period=<seconds>` option which allows a user to override the default and specify their own value. The value `0` [force deletes](/docs/concepts/workloads/pods/pod/#force-deletion-of-pods) the pod. In kubectl version >= 1.5, you must specify an additional flag `--force` along with `--grace-period=0` in order to perform force deletions.

 ### Force deletion of pods

 Force deletion of a pod is defined as deletion of a pod from the cluster state and etcd immediately. When a force deletion is performed, the apiserver does not wait for confirmation from the kubelet that the pod has been terminated on the node it was running on. It removes the pod in the API immediately so a new pod can be created with the same name. On the node, pods that are set to terminate immediately will still be given a small grace period before being force killed.

-Force deletions can be potentially dangerous for some pods and should be performed with caution. In case of StatefulSet pods, please refer to the task documentation for [deleting Pods from a StatefulSet](/docs/tasks/manage-stateful-set/delete-pods/#deleting-pods).
+Force deletions can be potentially dangerous for some pods and should be performed with caution. In case of StatefulSet pods, please refer to the task documentation for [deleting Pods from a StatefulSet](/docs/tasks/run-application/force-delete-stateful-set-pod/).

 ## Privileged mode for pod containers

@@ -196,4 +196,4 @@ spec.containers[0].securityContext.privileged: forbidden '<*>(0xc20b222db0)true'

 Pod is a top-level resource in the Kubernetes REST API. More details about the
 API object can be found at: [Pod API
-object](/docs/api-reference/v1.6/#pod-v1-core).
+object](/docs/api-reference/{{page.version}}/#pod-v1-core).
@@ -252,7 +252,7 @@ kubectl cluster-info

 ### Accessing the cluster programmatically 

-It's possible to use the locally stored client certificates to access the api server. For example, you may want to use any of the [Kubernetes API client libraries](https://git.k8s.io/community/contributors/devel/client-libraries.md) to program against your Kubernetes cluster in the programming language of your choice. 
+It's possible to use the locally stored client certificates to access the api server. For example, you may want to use any of the [Kubernetes API client libraries](/docs/reference/client-libraries/) to program against your Kubernetes cluster in the programming language of your choice. 

 To demonstrate how to use these locally stored certificates, we provide the following example of using ```curl``` to communicate to the master api server via https:

@@ -25,7 +25,7 @@ a building block.  kops builds on the kubeadm work.

 #### Requirements

-You must have [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) installed in order for kops to work.
+You must have [kubectl](/docs/tasks/tools/install-kubectl/) installed in order for kops to work.

 #### Installation

@@ -129,7 +129,7 @@ Remember to turn off the imagePullPolicy:Always, as otherwise Kubernetes won't u

 The `minikube start` command can be used to start your cluster.
 This command creates and configures a virtual machine that runs a single-node Kubernetes cluster.
-This command also configures your [kubectl](http://kubernetes.io/docs/user-guide/kubectl-overview/) installation to communicate with this cluster.
+This command also configures your [kubectl](/docs/user-guide/kubectl-overview/) installation to communicate with this cluster.

 If you are behind a web proxy, you will need to pass this information in e.g. via

@@ -194,7 +194,7 @@ or pass the context on each command like this: `kubectl get pods --context=minik

 ### Dashboard

-To access the [Kubernetes Dashboard](http://kubernetes.io/docs/user-guide/ui/), run this command in a shell after starting minikube to get the address:
+To access the [Kubernetes Dashboard](/docs/tasks/access-application-cluster/web-ui-dashboard/), run this command in a shell after starting minikube to get the address:
 ```shell
 minikube dashboard
 ```
@@ -216,7 +216,7 @@ To determine the NodePort for your service, you can use a `kubectl` command like
 `kubectl get service $SERVICE --output='jsonpath="{.spec.ports[0].nodePort}"'`

 ## Persistent Volumes
-Minikube supports [PersistentVolumes](http://kubernetes.io/docs/user-guide/persistent-volumes/) of type `hostPath`.
+Minikube supports [PersistentVolumes](/docs/concepts/storage/persistent-volumes/) of type `hostPath`.
 These PersistentVolumes are mapped to a directory inside the minikube VM.

 The Minikube VM boots into a tmpfs, so most directories will not be persisted across reboots (`minikube stop`).
@@ -4,7 +4,9 @@ assignees:
 title: Running Kubernetes with rkt
 ---

-This document describes how to run Kubernetes using [rkt](https://github.com/coreos/rkt) as the container runtime.
+This document describes how to run Kubernetes using [rkt](https://github.com/coreos/rkt) as the container runtime. 
+
+*Note*: This document describes how to use what is known as "rktnetes". In future, Kubernetes will support the rkt runtime through the Container Runtime Interface (CRI). At present the [rkt shim for the CRI](https://github.com/kubernetes-incubator/rktlet) is considered "experimental", but if you wish to use it you will find instructions in the [kubeadm reference](/docs/admin/kubeadm/#use-kubeadm-with-other-cri-runtimes). 

 * TOC
 {:toc}
@@ -38,7 +38,7 @@ Choose any extra options you may want to include with your cluster, then click *

 You can monitor the status of your cluster and suspend or delete it from [your stackpoint.io dashboard](https://stackpoint.io/#/clusters).

-For information on using and managing a Kubernetes cluster on AWS, [consult the  Kubernetes documentation](http://kubernetes.io/docs/getting-started-guides/aws/).
+For information on using and managing a Kubernetes cluster on AWS, [consult the  Kubernetes documentation](/docs/getting-started-guides/aws/).



@@ -70,7 +70,7 @@ Choose any extra options you may want to include with your cluster, then click *

 You can monitor the status of your cluster and suspend or delete it from [your stackpoint.io dashboard](https://stackpoint.io/#/clusters).

-For information on using and managing a Kubernetes cluster on GCE, [consult the  Kubernetes documentation](http://kubernetes.io/docs/getting-started-guides/gce).
+For information on using and managing a Kubernetes cluster on GCE, [consult the  Kubernetes documentation](/docs/getting-started-guides/gce/).



@@ -103,7 +103,7 @@ Choose any extra options you may want to include with your cluster, then click *

 You can monitor the status of your cluster and suspend or delete it from [your stackpoint.io dashboard](https://stackpoint.io/#/clusters).

-For information on using and managing a Kubernetes cluster on GKE, consult [the official documentation](http://kubernetes.io/docs/).
+For information on using and managing a Kubernetes cluster on GKE, consult [the official documentation](/docs/home/).



@@ -135,7 +135,7 @@ Choose any extra options you may want to include with your cluster, then click *

 You can monitor the status of your cluster and suspend or delete it from [your stackpoint.io dashboard](https://stackpoint.io/#/clusters).

-For information on using and managing a Kubernetes cluster on DigitalOcean, consult [the official documentation](http://kubernetes.io/docs/).
+For information on using and managing a Kubernetes cluster on DigitalOcean, consult [the official documentation](/docs/home/).



@@ -168,7 +168,7 @@ Choose any extra options you may want to include with your cluster, then click *

 You can monitor the status of your cluster and suspend or delete it from [your stackpoint.io dashboard](https://stackpoint.io/#/clusters).

-For information on using and managing a Kubernetes cluster on Azure, [consult the  Kubernetes documentation](http://kubernetes.io/docs/getting-started-guides/azure/).
+For information on using and managing a Kubernetes cluster on Azure, [consult the  Kubernetes documentation](/docs/getting-started-guides/azure/).



@@ -200,4 +200,4 @@ Choose any extra options you may want to include with your cluster, then click *

 You can monitor the status of your cluster and suspend or delete it from [your stackpoint.io dashboard](https://stackpoint.io/#/clusters).

-For information on using and managing a Kubernetes cluster on Packet, consult [the official documentation](http://kubernetes.io/docs/).
+For information on using and managing a Kubernetes cluster on Packet, consult [the official documentation](/docs/home/).
@@ -3,58 +3,29 @@ title: Local Kubernetes development with LXD
 ---

 {% capture overview %}
-## Overview
-
 Running Kubernetes locally has obvious development advantages, such as lower cost and faster iteration than constantly deploying and tearing down clusters on a public cloud. Ideally, a Kubernetes developer can spawn all necessary nodes inside local containers and test new configurations as they are committed. This page will show you how to deploy a cluster to LXD containers on a local machine.
 {% endcapture %}

-The purpose of using [LXD](https://linuxcontainers.org/lxd/) on a local machine is to emulate the same deployment that a user would use in a cloud or bare metal. Each node is treated as a machine, with the same characteristics as production. Each node is a separate container, which runs Docker containers and `kubectl` inside (see [Cluster Intro](https://kubernetes.io/docs/tutorials/kubernetes-basics/cluster-intro/) for more info).
+The purpose of using [LXD](https://linuxcontainers.org/lxd/) on a local machine is to emulate the same deployment that a user would use in a cloud or bare metal. Each node is treated as a machine, with the same characteristics as production. Each node is a separate container, which runs Docker containers and `kubectl` inside (see [Cluster Intro](/docs/tutorials/kubernetes-basics/cluster-intro/) for more info).

 {% capture prerequisites %}
-## Prerequisites
-
-In order to simplify local deployment this method leverages the [Conjure Up tool](
-http://conjure-up.io/). 
-
-This will provide a pseudo-graphical set up in a terminal that is simple enough for developers to use without having to learn the complexities of operating Kubernetes. This will enable new developers to get started with a working cluster.
-{% endcapture %}
-
-{% capture steps %}
-## Getting Started
-
-First, you need to configure LXD to be able to host a large number of containers. To do this we need to update the [kernel parameters for inotify](https://github.com/lxc/lxd/blob/master/doc/production-setup.md#etcsysctlconf).
-
-On your system open up `/etc/sysctl.conf` *(as root) and add the following lines:
-
-```
-    fs.inotify.max_user_instances = 1048576
-    fs.inotify.max_queued_events = 1048576
-    fs.inotify.max_user_watches = 1048576
-    vm.max_map_count = 262144
-```
-
-_Note: This step may become unnecessary in the future_
-
-Next, apply those kernel parameters (you should see the above options echoed back out to you):
-    
-    sudo sysctl -p
-   
-Now you're ready to install conjure-up and deploy Kubernetes.
+Install [conjure-up](http://conjure-up.io/), a tool for deploying big software.
    
 ```
    sudo snap install conjure-up --classic
-    conjure-up kubernetes
 ```

-Note: During this set up phase conjure-up will ask you to "Setup an ipv6 subnet" with LXD, ensure you answer NO. ipv6 with Juju/LXD is currently unsupported.
+Note: If conjure-up asks you to "Setup an ipv6 subnet" with LXD, answer NO. ipv6 with Juju/LXD is currently unsupported.
+{% endcapture %}

-### Walkthrough
+{% capture steps %}
+## Deploying Kubernetes

-Initiate the installation with:
+Start the deployment with:

    conjure-up kubernetes

-For this walkthrough we are going to create a new controller, select the `localhost` Cloud type:
+For this walkthrough we are going to create a new controller - select the `localhost` Cloud type:

 ![Select Cloud](/images/docs/ubuntu/00-select-cloud.png)

@@ -70,7 +41,7 @@ Wait for our Applications to be fully deployed:

 ![Waiting](/images/docs/ubuntu/03-waiting.png)

-Run the final post processing steps to automatically configure your Kubernetes environment:
+Run the final post-processing steps to automatically configure your Kubernetes environment:

 ![Postprocessing](/images/docs/ubuntu/04-postprocessing.png)

@@ -78,18 +49,18 @@ Review the final summary screen:

 ![Final Summary](/images/docs/ubuntu/05-final-summary.png)

-### Accessing the Cluster 
+## Accessing the Cluster 

 You can access your Kubernetes cluster by running the following:
    
    
-    ~/kubectl --kubeconfig=~/.kube/config
+    kubectl --kubeconfig=~/.kube/config
    

 Or if you've already run this once it'll create a new config file as shown in the summary screen.
    
    
-    ~/kubectl --kubeconfig=~/.kube/config.conjure-up
+    kubectl --kubeconfig=~/.kube/config.conjure-up
    
 {% endcapture %}

@@ -123,7 +123,7 @@ through `FLANNEL_BACKEND` and `FLANNEL_OTHER_NET_CONFIG`, as explained in `clust
 The default setting for `ADMISSION_CONTROL` is right for the latest
 release of Kubernetes, but if you choose an earlier release then you
 might want a different setting.  See
-[the admission control doc](http://kubernetes.io/docs/admin/admission-controllers/#is-there-a-recommended-set-of-plug-ins-to-use)
+[the admission control doc](/docs/admin/admission-controllers/#is-there-a-recommended-set-of-plug-ins-to-use)
 for the recommended settings for various releases.

 **Note:** When deploying, master needs to be connected to the Internet to download the necessary files.
@@ -22,7 +22,7 @@ The provided Kubernetes master nodes act as a control plane for the cluster. The

    juju add-unit kubernetes-master

-This will add another master node to the control plane. See the [building high-availability clusters](http://kubernetes.io/docs/admin/high-availability) section of the documentation for more information. 
+This will add another master node to the control plane. See the [building high-availability clusters](/docs/admin/high-availability) section of the documentation for more information. 

 ## Kubernetes workers

@@ -60,7 +60,7 @@ juju add-relation kubernetes-master ceph-mon
 ```

 We are now ready to enlist 
-[Persistent Volumes](http://kubernetes.io/docs/user-guide/persistent-volumes/)
+[Persistent Volumes](/docs/concepts/storage/persistent-volumes/)
 in Kubernetes which our workloads can consume via Persistent Volume (PV) claims.

 ```
@@ -84,8 +84,8 @@ test   50M          RWO       Available                              10s

 To consume these Persistent Volumes, your pods will need an associated
 Persistent Volume Claim with them, and is outside the scope of this README. See the
-[Persistent Volumes](http://kubernetes.io/docs/user-guide/persistent-volumes/)
+[Persistent Volumes](/docs/concepts/storage/persistent-volumes/)
 documentation for more information.
 {% endcapture %}

-{% include templates/task.md %}
+{% include templates/task.md %}
@@ -71,7 +71,7 @@ Deploy new worker(s):

 Pause the old workers so your workload migrates: 

-    juju action kubernetes-alpha/# pause
+    juju run-action kubernetes-alpha/# pause

 Verify old workloads have migrated with: 

@@ -86,7 +86,11 @@ Tear down old workers with:
    juju upgrade-charm kubernetes-worker
    juju config kubernetes-worker channel=1.x/stable

-Where `x` is the minor version of Kubernetes. For example, `1.6/stable`. See above for Channel definitions
+Where `x` is the minor version of Kubernetes. For example, `1.6/stable`. See above for Channel definitions. Once you've configured kubernetes-worker with the appropriate channel, run the upgrade action on each worker:
+
+    juju run-action kubernetes-worker/0 upgrade
+    juju run-action kubernetes-worker/1 upgrade
+    ...

 # Verify upgrade

@@ -10,7 +10,7 @@ This page covers how to get started with deploying Kubernetes on vSphere and det
 * TOC
 {:toc}

-### Getting started with vSphere
+### Getting started with the vSphere Cloud Provider

 Kubernetes comes with a cloud provider for vSphere. A quick and easy way to try out the cloud provider is to deploy Kubernetes using [Kubernetes-Anywhere](https://github.com/kubernetes/kubernetes-anywhere).

@@ -20,7 +20,7 @@ This page also describes how to configure and get started with the cloud provide

 To start using Kubernetes on top of vSphere and use the vSphere Cloud Provider use Kubernetes-Anywhere. Kubernetes-Anywhere will deploy and configure a cluster from scratch.

-Detailed steps can be found at the [getting started with Kubernetes-Anywhere on vSphere page](https://git.k8s.io/kubernetes-anywhere/phase1/vsphere/README.md)
+Detailed steps can be found at the [getting started with Kubernetes-Anywhere on vSphere](https://git.k8s.io/kubernetes-anywhere/phase1/vsphere/README.md) page

 ### vSphere Cloud Provider

@@ -31,219 +31,178 @@ vSphere Cloud Provider allows using vSphere managed storage within Kubernetes. I
 3. Storage Classes and provisioning of volumes.
 4. vSphere Storage Policy Based Management for Containers orchestrated by Kubernetes.

-Documentation for how to use vSphere managed storage can be found in the
-[persistent volumes user
-guide](http://kubernetes.io/docs/user-guide/persistent-volumes/#vsphere) and the
-[volumes user
-guide](/docs/concepts/storage/volumes/#vspherevolume)
+Documentation for how to use vSphere managed storage can be found in the [persistent volumes user guide](/docs/concepts/storage/persistent-volumes/#vsphere) and the [volumes user guide](/docs/concepts/storage/volumes/#vspherevolume)

-Examples can be found
-[here](https://git.k8s.io/kubernetes/examples/volumes/vsphere)
+Examples can be found [here](https://git.k8s.io/kubernetes/examples/volumes/vsphere)

-#### Configuring vSphere Cloud Provider
+#### Enable vSphere Cloud Provider

-If a Kubernetes cluster has not been deployed using Kubernetes-Anywhere, follow the instructions below to use the vSphere Cloud Provider. These steps are not needed when using Kubernetes-Anywhere, they will be done as part of the deployment.
+If a Kubernetes cluster has not been deployed using Kubernetes-Anywhere, follow the instructions below to enable the vSphere Cloud Provider. These steps are not needed when using Kubernetes-Anywhere, they will be done as part of the deployment.

-* Enable UUID for a VM
+**Step-1** [Create a VM folder](https://docs.vmware.com/en/VMware-vSphere/6.0/com.vmware.vsphere.vcenterhost.doc/GUID-031BDB12-D3B2-4E2D-80E6-604F304B4D0C.html) and move Kubernetes Node VMs to this folder.

-This can be done via [govc tool](https://github.com/vmware/govmomi/tree/master/govc)
+**Step-2** Make sure Node VM names must comply with the regex `[a-z](([-0-9a-z]+)?[0-9a-z])?(\.[a-z0-9](([-0-9a-z]+)?[0-9a-z])?)*` If Node VMs does not comply with this regex, rename them and make it compliant to this regex.

-```
-export GOVC_URL=<IP/URL>
-export GOVC_USERNAME=<vCenter User>
-export GOVC_PASSWORD=<vCenter Password>
-export GOVC_INSECURE=1
-govc vm.change -e="disk.enableUUID=1" -vm=<VMNAME>
-```
+  Node VM names constraints:

-* Create Role and User with Required Privileges for vSphere Cloud Provider
+  * VM names can not begin with numbers.
+  * VM names can not have capital letters, any special charaters except `.` and `-`.
+  * VM names can not be shorter than 3 chars and longer than 63

-vSphere Cloud Provider requires the following minimal set of privileges to interact with vCenter:
+**Step-3** Enable disk UUID on Node virtual machines

-Please refer [vSphere Documentation Center](http://pubs.vmware.com/vsphere-65/index.jsp?topic=%2Fcom.vmware.vsphere.security.doc%2FGUID-18071E9A-EED1-4968-8D51-E0B4F526FDA3.html&resultof=%22%43%72%65%61%74%65%22%20%22%63%72%65%61%74%22%20%22%43%75%73%74%6f%6d%22%20%22%63%75%73%74%6f%6d%22%20%22%52%6f%6c%65%22%20%22%72%6f%6c%65%22%20) to know about steps for creating a Custom Role, User and Role Assignment.
+The disk.EnableUUID parameter must be set to "TRUE" for each Node VM. This step is necessary so that the VMDK always presents a consistent UUID to the VM, thus allowing the disk to be mounted properly. 

-Note: Assign Permissions at the vCenter Level and make sure to check Propagate.
+For each of the virtual machine nodes that will be participating in the cluster, follow the steps below using [GOVC tool](https://github.com/vmware/govmomi/tree/master/govc)

-```
-Datastore > Allocate space
-Datastore > Low level file Operations
-Virtual Machine > Configuration > Add existing disk
-Virtual Machine > Configuration > Add or remove device
-Virtual Machine > Configuration > Remove disk
-```
+* Set up GOVC environment

-For the VSAN policy based volume provisioning feature, the following additional privileges are required.
+        export GOVC_URL='vCenter IP OR FQDN'
+        export GOVC_USERNAME='vCenter User'
+        export GOVC_PASSWORD='vCenter Password'
+        export GOVC_INSECURE=1

-```
-Network > Assign network
-Virtual machine > Configuration > Add new disk
-Virtual Machine > Inventory > Create new
-Virtual machine > Configuration > Add new disk
-Resource > Assign virtual machine to resource pool
-```
+* Find Node VM Paths

-* Provide the cloud config file to each instance of kubelet, apiserver and controller manager via ```--cloud-config=<path to file>``` flag. Cloud config [template can be found at Kubernetes-Anywhere](https://git.k8s.io/kubernetes-anywhere/phase1/vsphere/vsphere.conf)
+        govc ls /datacenter/vm/<vm-folder-name>

-Sample Config:
+* Set disk.EnableUUID to true for all VMs
+
+        govc vm.change -e="disk.enableUUID=1" -vm='VM Path'
+
+Note: If Kubernetes Node VMs are created from template VM then `disk.EnableUUID=1` can be set on the template VM. VMs cloned from this template, will automatically inherit this property.
+
+**Step-4** Create and assign Roles to the vSphere Cloud Provider user and vSphere entities.
+
+Note: if you want to use Administrator account then this step can be skipped.
+
+vSphere Cloud Provider requires the following minimal set of privileges to interact with vCenter. Please refer [vSphere Documentation Center](https://docs.vmware.com/en/VMware-vSphere/6.5/com.vmware.vsphere.security.doc/GUID-18071E9A-EED1-4968-8D51-E0B4F526FDA3.html) to know about steps for creating a Custom Role, User and Role Assignment.
+
+<table>
+<thead>
+<tr>
+  <th>Roles</th>
+  <th>Privileges</th>
+  <th>Entities</th>
+  <th>Propagate to Children</th>
+</tr>
+</thead>
+<tbody><tr>
+  <td>manage-k8s-node-vms</td>
+  <td>Resource.AssignVMToPool<br> System.Anonymous<br> System.Read<br> System.View<br> VirtualMachine.Config.AddExistingDisk<br> VirtualMachine.Config.AddNewDisk<br> VirtualMachine.Config.AddRemoveDevice<br> VirtualMachine.Config.RemoveDisk<br> VirtualMachine.Inventory.Create<br> VirtualMachine.Inventory.Delete</td>
+  <td>Cluster,<br> Hosts,<br> VM Folder</td>
+  <td>Yes</td>
+</tr>
+<tr>
+  <td>manage-k8s-volumes</td>
+  <td>Datastore.AllocateSpace<br> Datastore.FileManagement<br> System.Anonymous<br> System.Read<br> System.View</td>
+  <td>Datastore</td>
+  <td>No</td>
+</tr>
+<tr>
+  <td>k8s-system-read-and-spbm-profile-view</td>
+  <td>StorageProfile.View<br> System.Anonymous<br> System.Read<br> System.View</td>
+  <td>vCenter</td>
+  <td>No</td>
+</tr>
+<tr>
+  <td>ReadOnly</td>
+  <td>System.Anonymous<br>System.Read<br>System.View</td>
+  <td>Datacenter,<br> Datastore Cluster,<br> Datastore Storage Folder</td>
+  <td>No</td>
+</tr>
+</tbody>
+</table>
+
+**Step-5** Create the vSphere cloud config file (`vsphere.conf`). Cloud config template can be found [here](https://github.com/kubernetes/kubernetes-anywhere/blob/master/phase1/vsphere/vsphere.conf)
+
+This config file needs to be placed in the shared directory which should be accessible from kubelet container, controller-manager pod, and API server pod.
+
+**```vsphere.conf``` for Master Node:**

 ```
 [Global]
-        user = <User name for vCenter>
-        password = <Password for vCenter>
-        server = <IP/URL for vCenter>
-        port = <Default 443 for vCenter>
-        insecure-flag = <set to 1 if the host above uses a self-signed cert>
-        datacenter = <Datacenter to be used>
-        datastore = <Datastore to use for provisioning volumes using storage classes/dynamic provisioning>
-        working-dir = <Folder in which VMs are provisioned, can be null>
-        vm-uuid = <VM Instance UUID of virtual machine which can be retrieved from instanceUuid property in VmConfigInfo, or also set as vc.uuid in VMX file. If empty, will be retrieved from sysfs (requires root)>
+        user = "vCenter username for cloud provider"
+        password = "password"
+        server = "IP/FQDN for vCenter"
+        port = "443" #Optional
+        insecure-flag = "1" #set to 1 if the vCenter uses a self-signed cert
+        datacenter = "Datacenter name" 
+        datastore = "Datastore name" #Datastore to use for provisioning volumes using storage classes/dynamic provisioning
+        working-dir = "vCenter VM folder path in which node VMs are located"
+        vm-name = "VM name of the Master Node" #Optional
+        vm-uuid = "UUID of the Node VM" # Optional        
 [Disk]
    scsicontrollertype = pvscsi
 ```

-* Set the cloud provider via ```--cloud-provider=vsphere``` flag for each instance of kubelet, apiserver and controller manager.
+Note: **```vm-name``` parameter is introduced in 1.6.4 release.** Both ```vm-uuid``` and ```vm-name``` are optional parameters. if ```vm-name``` is specified then ```vm-uuid``` is not used. if both are not specified then kubelet will get vm-uuid from `/sys/class/dmi/id/product_serial` and query vCenter to find the Node VM's name. 

-* When upgrading to 1.6 install the default storage class addons, [click here for more details](https://github.com/kubernetes/kubernetes/issues/40070)
+**```vsphere.conf``` for Worker Nodes:** (Only Applicable to 1.6.4 release and above. For older releases this file should have all the parameters specified in Master node's ```vSphere.conf``` file)
+ 
+``` 
+[Global]
+        vm-name = "VM name of the Worker Node"
+```
+
+Below is summary of supported parameters in the `vsphere.conf` file
+
+* ```user``` is the vCenter username for vSphere Cloud Provider.
+* ```password``` is the password for vCenter user specified with `user`.
+* ```server``` is the vCenter Server IP or FQDN
+* ```port``` is the vCenter Server Port. Default is 443 if not specified.
+* ```insecure-flag``` is set to 1 if vCenter used a self-signed certificate.
+* ```datacenter``` is the name of the datacenter on which Node VMs are deployed.
+* ```datastore``` is the default datastore to use for provisioning volumes using storage classes/dynamic provisioning.
+* ```vm-name``` is recently added configuration parameter. This is optional parameter. When this parameter is present, ```vsphere.conf``` file on the worker node does not need vCenter credentials.
+
+  **Note:** ```vm-name``` is added in the release 1.6.4. Prior releases does not support this parameter. 
+
+* ```working-dir``` can be set to empty ( working-dir = ""), if Node VMs are located in the root VM folder.
+* ```vm-uuid``` is the VM Instance UUID of virtual machine. ```vm-uuid``` can be set to empty (```vm-uuid = ""```). if set to empty, this will be retrieved from /sys/class/dmi/id/product_serial file on virtual machine (requires root access).
+
+  * ```vm-uuid``` needs to be set in this format - ```423D7ADC-F7A9-F629-8454-CE9615C810F1```
+
+  * ```vm-uuid``` can be retrieved from Node Virtual machines using following command. This will be different on each node VM.
+
+        cat /sys/class/dmi/id/product_serial | sed -e 's/^VMware-//' -e 's/-/ /' | awk '{ print toupper($1$2$3$4 "-" $5$6 "-" $7$8 "-" $9$10 "-" $11$12$13$14$15$16) }'
+
+* `datastore` is the default datastore used for provisioning volumes using storage classes. If datastore is located in storage folder or datastore is member of datastore cluster, make sure to specify full datastore path. Make sure vSphere Cloud Provider user has Read Privilege set on the datastore cluster or storage folder to be able to find datastore.
+  * For datastore located in the datastore cluster, specify datastore as mentioned below
+
+        datastore = "DatastoreCluster/datastore1"
+
+  * For datastore located in the storage folder, specify datastore as mentioned below
+
+        datastore = "DatastoreStorageFolder/datastore1"
+
+**Step-6** Add flags to controller-manager, API server and Kubelet to enable vSphere Cloud Provider.
+* Add following flags to kubelet running on every node and to the controller-manager and API server pods manifest files. 
+
+```
+--cloud-provider=vsphere
+--cloud-config=<Path of the vsphere.conf file>
+```
+
+Manifest files for API server and controller-manager are generally located at `/etc/kubernetes`
+
+**Step-7** Restart Kubelet on all nodes.
+* Reload kubelet systemd unit file using ```systemctl daemon-reload```
+* Restart kubelet service using ```systemctl restart kubelet.service```
+
+Note: After enabling the vSphere Cloud Provider, Node names will be set to the VM names from the vCenter Inventory.

 #### Known issues
-
-### Kube-up (Deprecated)
-
-Kube-up.sh is no longer supported and is deprecated. The steps for kube-up are included but going forward [kube-anywhere](https://github.com/kubernetes/kubernetes-anywhere) is preferred.
-
-The recommended version for kube-up is [v1.4.7](https://github.com/kubernetes/kubernetes/releases/tag/v1.4.7)
-
-The example below creates a Kubernetes cluster with 4 worker node Virtual.
-Machines and a master Virtual Machine (i.e. 5 VMs in your cluster). This cluster is set up and controlled from your workstation (or wherever you find convenient).
-
-#### Prerequisites
-
-* You need administrator credentials to an ESXi machine or vCenter instance with write mode api access enabled (not available on the free ESXi license).
-* You must have Go (see [here](https://git.k8s.io/community/contributors/devel/development.md#go-versions) for supported versions) installed: [www.golang.org](http://www.golang.org).
-* You must have your `GOPATH` set up and include `$GOPATH/bin` in your `PATH`.
-
-```shell
-export GOPATH=$HOME/src/go
-mkdir -p $GOPATH
-export PATH=$PATH:$GOPATH/bin
-```
-
-* Install the govc tool to interact with ESXi/vCenter. Head to [govc Releases](https://github.com/vmware/govmomi/releases) to download the latest.
-
-```shell
-# Sample commands for v0.8.0 for 64 bit Linux.
-curl -OL https://github.com/vmware/govmomi/releases/download/v0.8.0/govc_linux_amd64.gz
-gzip -d govc_linux_amd64.gz
-chmod +x govc_linux_amd64
-mv govc_linux_amd64 /usr/local/bin/govc
-```
-
-* Get or build a [binary release](/docs/getting-started-guides/binary_release)
-
-#### Setup
-
-Download a prebuilt Debian 8.2 VMDK that we'll use as a base image:
-
-```shell
-curl --remote-name-all https://storage.googleapis.com/govmomi/vmdk/2016-01-08/kube.vmdk.gz{,.md5}
-md5sum -c kube.vmdk.gz.md5
-gzip -d kube.vmdk.gz
-```
-
-Configure the environment for govc
-
-```shell
-export GOVC_URL='hostname' # hostname of the vc
-export GOVC_USERNAME='username' # username for logging into the vsphere.
-export GOVC_PASSWORD='password' # password for the above username
-export GOVC_NETWORK='Network Name' # Name of the network the vms should join. Many times it could be "VM Network"
-export GOVC_INSECURE=1 # If the host above uses a self-signed cert
-export GOVC_DATASTORE='target datastore'
-# To get resource pool via govc: govc ls -l 'host/*' | grep ResourcePool | awk '{print $1}' | xargs -n1 -t govc pool.info
-export GOVC_RESOURCE_POOL='resource pool or cluster with access to datastore'
-export GOVC_GUEST_LOGIN='kube:kube' # Used for logging into kube.vmdk during deployment.
-export GOVC_PORT=443 # The port to be used by vSphere cloud provider plugin
-# To get datacente via govc: govc datacenter.info
-export GOVC_DATACENTER='ha-datacenter' # The datacenter to be used by vSphere cloud provider plugin
-```
-
-Sample environment
-
-```shell
-export GOVC_URL='10.161.236.217'
-export GOVC_USERNAME='administrator'
-export GOVC_PASSWORD='MyPassword1'
-export GOVC_NETWORK='VM Network'
-export GOVC_INSECURE=1
-export GOVC_DATASTORE='datastore1'
-export GOVC_RESOURCE_POOL='/Datacenter/host/10.20.104.24/Resources'
-export GOVC_GUEST_LOGIN='kube:kube'
-export GOVC_PORT='443'
-export GOVC_DATACENTER='Datacenter'
-```
-
-Import this VMDK into your vSphere datastore:
-
-```shell
-govc import.vmdk kube.vmdk ./kube/
-```
-
-Verify that the VMDK was correctly uploaded and expanded to ~3GiB:
-
-```shell
-govc datastore.ls ./kube/
-```
-
-If you need to debug any part of the deployment, the guest login for
-the image that you imported is `kube:kube`. It is normally specified
-in the GOVC_GUEST_LOGIN parameter above.
-
-Also take a look at the file `cluster/vsphere/config-default.sh` and
-make any needed changes. You can configure the number of nodes
-as well as the IP subnets you have made available to Kubernetes, pods,
-and services.
-
-#### Starting a cluster
-
-Now, let's continue with deploying Kubernetes.
-This process takes about ~20-30 minutes depending on your network.
-
-##### From extracted binary release
-
-```shell
-cd kubernetes
-KUBERNETES_PROVIDER=vsphere cluster/kube-up.sh
-```
-
-##### Build from source
-
-```shell
-cd kubernetes
-make release
-KUBERNETES_PROVIDER=vsphere cluster/kube-up.sh
-```
-
-Refer to the top level README and the getting started guide for Google Compute
-Engine. Once you have successfully reached this point, your vSphere Kubernetes
-deployment works just as any other one!
-
-**Enjoy!**
-
-#### Extra: debugging deployment failure
-
-The output of `kube-up.sh` displays the IP addresses of the VMs it deploys. You
-can log into any VM as the `kube` user to poke around and figure out what is
-going on (find yourself authorized with your SSH key, or use the password
-`kube` otherwise).
+[vmware#220](https://github.com/vmware/kubernetes/issues/220) :
+vSphere Cloud Provider can not be used on the Kubernetes Cluster when vCenter port is configured other than the default port 443. Fix for this issue is already out (Kubernetes PR# [49689](https://github.com/kubernetes/kubernetes/pull/49689)). We will make sure that, PR 49689 is cherry picked to 1.7, 1.6 and 1.5 branches. 

 ## Support Level


-IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level
-------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
-Vmware vSphere       | Kube-anywhere    | Photon OS | Flannel         | [docs](/docs/getting-started-guides/vsphere)                                |          | Community  ([@abrarshivani](https://github.com/abrarshivani)), ([@kerneltime](https://github.com/kerneltime)), ([@BaluDontu](https://github.com/BaluDontu)), ([@luomiao](https://github.com/luomiao)), ([@divyenpatel](https://github.com/divyenpatel))
+IaaS Provider        | Config. Mgmt | OS     | Networking | Docs                                          | Conforms  | Support Level
+-------------------- | ------------ | ------ | ---------- | --------------------------------------------- | --------- | ----------------------------
+Vmware vSphere       | Kube-anywhere    | Photon OS | Flannel         | [docs](/docs/getting-started-guides/vsphere)                                |                | Community  ([@abrarshivani](https://github.com/abrarshivani)), ([@kerneltime](https://github.com/kerneltime)), ([@BaluDontu](https://github.com/BaluDontu)), ([@luomiao](https://github.com/luomiao)), ([@divyenpatel](https://github.com/divyenpatel))

 If you identify any issues/problems using the vSphere cloud provider, you can create an issue in our repo - [VMware Kubernetes](https://github.com/vmware/kubernetes).

 For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart.
-
@@ -21,6 +21,9 @@ Most operations can be performed through the
 command-line tools, such as [kubeadm](/docs/admin/kubeadm/), which in turn use
 the API. However, the API can also be accessed directly using REST calls.

+Consider using one of the [client libraries](/docs/reference/client-libraries/)
+if you are writing an application using the Kubernetes API.
+
 ## API versioning

 To make it easier to eliminate fields or restructure resource representations, Kubernetes supports
@@ -0,0 +1,56 @@
+---
+title: Client Libraries
+assignees:
+- ahmetb
+---
+
+{% capture overview %}
+This page contains an overview of the client libraries for using the Kubernetes
+API from various programming languages.
+{% endcapture %}
+
+{% capture body %}
+To write applications using the [Kubernetes REST API](/docs/reference/api-overview/),
+you do not need to implement the API calls and request/response types yourself.
+You can use a client library for the programming language you are using.
+
+Client libraries often handle common tasks such as authentication for you.
+Most client libraries can discover and use the Kubernetes Service Account to 
+authenticate if the API client is running inside the Kubernetes cluster, or can
+understand the [kubeconfig file](/docs/tasks/access-application-cluster/authenticate-across-clusters-kubeconfig/)
+format to read the credentials and the API Server address.
+
+## Officially-supported Kubernetes client libraries
+
+The following client libraries are officially maintained by [Kubernetes SIG API
+Machinery](https://github.com/kubernetes/community/tree/master/sig-api-machinery).
+
+
+| Language | Client Library | Sample Programs |
+|----------|----------------|-----------------|
+| Go       | [github.com/kubernetes/client-go/](https://github.com/kubernetes/client-go/) | [browse](https://github.com/kubernetes/client-go/tree/master/examples)
+| Python       | [github.com/kubernetes-incubator/client-python/](https://github.com/kubernetes-incubator/client-python/) | [browse](https://github.com/kubernetes-incubator/client-python/tree/master/examples)
+
+## Community-maintained client libraries
+
+The following Kubernetes API client libraries are provided and maintained by
+their authors, not the Kubernetes team.
+
+| Language | Client Library |
+|----------|----------------|
+| Clojure  | [github.com/yanatan16/clj-kubernetes-api](https://github.com/yanatan16/clj-kubernetes-api) |
+| Go       | [github.com/ericchiang/k8s](https://github.com/ericchiang/k8s) |
+| Java (OSGi) | [bitbucket.org/amdatulabs/amdatu-kubernetes](https://bitbucket.org/amdatulabs/amdatu-kubernetes) |
+| Java (Fabric8, OSGi) | [github.com/fabric8io/kubernetes-client](https://github.com/fabric8io/kubernetes-client) |
+| Node.js  | [github.com/tenxcloud/node-kubernetes-client](https://github.com/tenxcloud/node-kubernetes-client) |
+| Node.js  | [github.com/godaddy/kubernetes-client](https://github.com/godaddy/kubernetes-client) |
+| Perl     | [metacpan.org/pod/Net::Kubernetes](https://metacpan.org/pod/Net::Kubernetes) |
+| PHP      | [github.com/devstub/kubernetes-api-php-client](https://github.com/devstub/kubernetes-api-php-client) |
+| PHP      | [github.com/maclof/kubernetes-client](https://github.com/maclof/kubernetes-client) |
+| Python   | [github.com/eldarion-gondor/pykube](https://github.com/eldarion-gondor/pykube) |
+| Ruby     | [github.com/Ch00k/kuber](https://github.com/Ch00k/kuber) |
+| Ruby     | [github.com/abonas/kubeclient](https://github.com/abonas/kubeclient) |
+| Scala    | [github.com/doriordan/skuber](https://github.com/doriordan/skuber) |
+{% endcapture %}
+
+{% include templates/concept.md %}
@@ -19,7 +19,7 @@ This document details the deprecation policy for various facets of the system.
 Since Kubernetes is an API-driven system, the API has evolved over time to
 reflect the evolving understanding of the problem space. The Kubernetes API is
 actually a set of APIs, called "API groups", and each API group is
-independently versioned.  [API versions](http://kubernetes.io/docs/api/) fall
+independently versioned.  [API versions](/docs/reference/api-overview/#api-versioning) fall
 into 3 main tracks, each of which has different policies for deprecation:

 | Example  | Track                            |
@@ -175,7 +175,7 @@ versions are supported in a series of subsequent releases.

 Consider a hypothetical REST resource named Widget, which was present in API v1
 in the above timeline, and which needs to be deprecated.  We
-[document](http://kubernetes.io/docs/deprecated/) and
+[document](/docs/reference/deprecation-policy/) and
 [announce](https://groups.google.com/forum/#!forum/kubernetes-announce) the
 deprecation in sync with release X+1.  The Widget resource still exists in API
 version v1 (deprecated) but not in v2alpha1.  The Widget resource continues to
--- a/Show More
+++ b/Show More