merge master to 1.10, with fixes (#7682)

This commit is contained in:
Jennifer Rondeau
2018-03-08 14:03:55 -05:00
committed by k8s-ci-robot
parent bb8c59a640
commit 44b51d6056
548 changed files with 11634 additions and 318622 deletions
+12 -16
View File
@@ -1,10 +1,14 @@
bigheader: "Reference Documentation"
bigheader: "Reference"
abstract: "Design docs, concept definitions, and references for APIs and CLIs."
landing_page: /docs/reference/index/
toc:
- docs/reference/index.md
- docs/reference/glossary.md
- title: Standardized Glossary
path: /docs/reference/glossary/
- title: Using the API
landing_page: /docs/reference/api-overview/
section:
- docs/reference/api-overview.md
- docs/reference/client-libraries.md
@@ -28,6 +32,7 @@ toc:
- docs/reference/workloads-18-19.md
- title: API Reference
landing_page: /docs/api-reference/v1.8/
section:
- title: v1.9
path: /docs/reference/generated/kubernetes-api/v1.9/
@@ -40,6 +45,7 @@ toc:
path: https://git.k8s.io/kubernetes/api/swagger-spec/
- title: Federation API
landing_page: /docs/reference/federation/v1/operations/
section:
- docs/reference/generated/federation/v1/operations.html
- docs/reference/generated/federation/v1/definitions.html
@@ -47,6 +53,7 @@ toc:
- docs/reference/generated/federation/extensions/v1beta1/definitions.html
- title: kubectl CLI
landing_page: /docs/user-guide/kubectl-overview/
section:
- docs/reference/kubectl/overview.md
- docs/reference/generated/kubectl/kubectl.md
@@ -58,6 +65,7 @@ toc:
- docs/reference/kubectl/cheatsheet.md
- title: Setup Tools Reference
landing_page: /docs/reference/setup-tools/kubeadm/kubeadm/
section:
- title: Kubeadm
section:
@@ -81,6 +89,7 @@ toc:
- docs/reference/generated/kubefed_version.md
- title: Command-line Tools Reference
landing_page: /docs/admin/kubelet/
section:
- docs/reference/feature-gates.md
- docs/reference/generated/kubelet.md
@@ -94,21 +103,8 @@ toc:
- docs/reference/generated/federation-apiserver.md
- docs/reference/generated/federation-controller-manager.md
- title: Kubernetes Design Docs
section:
- title: Kubernetes Architecture
path: https://git.k8s.io/community/contributors/design-proposals/architecture/architecture.md
- title: Kubernetes Design Overview
path: https://github.com/kubernetes/kubernetes/tree/release-1.6/docs/design
- title: Kubernetes Identity and Access Management
path: https://git.k8s.io/community/contributors/design-proposals/auth/access.md
- docs/admin/ovs-networking.md
- title: Security Contexts
path: https://git.k8s.io/community/contributors/design-proposals/auth/security_context.md
- title: Security in Kubernetes
path: https://git.k8s.io/community/contributors/design-proposals/auth/security.md
- title: Kubernetes Issues and Security
landing_page: https://github.com/kubernetes/kubernetes/issues/
section:
- title: Kubernetes Issue Tracker on GitHub
path: https://github.com/kubernetes/kubernetes/issues/