Merge branch 'master' of https://github.com/kubernetes/kubernetes.git…

…hub.io

* 'master' of https://github.com/kubernetes/kubernetes.github.io: (859 commits)
  fixed the line giving the template for creating configmap, should include the word configmap as part of the creation process.
  Fixes issue kubernetes#3939
  Add CRI runtime support
  Updaated install-kubeadm.md, removed redundant kubectl installation (kubernetes#4006)
  Add Chocolatey Package Manager for Windows (kubernetes#4000)
  Make issue title automatically a link
  Update directions for macOS bash completion
  Add TCP socket health check example (kubernetes#3977)
  Update networking.md (kubernetes#3950)
  [authorization] fix invalid href for webhook
  Remove self-referential link
  Add fibre channel volume explanation (kubernetes#3967)
  Improve RBAC doc (kubernetes#3951)
  Clarify CNI acronym
  Fix 404 to kubectl install link
  install-kubectl.md: Fix Windows texts, link to latest macOS binaries
  Create Installing kubeadm topic. (kubernetes#3709)
  Fix example in the "Adding ConfigMap data to a Volume" section
  Update ExternalName example
  Completes PR kubernetes#3325
  ...

# Conflicts:
#	_data/tasks.yml
#	docs/tasks/administer-cluster/namespaces-walkthrough.md
#	docs/tasks/administer-cluster/namespaces.md

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,7 @@
+> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+> For 1.7 Features: set Milestone to `1.7` and Base Branch to `release-1.7`
+> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>
+> NOTE: Please check the “Allow edits from maintainers” box below to allow 
+> reviewers fix problems on your patch and speed up the review process.
+> Please delete this note before submitting the pull request.

.gitignore

@@ -24,4 +24,3 @@ Session.vim
 tags
 
 kubernetes.github.io.iml
-_redirects

.travis.yml

@@ -1,6 +1,6 @@
 language: go
 go:
-  - 1.7.3
+  - 1.8.1
 
 # Don't want default ./... here:
 install:
@@ -11,23 +11,9 @@ install:
 # (1) Fetch dependencies for us to run the tests in test/examples_test.go
 - go get -t -v k8s.io/kubernetes.github.io/test
 
-# The dependencies are complicated for test/examples_test.go
-# k8s.io/kubernetes/pkg is a dependency, which in turn depends on apimachinery
-# but we also have apimachinery directly as one of our dependencies, which causes a conflict.
-# Additionally, we get symlinks when we clone the directory. The below steps do the following:
-
-# (a) Replace the symlink with the actual dependencies from kubernetes/staging/src/
-# (b) copy all the vendored files to $GOPATH/src
-- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/apimachinery
-- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/apiserver
-- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/client-go
-- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/sample-apiserver
-- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/kube-aggregator
-- cp -r $GOPATH/src/k8s.io/kubernetes/vendor/* $GOPATH/src/
-- rm -rf $GOPATH/src/k8s.io/kubernetes/vendor/*
-- cp -r $GOPATH/src/k8s.io/kubernetes/staging/src/* $GOPATH/src/
-- cp -r $GOPATH/src/k8s.io/apimachinery/vendor/* $GOPATH/src/
-- rm -rf $GOPATH/src/k8s.io/apimachinery/vendor/*
+# Simplified deduplication of dependencies.
+- cp -L -R $GOPATH/src/k8s.io/kubernetes/vendor/ $GOPATH/src/
+- rm -r $GOPATH/src/k8s.io/kubernetes/vendor/
 
 # (2) Fetch md-check along with all its dependencies.
 - git clone --depth=50 --branch=master https://github.com/kubernetes/md-check $HOME/gopath/src/k8s.io/md-check

CONTRIBUTING.md

@@ -17,7 +17,7 @@ The [Kubernetes SIG Docs Discussion Group](https://groups.google.com/forum/#!for
 
 ### Style Guides and Templates
 
-Before submitting a pull request to create new content, please review the [Kubernetes.io style guide](http://kubernetes.io/docs/contribute/style-guide/) and follow the [instructions for using page templates](http://kubernetes.io/docs/contribute/page-templates/). 
+Before submitting a pull request to create new content, please review the [Kubernetes.io style guide](http://kubernetes.io/docs/home/contribute/style-guide/) and follow the [instructions for using page templates](http://kubernetes.io/docs/home/contribute/page-templates/). 
 
 
 ## Contributing to Documentation
@@ -33,4 +33,4 @@ Note that code issues should be filed against the main kubernetes repository, wh
 
 ### Submitting Documentation Pull Requests
 
-If you're fixing an issue in the existing documentation, you should submit a PR against the master branch.  Follow [these instructions to create a documentation pull request against the kubernetes.io repository](http://kubernetes.io/docs/contribute/create-pull-request/).
+If you're fixing an issue in the existing documentation, you should submit a PR against the master branch.  Follow [these instructions to create a documentation pull request against the kubernetes.io repository](http://kubernetes.io/docs/home/contribute/create-pull-request/).

Makefile

@@ -1,4 +1,4 @@
-.PHONY: all build build-preview generate-redirects help serve
+.PHONY: all build build-preview help serve
 
 help: ## Show this help.
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
@@ -11,8 +11,5 @@ build: ## Build site with production settings and put deliverables in _site.
 build-preview: ## Build site with drafts and future posts enabled.
 	jekyll build --drafts --future
 
-generate-redirects: ## Generate a redirects file and copy it into the _site directory.
-	mkdir -p _site && REDIRECTS_PATH=_site/_redirects ruby redirects.rb
-
 serve: ## Boot the development server.
 	jekyll serve

README.md

@@ -7,11 +7,11 @@ You can click the **Fork** button in the upper-right area of the screen to creat
 For more information about contributing to the Kubernetes documentation, see:
 
 * [Contributing to the Kubernetes Documentation](http://kubernetes.io/editdocs/)
-* [Creating a Documentation Pull Request](http://kubernetes.io/docs/contribute/create-pull-request/)
-* [Writing a New Topic](http://kubernetes.io/docs/contribute/write-new-topic/)
-* [Staging Your Documentation Changes](http://kubernetes.io/docs/contribute/stage-documentation-changes/)
-* [Using Page Templates](http://kubernetes.io/docs/contribute/page-templates/)
-* [Documentation Style Guide](http://kubernetes.io/docs/contribute/style-guide/)
+* [Creating a Documentation Pull Request](http://kubernetes.io/docs/home/contribute/create-pull-request/)
+* [Writing a New Topic](http://kubernetes.io/docs/home/contribute/write-new-topic/)
+* [Staging Your Documentation Changes](http://kubernetes.io/docs/home/contribute/stage-documentation-changes/)
+* [Using Page Templates](http://kubernetes.io/docs/home/contribute/page-templates/)
+* [Documentation Style Guide](http://kubernetes.io/docs/home/contribute/style-guide/)
 
 ## Thank you!
 

_config.yml

@@ -1,5 +1,6 @@
 name: Kubernetes
 title: Kubernetes
+url: https://kubernetes.io
 description: Production-Grade Container Orchestration
 markdown: kramdown
 kramdown:
@@ -17,7 +18,8 @@ defaults:
     scope:
       path: ""
     values:
-      version: "v1.5.1"
+      fullversion: "v1.6.3"
+      version: "v1.6"
       githubbranch: "master"
       docsbranch: "master"
   -
@@ -41,14 +43,16 @@ logo: /images/favicon.png
 twitter:
   username: kubernetesio
 
+# empty array for tabs
+emptyArray: []
+
 # Tables of contents, stored in the _data folder, that control the sidebar nav
 tocs:
   - docs-home
-  - guides
-  - tutorials
+  - setup
   - tasks
+  - tutorials
   - concepts
   - reference
-  - tools
   - samples
-  - support
+  - search

_data/concepts.yml

@@ -10,56 +10,83 @@ toc:
   - title: Working with Kubernetes Objects
     section:
     - docs/concepts/overview/working-with-objects/kubernetes-objects.md
+    - docs/concepts/overview/working-with-objects/names.md
+    - docs/concepts/overview/working-with-objects/namespaces.md
     - docs/concepts/overview/working-with-objects/labels.md
     - docs/concepts/overview/working-with-objects/annotations.md
   - docs/concepts/overview/kubernetes-api.md
 
+- title: Kubernetes Architecture
+  section:
+  - docs/concepts/architecture/nodes.md
+  - docs/concepts/architecture/master-node-communication.md
+
+- title: Containers
+  section:
+  - docs/concepts/containers/images.md
+  - docs/concepts/containers/container-environment-variables.md
+  - docs/concepts/containers/container-lifecycle-hooks.md
+
 - title: Workloads
   section:
   - title: Pods
     section:
     - docs/concepts/workloads/pods/pod-overview.md
+    - docs/concepts/workloads/pods/pod.md
     - docs/concepts/workloads/pods/pod-lifecycle.md
     - docs/concepts/workloads/pods/init-containers.md
   - title: Controllers
     section:
+    - docs/concepts/workloads/controllers/replicaset.md
+    - docs/concepts/workloads/controllers/replicationcontroller.md
+    - docs/concepts/workloads/controllers/deployment.md
     - docs/concepts/workloads/controllers/statefulset.md
     - docs/concepts/workloads/controllers/petset.md
+    - docs/concepts/workloads/controllers/daemonset.md
     - docs/concepts/workloads/controllers/garbage-collection.md
-  - title: Jobs
-    section:
-    - docs/concepts/jobs/run-to-completion-finite-workloads.md
+    - docs/concepts/workloads/controllers/jobs-run-to-completion.md
+    - docs/concepts/workloads/controllers/cron-jobs.md
+
+- title: Configuration
+  section:
+  - docs/concepts/configuration/overview.md
+  - docs/concepts/configuration/manage-compute-resources-container.md
+  - docs/concepts/configuration/assign-pod-node.md
+  - docs/concepts/configuration/secret.md
+
+- title: Services, Load Balancing, and Networking
+  section:
+  - docs/concepts/services-networking/service.md
+  - docs/concepts/services-networking/dns-pod-service.md
+  - docs/concepts/services-networking/connect-applications-service.md
+  - docs/concepts/services-networking/ingress.md
+  - docs/concepts/services-networking/networkpolicies.md
+
+- title: Storage
+  section:
+  - docs/concepts/storage/volumes.md
+  - docs/concepts/storage/persistent-volumes.md
+  - title: Dynamic Provisioning
+    path: http://blog.kubernetes.io/2016/10/dynamic-provisioning-and-storage-in-kubernetes.html
 
 - title: Cluster Administration
   section:
+  - docs/concepts/cluster-administration/cluster-administration-overview.md
   - docs/concepts/cluster-administration/manage-deployment.md
   - docs/concepts/cluster-administration/networking.md
   - docs/concepts/cluster-administration/network-plugins.md
   - docs/concepts/cluster-administration/logging.md
-  - docs/concepts/cluster-administration/audit.md
-  - docs/concepts/cluster-administration/resource-usage-monitoring.md
-  - docs/concepts/cluster-administration/out-of-resource.md
-  - docs/concepts/cluster-administration/multiple-clusters.md
+  - docs/concepts/cluster-administration/kubelet-garbage-collection.md
   - docs/concepts/cluster-administration/federation.md
-  - docs/concepts/cluster-administration/federation-service-discovery.md
-  - docs/concepts/cluster-administration/guaranteed-scheduling-critical-addon-pods.md
-  - docs/concepts/cluster-administration/static-pod.md
   - docs/concepts/cluster-administration/sysctl-cluster.md
-  - docs/concepts/cluster-administration/access-cluster.md
   - docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig.md
+  - docs/concepts/cluster-administration/master-node-communication.md
+  - docs/concepts/cluster-administration/proxies.md
+  - title: Policies
+    section:
+    - docs/concepts/policy/container-capabilities.md
+    - docs/concepts/policy/resource-quotas.md
+    - docs/concepts/policy/security-context.md
+    - docs/concepts/policy/pod-security-policy.md
 
-- title: Services, Load Balancing, and Networking
-  section:
-  - docs/concepts/services-networking/dns-pod-service.md
-  - docs/concepts/services-networking/connect-applications-service.md
-
-- title: Configuration
-  section:
-  - docs/concepts/configuration/overview.md
-  - docs/concepts/configuration/container-command-args.md
-  - docs/concepts/configuration/manage-compute-resources-container.md
 
-- title: Policies
-  section:
-  - docs/concepts/policy/container-capabilities.md
-  - docs/concepts/policy/resource-quotas.md

_data/docs-home.yml

@@ -1,4 +1,23 @@
-bigheader: "Kubernetes Documentation"
+bigheader: "Documentation Home"
 abstract: "Documentation for using and learning about Kubernetes."
 toc:
-- docs/index.md
+- docs/home/index.md
+
+- docs/home/index.md
+
+- title: Release Notes
+  path: https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG.md
+- title: Release Roadmap
+  path: https://github.com/kubernetes/kubernetes/milestones/
+
+- docs/tasks/debug-application-cluster/troubleshooting.md
+
+- title: Contributing to the Kubernetes Docs
+  section:
+  - editdocs.md
+  - docs/home/contribute/create-pull-request.md
+  - docs/home/contribute/write-new-topic.md
+  - docs/home/contribute/stage-documentation-changes.md
+  - docs/home/contribute/page-templates.md
+  - docs/home/contribute/review-issues.md
+  - docs/home/contribute/style-guide.md

_data/globals.yml

@@ -1,10 +1,10 @@
 tocs:
 - docs-home
 - guides
-- tutorials
+- setup
 - tasks
+- tutorials
 - concepts
 - reference
-- tools
 - samples
 - support