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

2016-09-26 16:20:27 -07:00
parent d35628f4cf 1660d47d14
commit 926ec86e60
256 changed files with 105591 additions and 10885 deletions
@@ -0,0 +1,8 @@
+bigheader: "Concepts"
+toc:
+- title: Concepts
+  path: /docs/concepts/
+- title: Object Metadata
+  section:
+  - title: Annotations
+    path: /docs/concepts/object-metadata/annotations/
@@ -1,6 +1,8 @@
 tocs:
 - guides
 - tutorials
+- tasks
+- concepts
 - reference
 - samples
 - support
@@ -8,10 +8,12 @@ toc:
  section:
  - title: What is Kubernetes?
    path: /docs/whatisk8s/
+  - title: Installing Kubernetes on Linux with kubeadm
+    path: /docs/getting-started-guides/kubeadm/
+  - title: Hello World on Google Container Engine
+    path: /docs/hellonode/
  - title: Downloading or Building Kubernetes
    path: /docs/getting-started-guides/binary_release/
-  - title: Hello World Walkthrough
-    path: /docs/hellonode/
  - title: Online Training Course
    path: https://www.udacity.com/course/scalable-microservices-with-kubernetes--ud615

@@ -58,8 +60,14 @@ toc:
    path: /docs/user-guide/config-best-practices/
  - title: Using kubectl to Manage Resources
    path: /docs/user-guide/working-with-resources/
-  - title: Garbage collection
-    path: /docs/user-guide/garbage-collector/
+  - title: Garbage Collection (Beta)
+    path: /docs/user-guide/garbage-collection/
+  - title: Using NetworkPolicy
+    section:
+    - title: Example Walkthrough
+      path: /docs/getting-started-guides/network-policy/walkthrough/
+    - title: Using Calico for NetworkPolicy 
+      path: /docs/getting-started-guides/network-policy/calico/

 - title: Batch Jobs
  section:
@@ -227,6 +235,8 @@ toc:
        path: /docs/getting-started-guides/ubuntu/
      - title: Ubuntu Nodes with Calico
        path: /docs/getting-started-guides/ubuntu-calico/
+    - title: Validate Node Setup
+      path: /docs/admin/node-conformance
  - title: Portable Multi-Node Cluster
    path: /docs/getting-started-guides/docker-multinode/
  - title: Building Large Clusters
@@ -242,6 +252,8 @@ toc:
    path: /docs/admin/
  - title: Cluster Management Guide
    path: /docs/admin/cluster-management/
+  - title: Installing Addons
+    path: /docs/admin/addons/
  - title: Sharing a Cluster with Namespaces
    path: /docs/admin/namespaces/
  - title: Namespaces Walkthrough
@@ -284,3 +296,5 @@ toc:
    path: /docs/admin/salt/
  - title: Monitoring Node Health
    path: /docs/admin/node-problem/
+  - title: AppArmor
+    path: /docs/admin/apparmor/
@@ -8,10 +8,11 @@ overrides:
 - path: docs/admin/kube-proxy.md
 - path: docs/admin/kube-scheduler.md
 - path: docs/admin/kubelet.md
- changedpath: docs/api-reference/extensions/v1beta1/definitions.html _includes/v1.3/extensions-v1beta1-definitions.html
- changedpath: docs/api-reference/extensions/v1beta1/operations.html _includes/v1.3/extensions-v1beta1-operations.html
- changedpath: docs/api-reference/v1/definitions.html _includes/v1.3/v1-definitions.html
- changedpath: docs/api-reference/v1/operations.html _includes/v1.3/v1-operations.html
+- changedpath: docs/api-reference/extensions/v1beta1/definitions.html _includes/v1.4/extensions-v1beta1-definitions.html
+- changedpath: docs/api-reference/extensions/v1beta1/operations.html _includes/v1.4/extensions-v1beta1-operations.html
+- changedpath: docs/api-reference/v1/definitions.html _includes/v1.4/v1-definitions.html
+- changedpath: docs/api-reference/v1/operations.html _includes/v1.4/v1-operations.html
+- 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
 - copypath: k8s/examples/blog-logging/counter-pod.yaml docs/getting-started-guides/counter-pod.yaml
 - copypath: k8s/examples/blog-logging/counter-pod.yaml docs/user-guide/counter-pod.yaml
@@ -212,12 +212,16 @@ toc:
    path: /docs/user-guide/petset/    
  - title: Pods
    path: /docs/user-guide/pods/
+  - title: Pod Security Policies
+    path: /docs/user-guide/pod-security-policy/
  - title: Replica Sets
    path: /docs/user-guide/replicasets/
  - title: Replication Controller
    path: /docs/user-guide/replication-controller/    
  - title: Resource Quotas
    path: /docs/admin/resource-quota/    
+  - title: Scheduled Jobs
+    path: /docs/user-guide/scheduled-jobs/
  - title: Secrets
    path: /docs/user-guide/secrets/
  - title: Security Context
@@ -225,7 +229,7 @@ toc:
  - title: Services
    path: /docs/user-guide/services/
  - title: Service Accounts
-    path: /docs/user-guide/service-accounts/    
+    path: /docs/user-guide/service-accounts/
  - title: Volumes
    path: /docs/user-guide/volumes/

@@ -243,3 +247,26 @@ toc:
    path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/security_context.md
  - title: Security in Kubernetes
    path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/security.md    
+
+- title: Federation
+  section:
+  - title: Federation User Guide
+    path: /docs/user-guide/federation/
+  - title: Federated Events
+    path: /docs/user-guide/federation/events/
+  - title: Federated Ingress
+    path: /docs/user-guide/federation/federated-ingress/
+  - title: Federated Namespaces
+    path: /docs/user-guide/federation/namespaces/
+  - title: Federated ReplicaSets
+    path: /docs/user-guide/federation/replicasets/
+  - title: Federated Secrets
+    path: /docs/user-guide/federation/secrets/
+  - title: Federation API
+    path: /docs/federation/api-reference/README/
+  - title: Federation Components
+    section:
+    - title: federation-apiserver
+      path: /docs/admin/federation-apiserver.md
+    - title : federation-controller-mananger
+      path: /docs/admin/federation-controller-manager.md
@@ -4,6 +4,11 @@ toc:
 - title: Support
  path: /docs/troubleshooting/

+- title: Contributing to the Kubernetes Docs
+  section:
+  - title: Using Page Templates
+    path: /docs/contribute/page-templates/
+
 - title: Troubleshooting
  section:
  - title: Debugging Pods and Replication Controllers
@@ -0,0 +1,13 @@
+bigheader: "Tasks"
+toc:
+- title: Tasks
+  path: /docs/tasks/
+- title: Accessing Applications in a Cluster
+  section:
+  - title: Using Port Forwarding to Access Applications in a Cluster
+    path: /docs/tasks/access-application-cluster/port-forward-access-application-cluster/
+- title: Accessing the Kubernetes API
+  section:
+  - title: Using an HTTP Proxy to Access the Kubernetes API
+    path: /docs/tasks/access-kubernetes-api/http-proxy-access-api/
+
@@ -1,7 +1,7 @@
 bigheader: "Tutorials"
 toc:
 - title: Tutorials
-  path: /docs/tutorials/getting-started/
+  path: /docs/tutorials/
 - title: Getting Started
  section:
  - title: 1. Create a Cluster
@@ -52,3 +52,9 @@ toc:
      path: /docs/tutorials/getting-started/update-intro/
    - title: Interactive Tutorial - Updating Your App
      path: /docs/tutorials/getting-started/update-interactive/
+- title: Stateless Applications
+  section:
+  - title: Running a Stateless Application Using a Deployment
+    path: /docs/tutorials/stateless-application/run-stateless-application-deployment/
+  - title: Exposing an External IP Address Using a Service
+    path: /docs/tutorials/stateless-application/expose-external-ip-address-service/