Skip to content

Commit

Permalink
Merge pull request kubernetes#2149 from devin-donnelly/toc-updates
Browse files Browse the repository at this point in the history
Updates TOCs to add missing files from kubernetes#2007
  • Loading branch information
devin-donnelly committed Jan 5, 2017
2 parents ee08d90 + dc984a6 commit 50d34bd
Show file tree
Hide file tree
Showing 22 changed files with 58 additions and 83 deletions.
34 changes: 31 additions & 3 deletions _data/guides.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ toc:
- docs/getting-started-guides/network-policy/walkthrough.md
- docs/getting-started-guides/network-policy/calico.md
- docs/getting-started-guides/network-policy/romana.md
- docs/getting-started-guides/network-policy/weave.md

- title: Batch Jobs
section:
Expand All @@ -67,7 +68,9 @@ toc:
- docs/user-guide/simple-nginx.md
- docs/user-guide/pods/single-container.md
- docs/user-guide/pods/multi-container.md
- docs/user-guide/pods/init-container.md
- docs/user-guide/configuring-containers.md
- docs/user-guide/pod-templates.md
- docs/user-guide/production-pods.md
- docs/user-guide/containers.md
- docs/user-guide/environment-guide/index.md
Expand Down Expand Up @@ -149,7 +152,11 @@ toc:
- docs/getting-started-guides/fedora/flannel_multi_node_cluster.md
- docs/getting-started-guides/centos/centos_manual_config.md
- docs/getting-started-guides/coreos/index.md
- /docs/getting-started-guides/ubuntu/
- title: Ubuntu
section:
- docs/getting-started-guides/ubuntu/automated.md
- docs/getting-started-guides/ubuntu/calico.md
- docs/getting-started-guides/ubuntu/manual.md
- docs/getting-started-guides/windows/index.md
- docs/admin/node-conformance.md
- docs/getting-started-guides/docker-multinode.md
Expand All @@ -163,11 +170,16 @@ toc:
- docs/admin/cluster-management.md
- docs/admin/kubeadm.md
- docs/admin/addons.md
- docs/admin/audit.md
- docs/admin/ha-master-gce.md
- docs/admin/namespaces/index.md
- docs/admin/namespaces/walkthrough.md
- docs/admin/limitrange/index.md
- docs/admin/disruptions.md
- docs/admin/resourcequota/index.md
- docs/admin/resourcequota/walkthrough.md
- docs/admin/rescheduler.md
- docs/admin/sysctls.md
- docs/admin/cluster-components.md
- docs/admin/etcd.md
- docs/admin/multi-cluster.md
Expand All @@ -189,5 +201,21 @@ toc:

- title: Administering Federation
section:
- /docs/admin/federation/kubfed/
- docs/admin/federation/index.md
- docs/admin/federation/kubefed.md
- title: Federated Kubernetes Objects
section:
- docs/user-guide/federation/index.md
- docs/user-guide/federation/configmap.md
- docs/user-guide/federation/daemonsets.md
- docs/user-guide/federation/deployment.md
- docs/user-guide/federation/events.md
- docs/user-guide/federation/federated-ingress.md
- docs/user-guide/federation/namespaces.md
- docs/user-guide/federation/replicasets.md
- docs/user-guide/federation/secrets.md
- docs/federation/api-reference/index.md
- title: Federation Components
section:
- docs/admin/federation-apiserver.md
- title : federation-controller-mananger
path: /docs/admin/federation-controller-manager
18 changes: 1 addition & 17 deletions _data/reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ toc:
- docs/admin/service-accounts-admin.md
- docs/api-reference/v1/operations.html
- docs/api-reference/v1/definitions.html
- docs/api-reference/labels-annotations-taints.md
- kubernetes/third_party/swagger-ui/index.md

- title: Autoscaling API
Expand Down Expand Up @@ -183,20 +184,3 @@ toc:
- title: Security in Kubernetes
path: https://github.com/kubernetes/kubernetes/blob/release-1.3/docs/design/security.md

- title: Federation
section:
- docs/user-guide/federation/index.md
- docs/user-guide/federation/configmap.md
- docs/user-guide/federation/daemonsets.md
- docs/user-guide/federation/deployment.md
- docs/user-guide/federation/events.md
- docs/user-guide/federation/federated-ingress.md
- docs/user-guide/federation/namespaces.md
- docs/user-guide/federation/replicasets.md
- docs/user-guide/federation/secrets.md
- docs/federation/api-reference/README.md
- title: Federation Components
section:
- docs/admin/federation-apiserver.md
- title : federation-controller-mananger
path: /docs/admin/federation-controller-manager
4 changes: 2 additions & 2 deletions _data/tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ toc:
- title: Accessing Applications in a Cluster
section:
- docs/tasks/access-application-cluster/port-forward-access-application-cluster.md
- docs/tasks/access-application-cluster/load-balance-access-application-cluster.md

- title: Debugging Applications in a Cluster
section:
Expand All @@ -29,7 +30,6 @@ toc:
- title: Administering a Cluster
section:
- docs/tasks/administer-cluster/assign-pods-nodes.md

- docs/tasks/administer-cluster/dns-horizontal-autoscaling.md
- docs/tasks/administer-cluster/safely-drain-node.md

Expand All @@ -44,4 +44,4 @@ toc:
- title: Troubleshooting
section:
- docs/tasks/troubleshoot/debug-init-containers.md
- /docs/tasks/administer-cluster/access-control-identity-management/
- docs/tasks/administer-cluster/access-control-identity-management/
3 changes: 3 additions & 0 deletions _data/tutorials.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ toc:
- docs/tutorials/stateful-application/run-stateful-application.md
- docs/tutorials/stateful-application/run-replicated-stateful-application.md
- docs/tutorials/stateful-application/zookeeper.md
- title: Services
section:
- docs/tutorials/services/source-ip.md
4 changes: 1 addition & 3 deletions docs/admin/audit.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@
assignees:
- soltysh
- sttts

title: Audit in Kubernetes
---

* TOC
{:toc}

## Audit in Kubernetes

Kubernetes Audit provides a security-relevant chronological set of records documenting
the sequence of activities that have affected system by individual users, administrators
or other components of the system. It allows cluster administrator to
Expand Down
2 changes: 1 addition & 1 deletion docs/admin/federation/kubefed.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
assignees:
- madhusudancs

title: Setting up Cluster Federation with Kubefed
---

* TOC
Expand Down
4 changes: 1 addition & 3 deletions docs/admin/ha-master-gce.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
---
assignees:
- jszczepkowski

title: Setting up High-Availability Kubernetes Masters
---

* TOC
{:toc}

## Introduction

Kubernetes version 1.5 adds alpha support for replicating Kubernetes masters in `kube-up` or `kube-down` scripts for Google Compute Engine.
This document describes how to use kube-up/down scripts to manage highly available (HA) masters and how HA masters are implemented for use with GCE.

Expand Down
6 changes: 2 additions & 4 deletions docs/admin/rescheduler.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@ assignees:
- davidopp
- filipg
- piosz

title: Guaranteed Scheduling For Critical Add-On Pods
---

* TOC
{:toc}

# "Guaranteed" scheduling of critical add-on pods

## Critical add-ons
## Overview

In addition to Kubernetes core components like api-server, scheduler, controller-manager running on a master machine
there are a number of add-ons which, for various reasons, must run on a regular cluster node (rather than the Kubernetes master).
Expand Down
2 changes: 1 addition & 1 deletion docs/admin/sysctls.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
assignees:
- sttts

title: Using Sysctls in a Kubernetes Cluster
---

* TOC
Expand Down
16 changes: 0 additions & 16 deletions docs/api-reference/README.md

This file was deleted.

2 changes: 1 addition & 1 deletion docs/api-reference/labels-annotations-taints.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Well-Known Labels, Annotations and Taints
---
# Well-Known Labels, Annotations and Taints

Kubernetes reserves all labels and annotations in the kubernetes.io namespace. This document describes
the well-known kubernetes.io labels and annotations.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
---
title: Federation API
title: Federation API Reference
---

# API Reference

Federation API server supports the following group versions:

* federation/v1beta1: [operations](/docs/federation/api-reference/federation/v1beta1/operations.html), [model definitions](/docs/federation/api-reference/federation/v1beta1/definitions.html)
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started-guides/network-policy/weave.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
assignees:
- bboreham

title: Weave Net Addon
---

The [Weave Net Addon](https://www.weave.works/docs/net/latest/kube-addon/) for Kubernetes comes with a Network Policy Controller.
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started-guides/ubuntu/automated.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
assignees:
- caesarxuchao
- erictune

title: Setting up Kubernetes with Juju
---

Ubuntu 16.04 introduced the [Canonical Distribution of Kubernetes](https://jujucharms.com/canonical-kubernetes/), a pure upstream distribution of Kubernetes designed for production usage. Out of the box it comes with the following components on 12 machines:
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started-guides/ubuntu/calico.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---

title: Deploying Kubernetes with Calico Networking on Ubuntu
---

This document describes how to deploy Kubernetes with Calico networking from scratch on _bare metal_ Ubuntu. For more information on Project Calico, visit [projectcalico.org](http://projectcalico.org) and the [calico-containers repository](https://github.com/projectcalico/calico-containers).
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started-guides/ubuntu/manual.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
assignees:
- thockin

title: Manually Deploying Kubernetes on Ubuntu Nodes
---

This document describes how to deploy Kubernetes on ubuntu nodes, 1 master and 3 nodes involved
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
title: Providing Load-Balanced Access to an Application in a Cluster
---

{% capture overview %}
Expand Down
4 changes: 4 additions & 0 deletions docs/tutorials/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ each of which has a sequence of steps.

* [Running ZooKeeper, A CP Distributed System](/docs/tutorials/stateful-application/zookeeper/)

#### Services

* [Using SourceIP](/docs/tutorials/services/source-ip/)

### What's next

If you would like to write a tutorial, see
Expand Down
1 change: 1 addition & 0 deletions docs/tutorials/services/source-ip.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
title: Using Source IP
---

{% capture overview %}
Expand Down
23 changes: 0 additions & 23 deletions docs/user-guide/environment-guide/containers/README.md

This file was deleted.

3 changes: 2 additions & 1 deletion docs/user-guide/pod-templates.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
---
assignees:
- erictune

title: Pod Templates
---

Pod templates are [pod](/docs/user-guide/pods/) specifications which are included in other objects, such as
[Replication Controllers](/docs/user-guide/replication-controller/), [Jobs](/docs/user-guide/jobs/), and
[DaemonSets](/docs/admin/daemons/). Controllers use Pod Templates to make actual pods.
Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/pods/init-container.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
assignees:
- erictune

title: Init Containers
---

* TOC
Expand Down

0 comments on commit 50d34bd

Please sign in to comment.