From dfcc964cafa5874e6e02c68326d658325bf19339 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Thu, 18 Feb 2016 03:27:39 -0800 Subject: [PATCH] Groupings for Guides TOC --- _data/v1_1/guides.yml | 72 ++++++++++++---------- _data/v1_1/reference.yml | 2 + v1.1/docs/devel/releasing.dot | 113 ---------------------------------- 3 files changed, 40 insertions(+), 147 deletions(-) delete mode 100644 v1.1/docs/devel/releasing.dot diff --git a/_data/v1_1/guides.yml b/_data/v1_1/guides.yml index 59ab2970c7..7be35dcf50 100644 --- a/_data/v1_1/guides.yml +++ b/_data/v1_1/guides.yml @@ -104,43 +104,11 @@ toc: path: /v1.1/docs/admin/garbage-collection/ - title: Configuring Kubernetes with Salt path: /v1.1/docs/admin/salt/ -- title: Common Tasks + +- title: Using Nodes, Pods, and Containers section: - - title: Using Nodes - path: /v1.1/docs/admin/node/ - title: Assigning Pods to Nodes path: /v1.1/docs/user-guide/node-selection/ - - title: Using Configuration Files - path: /v1.1/docs/user-guide/simple-yaml/ - - title: Configuring Containers - path: /v1.1/docs/user-guide/configuring-containers/ - - title: Using Environment Variables - path: /v1.1/docs/user-guide/environment-guide/ - - - title: Managing Compute Resources - path: /v1.1/docs/user-guide/compute-resources/ - - title: Applying Resource Quotas and Limits - path: /v1.1/docs/admin/resourcequota/ - - title: Setting Pod CPU and Memory Limits - path: /v1.1/docs/admin/limitrange/ - - - title: Managing Deployments - path: /v1.1/docs/user-guide/managing-deployments/ - - title: Deploying Applications - path: /v1.1/docs/user-guide/deploying-applications/ - - title: Launching, Exposing, and Killing Applications - path: /v1.1/docs/user-guide/quick-start/ - - title: Connecting Applications - path: /v1.1/docs/user-guide/connecting-applications/ - - - title: Networking in Kubernetes - path: /v1.1/docs/admin/networking/ - - title: Creating Servers with External IPs - path: /v1.1/examples/simple-nginx/ - - title: Setting Up and Configuring DNS - path: /v1.1/examples/cluster-dns/ - - title: Using DNS Pods and Services - path: /v1.1/docs/admin/dns/ - title: Working with Containers path: /v1.1/docs/user-guide/production-pods/ - title: Creating Pods with the Downward API @@ -148,6 +116,42 @@ toc: - title: Updating Live Pods path: /v1.1/docs/user-guide/update-demo/ +- title: Networking + section: + - title: Networking in Kubernetes + path: /v1.1/docs/admin/networking/ + - title: Setting Up and Configuring DNS + path: /v1.1/examples/cluster-dns/ + - title: Connecting Applications + path: /v1.1/docs/user-guide/connecting-applications/ + - title: Creating Servers with External IPs + path: /v1.1/examples/simple-nginx/ + - title: Using DNS Pods and Services + path: /v1.1/docs/admin/dns/ + +- title: Configuring Kubernetes + section: + - title: Using Configuration Files + path: /v1.1/docs/user-guide/simple-yaml/ + - title: Configuring Containers + path: /v1.1/docs/user-guide/configuring-containers/ + - title: Using Environment Variables + path: /v1.1/docs/user-guide/environment-guide/ + - title: Managing Compute Resources + path: /v1.1/docs/user-guide/compute-resources/ + - title: Applying Resource Quotas and Limits + path: /v1.1/docs/admin/resourcequota/ + - title: Setting Pod CPU and Memory Limits + path: /v1.1/docs/admin/limitrange/ + +- title: Application Management and Deployment + section: + - title: Managing Deployments + path: /v1.1/docs/user-guide/managing-deployments/ + - title: Deploying Applications + path: /v1.1/docs/user-guide/deploying-applications/ + - title: Launching, Exposing, and Killing Applications + path: /v1.1/docs/user-guide/quick-start/ - title: Testing and Monitoring section: diff --git a/_data/v1_1/reference.yml b/_data/v1_1/reference.yml index d10f81e235..d98defda46 100644 --- a/_data/v1_1/reference.yml +++ b/_data/v1_1/reference.yml @@ -149,6 +149,8 @@ toc: path: /v1.1/docs/user-guide/identifiers/ - title: Namespaces path: /v1.1/docs/user-guide/namespaces/ + - title: Nodes + path: /v1.1/docs/admin/node/ - title: Service Accounts path: /v1.1/docs/user-guide/service-accounts/ - title: Annotations diff --git a/v1.1/docs/devel/releasing.dot b/v1.1/docs/devel/releasing.dot deleted file mode 100644 index fe8124c36d..0000000000 --- a/v1.1/docs/devel/releasing.dot +++ /dev/null @@ -1,113 +0,0 @@ -// Build it with: -// $ dot -Tsvg releasing.dot >releasing.svg - -digraph tagged_release { - size = "5,5" - // Arrows go up. - rankdir = BT - subgraph left { - // Group the left nodes together. - ci012abc -> pr101 -> ci345cde -> pr102 - style = invis - } - subgraph right { - // Group the right nodes together. - version_commit -> dev_commit - style = invis - } - { // Align the version commit and the info about it. - rank = same - // Align them with pr101 - pr101 - version_commit - // release_info shows the change in the commit. - release_info - } - { // Align the dev commit and the info about it. - rank = same - // Align them with 345cde - ci345cde - dev_commit - dev_info - } - // Join the nodes from subgraph left. - pr99 -> ci012abc - pr102 -> pr100 - // Do the version node. - pr99 -> version_commit - dev_commit -> pr100 - tag -> version_commit - pr99 [ - label = "Merge PR #99" - shape = box - fillcolor = "#ccccff" - style = "filled" - fontname = "Helvetica Neue, Helvetica, Segoe UI, Arial, freesans, sans-serif" - ]; - ci012abc [ - label = "012abc" - shape = circle - fillcolor = "#ffffcc" - style = "filled" - fontname = "Consolas, Liberation Mono, Menlo, Courier, monospace" - ]; - pr101 [ - label = "Merge PR #101" - shape = box - fillcolor = "#ccccff" - style = "filled" - fontname = "Helvetica Neue, Helvetica, Segoe UI, Arial, freesans, sans-serif" - ]; - ci345cde [ - label = "345cde" - shape = circle - fillcolor = "#ffffcc" - style = "filled" - fontname = "Consolas, Liberation Mono, Menlo, Courier, monospace" - ]; - pr102 [ - label = "Merge PR #102" - shape = box - fillcolor = "#ccccff" - style = "filled" - fontname = "Helvetica Neue, Helvetica, Segoe UI, Arial, freesans, sans-serif" - ]; - version_commit [ - label = "678fed" - shape = circle - fillcolor = "#ccffcc" - style = "filled" - fontname = "Consolas, Liberation Mono, Menlo, Courier, monospace" - ]; - dev_commit [ - label = "456dcb" - shape = circle - fillcolor = "#ffffcc" - style = "filled" - fontname = "Consolas, Liberation Mono, Menlo, Courier, monospace" - ]; - pr100 [ - label = "Merge PR #100" - shape = box - fillcolor = "#ccccff" - style = "filled" - fontname = "Helvetica Neue, Helvetica, Segoe UI, Arial, freesans, sans-serif" - ]; - release_info [ - label = "pkg/version/base.go:\ngitVersion = \"v0.5\";" - shape = none - fontname = "Helvetica Neue, Helvetica, Segoe UI, Arial, freesans, sans-serif" - ]; - dev_info [ - label = "pkg/version/base.go:\ngitVersion = \"v0.5-dev\";" - shape = none - fontname = "Helvetica Neue, Helvetica, Segoe UI, Arial, freesans, sans-serif" - ]; - tag [ - label = "$ git tag -a v0.5" - fillcolor = "#ffcccc" - style = "filled" - fontname = "Helvetica Neue, Helvetica, Segoe UI, Arial, freesans, sans-serif" - ]; -} -