Merge remote-tracking branch 'upstream/master' into lperkins/issue-58…

…22-service-types

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,6 @@
 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-> For 1.11 Features: set Milestone to 1.11 and Base Branch to release-1.11
+> For 1.12 Features: set Milestone to 1.12 and Base Branch to release-1.12
 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-> NOTE: After opening the PR, please *un-check and re-check* the ["Allow edits from maintainers"](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/) box so that maintainers can work on your patch and speed up the review process. This is a temporary workaround to address a known issue with GitHub.> 
 >
 > Please delete this note before submitting the pull request.
 
-![Allow edits from maintainers checkbox](https://help.github.com/assets/images/help/pull_requests/allow-maintainers-to-make-edits-sidebar-checkbox.png)

.travis.yml

@@ -1,6 +1,6 @@
 language: go
 go:
-  - 1.9.3
+  - 1.10.2
 
 # Don't want default ./... here:
 install:
@@ -10,7 +10,7 @@ install:
 # Fetch dependencies for us to run the tests in test/examples_test.go
 - go get -t -v k8s.io/website/test
 # Make sure we are testing against the correct branch
-- pushd $GOPATH/src/k8s.io/kubernetes && git checkout release-1.10 && popd
+- pushd $GOPATH/src/k8s.io/kubernetes && git checkout release-1.11 && popd
 
 # Simplified deduplication of dependencies.
 - cp -L -R $GOPATH/src/k8s.io/kubernetes/vendor/ $GOPATH/src/

Dockerfile

@@ -0,0 +1,30 @@
+# Credit to Julien Guyomard (https://github.com/jguyomard). This Dockerfile
+# is essentially based on his Dockerfile at
+# https://github.com/jguyomard/docker-hugo/blob/master/Dockerfile. The only significant
+# change is that the Hugo version is now an overridable argument rather than a fixed
+# environment variable.
+
+FROM alpine:latest
+
+MAINTAINER Luc Perkins <[email protected]>
+
+RUN apk add --no-cache \
+    curl \
+    git \
+    openssh-client \
+    rsync
+
+ARG HUGO_VERSION
+
+RUN mkdir -p /usr/local/src && \
+    cd /usr/local/src && \
+    curl -L https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_linux-64bit.tar.gz | tar -xz && \
+    mv hugo /usr/local/bin/hugo && \
+    curl -L https://bin.equinox.io/c/dhgbqpS8Bvy/minify-stable-linux-amd64.tgz | tar -xz && \
+    mv minify /usr/local/bin && \
+    addgroup -Sg 1000 hugo && \
+    adduser -Sg hugo -u 1000 -h /src hugo
+
+WORKDIR /src
+
+EXPOSE 1313

Makefile

@@ -1,3 +1,8 @@
+DOCKER       = docker
+HUGO_VERSION = 0.40.3
+DOCKER_IMAGE = kubernetes-hugo
+DOCKER_RUN   = $(DOCKER) run --rm --interactive --tty --volume $(PWD):/src
+
 .PHONY: all build sass build-preview help serve
 
 help: ## Show this help.
@@ -18,5 +23,11 @@ build-preview: ## Build site with drafts and future posts enabled.
 serve: ## Boot the development server.
 	hugo server
 
-stage: ## This needs to be updated for Hugo
-	#docker run -ti --rm -v "${PWD}":/k8sdocs -p 4000:4000 gcr.io/google-samples/k8sdocs:1.1
+docker-image:
+	$(DOCKER) build . --tag $(DOCKER_IMAGE) --build-arg HUGO_VERSION=$(HUGO_VERSION)
+
+docker-build:
+	$(DOCKER_RUN) $(DOCKER_IMAGE) hugo
+
+stage:
+	$(DOCKER_RUN) -p 1313:1313 $(DOCKER_IMAGE) hugo server --watch --bind 0.0.0.0

README.md

@@ -16,7 +16,38 @@ For more information about contributing to the Kubernetes documentation, see:
 * [Using Page Templates](http://kubernetes.io/docs/home/contribute/page-templates/)
 * [Documentation Style Guide](http://kubernetes.io/docs/home/contribute/style-guide/)
 
+## Building the site using Docker
+
+If you'd like, you can build the Kubernetes docs using Docker. To get started, build the image locally:
+
+```bash
+$ make docker-image
+
+# The underlying command:
+$ docker build . \
+  --tag kubernetes-hugo \
+  --build-arg HUGO_VERSION=0.40.3
+```
+
+You can create an image for a different version of Hugo by changing the value of the `HUGO_VERSION` argument for the build. You *must* specify a version or the image will not build.
+Once the `kubernetes-hugo` image has been built locally, you can build the site:
+
+```bash
+$ make docker-serve
+
+# The underlying command:
+$ docker run \
+  --rm \
+  --interactive \
+  --tty \
+  --volume $(PWD):/src \
+  kubernetes-hugo:latest \
+  hugo
+```
+
+As when building without using a Docker container, the results of the build will be published to the `public` directory (the default output directory for [Hugo](https://gohugo.io), the static site generator used to build this site).
+
 ## Thank you!
 
 Kubernetes thrives on community participation, and we really appreciate your
-contributions to our site and our documentation!
+contributions to our site and our documentation!

config.toml

@@ -19,6 +19,9 @@ pygmentsUseClasses = false
 # See https://help.farbox.com/pygments.html
 pygmentsStyle = "emacs"
 
+# Enable Git variables like commit, lastmod
+enableGitInfo = true
+
 [blackfriday]
 hrefTargetBlank = true
 fractions = false
@@ -27,7 +30,7 @@ fractions = false
 date = ["date", ":filename", "publishDate", "lastmod"]
 
 [permalinks]
-  blog = "/:section/:year/:month/:day/:slug/"
+blog = "/:section/:year/:month/:day/:slug/"
 
 # Be explicit about the output formats. We (currently) only want an RSS feed for the home page.
 [outputs]
@@ -45,23 +48,31 @@ time_format_blog = "Monday, January 02, 2006"
 description = "Production-Grade Container Orchestration"
 showedit = true
 
-latest = "v1.10"
+latest = "v1.11"
 
-fullversion = "v1.10.3"
-version = "v1.10"
+fullversion = "v1.11.0"
+version = "v1.11"
 githubbranch = "master"
 docsbranch = "master"
 deprecated = false
 currentUrl = "https://kubernetes.io/docs/home/"
 nextUrl = "http://kubernetes-io-vnext-staging.netlify.com/"
 githubWebsiteRepo = "github.com/kubernetes/website"
+githubWebsiteRaw = "raw.githubusercontent.com/kubernetes/website"
+
+[[params.versions]]
+fullversion = "v1.11.0"
+version = "v1.11"
+githubbranch = "v1.11.0"
+docsbranch = "release-1.11"
+url = "https://kubernetes.io"
 
 [[params.versions]]
 fullversion = "v1.10.3"
 version = "v1.10"
 githubbranch = "v1.10.3"
 docsbranch = "release-1.10"
-url = "https://kubernetes.io"
+url = "https://v1-10.docs.kubernetes.io"
 
 [[params.versions]]
 fullversion = "v1.9.7"
@@ -84,13 +95,6 @@ githubbranch = "v1.7.6"
 docsbranch = "release-1.7"
 url = "https://v1-7.docs.kubernetes.io"
 
-[[params.versions]]
-fullversion = "v1.6.8"
-version = "v1.6"
-githubbranch = "v1.6.8"
-docsbranch = "release-1.6"
-url = "https://v1-6.docs.kubernetes.io"
-
 
 # Language definitions.
 

content/en/_index.html

@@ -120,22 +120,23 @@ <h4><a href="/docs/concepts/workloads/controllers/jobs-run-to-completion/">Batch
     <main>
         <h3>Case Studies</h3>
         <div id="caseStudiesWrapper">
-            <div>
-                <p>Using Kubernetes to reinvent the world's largest educational company</p>
-                <a href="/case-studies/pearson/">Read more</a>
-            </div>
-            <div>
-                <p>Kubernetes at Box: Microservices at Maximum Velocity</p>
-                <a href="https://blog.box.com/blog/kubernetes-box-microservices-maximum-velocity/">Read more</a>
-            </div>
-            <div>
-                <p>Inside eBay's shift to Kubernetes and containers atop OpenStack</p>
-                <a href="https://www.nextplatform.com/2015/11/12/inside-ebays-shift-to-kubernetes-and-containers-atop-openstack/">Read more</a>
-            </div>
-            <div>
-                <p>Migrating from a homegrown 'cluster' to Kubernetes</p>
-                <a href="https://www.youtube.com/watch?v=6XGUTu3WhBw">Watch the video</a>
-            </div>
+          <div>
+              <p>Driving Banking Innovation with Cloud Native</p>
+              <a href="/case-studies/ing">Read more</a>
+          </div>
+          <div>
+              <p>Supporting Fast Decisioning Applications with Kubernetes</p>
+              <a href="/case-studies/capital-one">Read more</a>
+          </div>
+          <div>
+              <p>Cloud Native at Northwestern Mutual</p>
+              <a href="/case-studies/northwestern-mutual/">Read more</a>
+          </div>
+          <div>
+              <p>Launching and Scaling Up Experiments, Made Simple</p>
+              <a href="/case-studies/openai/">Read more</a>
+          </div>
+
         </div>
 
         <!--<div id="bigSocial">-->

content/en/blog/_posts/2017-02-00-Highly-Available-Kubernetes-Clusters.md

@@ -38,7 +38,7 @@ $ KUBE\_GCE\_ZONE=europe-west1-b ./cluster/kube-up.sh
 
 
 
-Now, we will add two additional pools of worker nodes, each of three nodes, in zones europe-west1-c and europe-west1-d (more details on adding pools of worker nodes can be find [here](http://kubernetes.io/docs/admin/multiple-zones/)):  
+Now, we will add two additional pools of worker nodes, each of three nodes, in zones europe-west1-c and europe-west1-d (more details on adding pools of worker nodes can be find [here](http://kubernetes.io/docs/setup/multiple-zones/)):  
 
 
  ```

content/en/blog/_posts/2017-11-00-Kubernetes-Easy-Way.md

@@ -71,7 +71,7 @@ Once you log in, all of your clusters are available within Codefresh.
 
 
 ### Add Cluster
-To add your cluster, click the down arrow, and then click **add cluste** r, select the project and cluster name. You can now deploy images!
+To add your cluster, click the down arrow, and then click **add cluster**, select the project and cluster name. You can now deploy images!
 
 
 

content/en/blog/_posts/2018-04-25-open-source-charts-2017.md

@@ -40,8 +40,8 @@ SIG meetings provide focused opportunities for users, maintainers, and specialis
 
 ## Join the party!
 
-You may already be using solutions that are successfully managed and scaled on Kubernetes. For example, GitHub.com, which hosts Kubernetes’ upstream source code, [now runs on Kubernetes](https://githubengineering.com/kubernetes-at-github/) https://githubengineering.com/kubernetes-at-github/) as well!
+You may already be using solutions that are successfully managed and scaled on Kubernetes. For example, GitHub.com, which hosts Kubernetes’ upstream source code, [now runs on Kubernetes](https://githubengineering.com/kubernetes-at-github/) as well!
 
 Check out the [Kubernetes Contributors’ guide](https://github.com/kubernetes/community/blob/master/contributors/guide/README.md) for more information on how to get started as a contributor.
 
-You can also join the [weekly Kubernetes Community meeting](https://github.com/kubernetes/community/tree/master/communication#weekly-meeting)and consider [joining a SIG or two](https://github.com/kubernetes/community/blob/master/sig-list.md#master-sig-list).
+You can also join the [weekly Kubernetes Community meeting](https://github.com/kubernetes/community/tree/master/communication#weekly-meeting) and consider [joining a SIG or two](https://github.com/kubernetes/community/blob/master/sig-list.md#master-sig-list).

content/en/blog/_posts/2018-04-30-zero-downtime-deployment-kubernetes-jenkins.md

@@ -10,6 +10,7 @@ Ever since we added the [Kubernetes Continuous Deploy](https://aka.ms/azjenkinsk
 ## Rolling Update
 
 Kubernetes supports the RollingUpdate strategy to replace old pods with new ones gradually, while continuing to serve clients without incurring downtime. To perform a RollingUpdate deployment:
+
 * Set `.spec.strategy.type` to `RollingUpdate` (the default value).
 * Set `.spec.strategy.rollingUpdate.maxUnavailable` and `.spec.strategy.rollingUpdate.maxSurge` to some reasonable value.
   * `maxUnavailable`: the maximum number of pods that can be unavailable during the update process. This can be an absolute number or percentage of the replicas count; the default is 25%.