whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
scotty
2016-02-11 15:19:13 -08:00
parent 6b7122fc0e 8d5417e58b
commit bf18ac6fa8
11 changed files with 37 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_data/v1_1/guides.yml
+4 -4
View File
@@ -100,6 +100,10 @@ toc:
path: /v1.1/docs/getting-started-guides/scratch path: /v1.1/docs/getting-started-guides/scratch
- title: Authenticating Across Clusters with kubeconfig - title: Authenticating Across Clusters with kubeconfig
path: /v1.1/docs/user-guide/kubeconfig-file path: /v1.1/docs/user-guide/kubeconfig-file
- title: Configuring Garbage Collection
path: /v1.1/docs/admin/garbage-collection
- title: Configuring Kubernetes with Salt
path: /v1.1/docs/admin/salt
- title: Common Tasks - title: Common Tasks
section: section:
- title: Using Nodes - title: Using Nodes
@@ -110,12 +114,8 @@ toc:
path: /v1.1/docs/user-guide/simple-yaml path: /v1.1/docs/user-guide/simple-yaml
- title: Configuring Containers - title: Configuring Containers
path: /v1.1/docs/user-guide/configuring-containers path: /v1.1/docs/user-guide/configuring-containers
- title: Configuring Kubernetes with Salt
path: /v1.1/docs/admin/salt
- title: Using Environment Variables - title: Using Environment Variables
path: /v1.1/docs/user-guide/environment-guide/README path: /v1.1/docs/user-guide/environment-guide/README
- title: Configuring Garbage Collection
path: /v1.1/docs/admin/garbage-collection
- title: Managing Compute Resources - title: Managing Compute Resources
path: /v1.1/docs/user-guide/compute-resources path: /v1.1/docs/user-guide/compute-resources
_data/v1_1/support.yml
+11 -13
View File
@@ -5,23 +5,21 @@ toc:
path: /v1.1/support path: /v1.1/support
section: section:
- title: Web Interface - title: Web Interface
path: /v1.1/docs/user-guide/ui.html path: /v1.1/docs/user-guide/ui
- title: Logging - title: Logging
path: /v1.1/docs/user-guide/logging.html path: /v1.1/docs/user-guide/logging
- title: Monitoring
path: /v1.1/docs/user-guide/monitoring.html
- title: Container Access (exec) - title: Container Access (exec)
path: /v1.1/docs/user-guide/getting-into-containers.html path: /v1.1/docs/user-guide/getting-into-containers
- title: Connect with Proxies - title: Connect with Proxies
path: /v1.1/docs/user-guide/connecting-to-applications-proxy.html path: /v1.1/docs/user-guide/connecting-to-applications-proxy
- title: Connect with Port Forwarding - title: Connect with Port Forwarding
path: /v1.1/docs/user-guide/connecting-to-applications-port-forward.html path: /v1.1/docs/user-guide/connecting-to-applications-port-forward
- title: Troubleshooting Applications - title: Troubleshooting Applications
path: /v1.1/docs/user-guide/application-troubleshooting.html path: /v1.1/docs/user-guide/application-troubleshooting
- title: Troubleshooting Clusters - title: Troubleshooting Clusters
path: /v1.1/docs/admin/cluster-troubleshooting.html path: /v1.1/docs/admin/cluster-troubleshooting
- title: Best Practices for Configuration - title: Best Practices for Configuration
path: /v1.1/docs/user-guide/config-best-practices.html path: /v1.1/docs/user-guide/config-best-practices
- title: Frequently Asked Questions - title: Frequently Asked Questions
section: section:
@@ -35,14 +33,14 @@ toc:
- title: Other Resources - title: Other Resources
section: section:
- title: Known Issues - title: Known Issues
path: /v1.1/docs/user-guide/known-issues.html path: /v1.1/docs/user-guide/known-issues
- title: Kubernetes Issue Tracker on GitHub - title: Kubernetes Issue Tracker on GitHub
path: https://github.com/kubernetes/kubernetes/issues path: https://github.com/kubernetes/kubernetes/issues
- title: Report a Security Vulnerability - title: Report a Security Vulnerability
path: /v1.1/docs/reporting-security-issues.html path: /v1.1/docs/reporting-security-issues
- title: Release Notes - title: Release Notes
path: https://github.com/kubernetes/kubernetes/releases path: https://github.com/kubernetes/kubernetes/releases
- title: Release Roadmap - title: Release Roadmap
path: /v1.1/docs/roadmap.html path: /v1.1/docs/roadmap
- title: Contributing to Kubernetes Documentation - title: Contributing to Kubernetes Documentation
path: /v1.1/editdocs path: /v1.1/editdocs
v1.1/docs/admin/garbage-collection.md
+3 -32
View File
@@ -1,19 +1,7 @@
--- ---
layout: docwithnav title: "Configuring Garbage Collection"
title: "Garbage Collection" section: guides
--- ---
<!-- BEGIN MUNGE: UNVERSIONED_WARNING -->
<!-- END MUNGE: UNVERSIONED_WARNING -->
# Garbage Collection
- [Introduction](#introduction)
- [Image Collection](#image-collection)
- [Container Collection](#container-collection)
- [User Configuration](#user-configuration)
### Introduction ### Introduction
Garbage collection is managed by kubelet automatically, mainly including unreferenced Garbage collection is managed by kubelet automatically, mainly including unreferenced
@@ -73,21 +61,4 @@ Default is 100.
Note that we highly recommend a large enough value for `maximum-dead-containers-per-container` Note that we highly recommend a large enough value for `maximum-dead-containers-per-container`
to allow at least 2 dead containers retaining per expected container when you customize the flag to allow at least 2 dead containers retaining per expected container when you customize the flag
configuration. A loose value for `maximum-dead-containers` also assumes importance for a similar reason. configuration. A loose value for `maximum-dead-containers` also assumes importance for a similar reason.
See [this issue](https://github.com/kubernetes/kubernetes/issues/13287) for more details. See [this issue](https://github.com/kubernetes/kubernetes/issues/13287) for more details.
<!-- BEGIN MUNGE: IS_VERSIONED -->
<!-- TAG IS_VERSIONED -->
<!-- END MUNGE: IS_VERSIONED -->
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/admin/garbage-collection.md?pixel)]()
<!-- END MUNGE: GENERATED_ANALYTICS -->
v1.1/docs/admin/salt.md
+3 -23
View File
@@ -1,14 +1,7 @@
--- ---
layout: docwithnav title: "Configuring Kubernetes with Salt"
title: "Using Salt to configure Kubernetes" section: guides
--- ---
<!-- BEGIN MUNGE: UNVERSIONED_WARNING -->
<!-- END MUNGE: UNVERSIONED_WARNING -->
# Using Salt to configure Kubernetes
The Kubernetes cluster can be configured using Salt. The Kubernetes cluster can be configured using Salt.
The Salt scripts are shared across multiple hosting providers, so it's important to understand some background information prior to making a modification to ensure your changes do not break hosting Kubernetes across multiple environments. Depending on where you host your Kubernetes cluster, you may be using different operating systems and different networking configurations. As a result, it's important to understand some background information before making Salt changes in order to minimize introducing failures for other hosting providers. The Salt scripts are shared across multiple hosting providers, so it's important to understand some background information prior to making a modification to ensure your changes do not break hosting Kubernetes across multiple environments. Depending on where you host your Kubernetes cluster, you may be using different operating systems and different networking configurations. As a result, it's important to understand some background information before making Salt changes in order to minimize introducing failures for other hosting providers.
@@ -113,17 +106,4 @@ We should define a grains.conf key that captures more specifically what network
## Further reading ## Further reading
The [cluster/saltbase](http://releases.k8s.io/release-1.1/cluster/saltbase/) tree has more details on the current SaltStack configuration. The [cluster/saltbase](http://releases.k8s.io/release-1.1/cluster/saltbase/) tree has more details on the current SaltStack configuration.
<!-- BEGIN MUNGE: IS_VERSIONED -->
<!-- TAG IS_VERSIONED -->
<!-- END MUNGE: IS_VERSIONED -->
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/admin/salt.md?pixel)]()
<!-- END MUNGE: GENERATED_ANALYTICS -->
v1.1/docs/user-guide/connecting-to-applications-port-forward.md
+2 -22
View File
@@ -1,14 +1,7 @@
--- ---
layout: docwithnav
title: "Connecting to applications: kubectl port-forward" title: "Connecting to applications: kubectl port-forward"
section: support
--- ---
<!-- BEGIN MUNGE: UNVERSIONED_WARNING -->
<!-- END MUNGE: UNVERSIONED_WARNING -->
# Connecting to applications: kubectl port-forward
kubectl port-forward forwards connections to a local port to a port on a pod. Its man page is available [here](kubectl/kubectl_port-forward.html). Compared to [kubectl proxy](accessing-the-cluster.html#using-kubectl-proxy), `kubectl port-forward` is more generic as it can forward TCP traffic while `kubectl proxy` can only forward HTTP traffic. This guide demonstrates how to use `kubectl port-forward` to connect to a Redis database, which may be useful for database debugging. kubectl port-forward forwards connections to a local port to a port on a pod. Its man page is available [here](kubectl/kubectl_port-forward.html). Compared to [kubectl proxy](accessing-the-cluster.html#using-kubectl-proxy), `kubectl port-forward` is more generic as it can forward TCP traffic while `kubectl proxy` can only forward HTTP traffic. This guide demonstrates how to use `kubectl port-forward` to connect to a Redis database, which may be useful for database debugging.
## Creating a Redis master ## Creating a Redis master
@@ -63,17 +56,4 @@ PONG
{% endraw %} {% endraw %}
{% endhighlight %} {% endhighlight %}
Now one can debug the database from the local workstation. Now one can debug the database from the local workstation.
<!-- BEGIN MUNGE: IS_VERSIONED -->
<!-- TAG IS_VERSIONED -->
<!-- END MUNGE: IS_VERSIONED -->
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/connecting-to-applications-port-forward.md?pixel)]()
<!-- END MUNGE: GENERATED_ANALYTICS -->
v1.1/docs/user-guide/connecting-to-applications-proxy.md
+2 -22
View File
@@ -1,14 +1,7 @@
--- ---
layout: docwithnav
title: "Connecting to applications: kubectl proxy and apiserver proxy" title: "Connecting to applications: kubectl proxy and apiserver proxy"
section: support
--- ---
<!-- BEGIN MUNGE: UNVERSIONED_WARNING -->
<!-- END MUNGE: UNVERSIONED_WARNING -->
# Connecting to applications: kubectl proxy and apiserver proxy
You have seen the [basics](accessing-the-cluster.html) about `kubectl proxy` and `apiserver proxy`. This guide shows how to use them together to access a service([kube-ui](ui.html)) running on the Kubernetes cluster from your workstation. You have seen the [basics](accessing-the-cluster.html) about `kubectl proxy` and `apiserver proxy`. This guide shows how to use them together to access a service([kube-ui](ui.html)) running on the Kubernetes cluster from your workstation.
@@ -37,17 +30,4 @@ Starting to serve on localhost:8001
{% endraw %} {% endraw %}
{% endhighlight %} {% endhighlight %}
Now you can access the kube-ui service on your local workstation at [http://localhost:8001/api/v1/proxy/namespaces/kube-system/services/kube-ui](http://localhost:8001/api/v1/proxy/namespaces/kube-system/services/kube-ui) Now you can access the kube-ui service on your local workstation at [http://localhost:8001/api/v1/proxy/namespaces/kube-system/services/kube-ui](http://localhost:8001/api/v1/proxy/namespaces/kube-system/services/kube-ui)
<!-- BEGIN MUNGE: IS_VERSIONED -->
<!-- TAG IS_VERSIONED -->
<!-- END MUNGE: IS_VERSIONED -->
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/connecting-to-applications-proxy.md?pixel)]()
<!-- END MUNGE: GENERATED_ANALYTICS -->
v1.1/docs/user-guide/getting-into-containers.md
+2 -22
View File
@@ -1,14 +1,7 @@
--- ---
layout: docwithnav
title: "Getting into containers: kubectl exec" title: "Getting into containers: kubectl exec"
section: support
--- ---
<!-- BEGIN MUNGE: UNVERSIONED_WARNING -->
<!-- END MUNGE: UNVERSIONED_WARNING -->
# Getting into containers: kubectl exec
Developers can use `kubectl exec` to run commands in a container. This guide demonstrates two use cases. Developers can use `kubectl exec` to run commands in a container. This guide demonstrates two use cases.
## Using kubectl exec to check the environment variables of a container ## Using kubectl exec to check the environment variables of a container
@@ -91,17 +84,4 @@ root@storage:/data#
{% endraw %} {% endraw %}
{% endhighlight %} {% endhighlight %}
This gets you a terminal. This gets you a terminal.
<!-- BEGIN MUNGE: IS_VERSIONED -->
<!-- TAG IS_VERSIONED -->
<!-- END MUNGE: IS_VERSIONED -->
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/getting-into-containers.md?pixel)]()
<!-- END MUNGE: GENERATED_ANALYTICS -->
v1.1/docs/user-guide/liveness/README.md
+3 -22
View File
@@ -1,13 +1,7 @@
--- ---
layout: docwithnav title: "Checking Pod Health"
title: "Overview" section: guides
--- ---
<!-- BEGIN MUNGE: UNVERSIONED_WARNING -->
<!-- END MUNGE: UNVERSIONED_WARNING -->
## Overview
This example shows two types of pod [health checks](../production-pods.html#liveness-and-readiness-probes-aka-health-checks): HTTP checks and container execution checks. This example shows two types of pod [health checks](../production-pods.html#liveness-and-readiness-probes-aka-health-checks): HTTP checks and container execution checks.
@@ -101,17 +95,4 @@ Sat, 27 Jun 2015 13:44:44 +0200 Sat, 27 Jun 2015 13:44:44 +0200 1 {kube
Sat, 27 Jun 2015 13:44:44 +0200 Sat, 27 Jun 2015 13:44:44 +0200 1 {kubelet kubernetes-minion-6fbi} spec.containers{liveness} created Created with docker id ed6bb004ee10 Sat, 27 Jun 2015 13:44:44 +0200 Sat, 27 Jun 2015 13:44:44 +0200 1 {kubelet kubernetes-minion-6fbi} spec.containers{liveness} created Created with docker id ed6bb004ee10
Sat, 27 Jun 2015 13:44:44 +0200 Sat, 27 Jun 2015 13:44:44 +0200 1 {kubelet kubernetes-minion-6fbi} spec.containers{liveness} started Started with docker id ed6bb004ee10 Sat, 27 Jun 2015 13:44:44 +0200 Sat, 27 Jun 2015 13:44:44 +0200 1 {kubelet kubernetes-minion-6fbi} spec.containers{liveness} started Started with docker id ed6bb004ee10
{% endraw %} {% endraw %}
{% endhighlight %} {% endhighlight %}
<!-- BEGIN MUNGE: IS_VERSIONED -->
<!-- TAG IS_VERSIONED -->
<!-- END MUNGE: IS_VERSIONED -->
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/liveness/README.md?pixel)]()
<!-- END MUNGE: GENERATED_ANALYTICS -->
v1.1/docs/user-guide/logging.md
+3 -21
View File
@@ -1,13 +1,8 @@
--- ---
layout: docwithnav
title: "Logging" title: "Logging"
section: support
--- ---
<!-- BEGIN MUNGE: UNVERSIONED_WARNING --> This page is designed to help you use logs to troubleshoot issues with your Kubernetes solution.
<!-- END MUNGE: UNVERSIONED_WARNING -->
# Logging
## Logging by Kubernetes Components ## Logging by Kubernetes Components
@@ -104,17 +99,4 @@ running in containers. The guide [Collecting log files within containers with Fl
## Known issues ## Known issues
Kubernetes does log rotation for Kubernetes components and docker containers. The command `kubectl logs` currently only read the latest logs, not all historical ones. Kubernetes does log rotation for Kubernetes components and docker containers. The command `kubectl logs` currently only read the latest logs, not all historical ones.
<!-- BEGIN MUNGE: IS_VERSIONED -->
<!-- TAG IS_VERSIONED -->
<!-- END MUNGE: IS_VERSIONED -->
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/logging.md?pixel)]()
<!-- END MUNGE: GENERATED_ANALYTICS -->
v1.1/docs/user-guide/monitoring.md
+2 -22
View File
@@ -1,14 +1,7 @@
--- ---
layout: docwithnav
title: "Resource Usage Monitoring in Kubernetes" title: "Resource Usage Monitoring in Kubernetes"
section: guides
--- ---
<!-- BEGIN MUNGE: UNVERSIONED_WARNING -->
<!-- END MUNGE: UNVERSIONED_WARNING -->
# Resource Usage Monitoring in Kubernetes
Understanding how an application behaves when deployed is crucial to scaling the application and providing a reliable service. In a Kubernetes cluster, application performance can be examined at many different levels: containers, [pods](pods.html), [services](services.html), and whole clusters. As part of Kubernetes we want to provide users with detailed resource usage information about their running applications at all these levels. This will give users deep insights into how their applications are performing and where possible application bottlenecks may be found. In comes [Heapster](https://github.com/GoogleCloudPlatform/heapster), a project meant to provide a base monitoring platform on Kubernetes. Understanding how an application behaves when deployed is crucial to scaling the application and providing a reliable service. In a Kubernetes cluster, application performance can be examined at many different levels: containers, [pods](pods.html), [services](services.html), and whole clusters. As part of Kubernetes we want to provide users with detailed resource usage information about their running applications at all these levels. This will give users deep insights into how their applications are performing and where possible application bottlenecks may be found. In comes [Heapster](https://github.com/GoogleCloudPlatform/heapster), a project meant to provide a base monitoring platform on Kubernetes.
### Overview ### Overview
@@ -65,17 +58,4 @@ Now that you’ve learned a bit about Heapster, feel free to try it out on your
*** ***
*Authors: Vishnu Kannan and Victor Marmol, Google Software Engineers.* *Authors: Vishnu Kannan and Victor Marmol, Google Software Engineers.*
*This article was originally posted in [Kubernetes blog](http://blog.kubernetes.io/2015/05/resource-usage-monitoring-kubernetes.html).* *This article was originally posted in [Kubernetes blog](http://blog.kubernetes.io/2015/05/resource-usage-monitoring-kubernetes.html).*
<!-- BEGIN MUNGE: IS_VERSIONED -->
<!-- TAG IS_VERSIONED -->
<!-- END MUNGE: IS_VERSIONED -->
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/monitoring.md?pixel)]()
<!-- END MUNGE: GENERATED_ANALYTICS -->
v1.1/docs/user-guide/ui.md
+2 -22
View File
@@ -1,14 +1,7 @@
--- ---
layout: docwithnav
title: "Kubernetes User Interface" title: "Kubernetes User Interface"
section: support
--- ---
<!-- BEGIN MUNGE: UNVERSIONED_WARNING -->
<!-- END MUNGE: UNVERSIONED_WARNING -->
# Kubernetes User Interface
Kubernetes has a web-based user interface that displays the current cluster state graphically. Kubernetes has a web-based user interface that displays the current cluster state graphically.
## Accessing the UI ## Accessing the UI
@@ -57,17 +50,4 @@ Other views (Pods, Nodes, Replication Controllers, Services, and Events) simply
## More Information ## More Information
For more information, see the [Kubernetes UI development document](http://releases.k8s.io/release-1.1/www/README.md) in the www directory. For more information, see the [Kubernetes UI development document](http://releases.k8s.io/release-1.1/www/README.md) in the www directory.
<!-- BEGIN MUNGE: IS_VERSIONED -->
<!-- TAG IS_VERSIONED -->
<!-- END MUNGE: IS_VERSIONED -->
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/ui.md?pixel)]()
<!-- END MUNGE: GENERATED_ANALYTICS -->