From fd48554659776b82da9f6a32b7627f047591578b Mon Sep 17 00:00:00 2001 From: kayrus Date: Tue, 18 Oct 2016 14:39:12 +0200 Subject: [PATCH 1/4] Added livenessprobe example with hidden parameters --- docs/user-guide/pod-states.md | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/docs/user-guide/pod-states.md b/docs/user-guide/pod-states.md index 8806e3be7c..b29270e5f8 100644 --- a/docs/user-guide/pod-states.md +++ b/docs/user-guide/pod-states.md @@ -89,6 +89,40 @@ If a node dies or is disconnected from the rest of the cluster, some entity with ## Examples +### Advanced livenessProbe example + +Liveness probes are executed by `kubelet`, so all requests will be made within kubelet network namespace. + +```yaml +apiVersion: v1 +kind: Pod +metadata: + labels: + test: liveness + name: liveness-http +spec: + containers: + - args: + - /server + image: gcr.io/google_containers/liveness + livenessProbe: + httpGet: + # when "host" is not defined, "PodIP" will be used + # host: my-host + # when "scheme" is not defined, "HTTP" scheme will be used. Only "HTTP" and "HTTPS" are allowed + # scheme: HTTPS + path: /healthz + port: 8080 + httpHeaders: + - name: X-Custom-Header + value: Awesome + initialDelaySeconds: 15 + timeoutSeconds: 1 + name: liveness +``` + +### Example states + * Pod is `Running`, 1 container, container exits success * Log completion event * If RestartPolicy is: From f85bbc130cd73f03f1e4eebe8ec288998e9bf3ff Mon Sep 17 00:00:00 2001 From: chrislovecnm Date: Wed, 26 Oct 2016 10:28:26 -0600 Subject: [PATCH 2/4] moving kube-up.sh to legacy for aws install --- docs/getting-started-guides/aws.md | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/docs/getting-started-guides/aws.md b/docs/getting-started-guides/aws.md index df4a6cdeb3..4084c3dc0d 100644 --- a/docs/getting-started-guides/aws.md +++ b/docs/getting-started-guides/aws.md @@ -2,12 +2,31 @@ assignees: - justinsb - lavalamp +- clove --- * TOC {:toc} + +## Supported Production Grade Tools with High Availability Options + +* [Kubernetes Operations](https://github.com/kubernetes/kops) - Production Grade K8s Installation, Upgrades, and Management. Supports running Debian and CentOS in AWS. + +* CoreOS maintains [a CLI tool](https://coreos.com/kubernetes/docs/latest/kubernetes-on-aws.html), `kube-aws` that will create and manage a Kubernetes cluster based on [CoreOS](http://www.coreos.com), using AWS tools: EC2, CloudFormation and Autoscaling. + +## Other Options + +* Other community projects exist that use tools such that use other configuration management tooling. + +TODO: add more options + +## Legacy Tooling + +`kube-up.sh` is a legacy tool that is an easy way to spin up a cluster. This tool +is being deprecated, and does not create a production ready environment. + ## Prerequisites 1. You need an AWS account. Visit [http://aws.amazon.com](http://aws.amazon.com) to get started @@ -97,12 +116,7 @@ If these already exist, make sure you want them to be used here. NOTE: If using an existing keypair named "kubernetes" then you must set the `AWS_SSH_KEY` key to point to your private key. -### Alternatives -* [kops](https://github.com/kubernetes/kops) "kubernetes-ops" is a complete Kubernetes cluster lifecycle management tool, - that supports AWS. - -* CoreOS maintains [a CLI tool](https://coreos.com/kubernetes/docs/latest/kubernetes-on-aws.html), `kube-aws` that will create and manage a Kubernetes cluster based on [CoreOS](http://www.coreos.com), using AWS tools: EC2, CloudFormation and Autoscaling. ## Getting started with your cluster @@ -162,6 +176,3 @@ For support level information on all solutions, see the [Table of solutions](/do Please see the [Kubernetes docs](/docs/) for more details on administering and using a Kubernetes cluster. - - - From c4da909199c877ca565313ace8bb24e11c656332 Mon Sep 17 00:00:00 2001 From: chrislovecnm Date: Thu, 27 Oct 2016 23:15:41 -0600 Subject: [PATCH 3/4] tweaks requested hr --- docs/getting-started-guides/aws.md | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/docs/getting-started-guides/aws.md b/docs/getting-started-guides/aws.md index 4084c3dc0d..a76cfeeeea 100644 --- a/docs/getting-started-guides/aws.md +++ b/docs/getting-started-guides/aws.md @@ -12,22 +12,18 @@ assignees: ## Supported Production Grade Tools with High Availability Options -* [Kubernetes Operations](https://github.com/kubernetes/kops) - Production Grade K8s Installation, Upgrades, and Management. Supports running Debian and CentOS in AWS. +* [Kubernetes Operations](https://github.com/kubernetes/kops) - Production Grade K8s Installation, Upgrades, and Management. Supports running Debian, Ubuntu, CentOS, and RHEL in AWS. * CoreOS maintains [a CLI tool](https://coreos.com/kubernetes/docs/latest/kubernetes-on-aws.html), `kube-aws` that will create and manage a Kubernetes cluster based on [CoreOS](http://www.coreos.com), using AWS tools: EC2, CloudFormation and Autoscaling. -## Other Options +--- -* Other community projects exist that use tools such that use other configuration management tooling. +## kube-up bash script -TODO: add more options +> `kube-up.sh` is a legacy tool that is an easy way to spin up a cluster. This tool is being deprecated, and does not create a production ready environment. -## Legacy Tooling -`kube-up.sh` is a legacy tool that is an easy way to spin up a cluster. This tool -is being deprecated, and does not create a production ready environment. - -## Prerequisites +### Prerequisites 1. You need an AWS account. Visit [http://aws.amazon.com](http://aws.amazon.com) to get started 2. Install and configure the [AWS Command Line Interface](http://aws.amazon.com/cli) @@ -40,9 +36,9 @@ You may explicitly set the AWS profile to use using the `AWS_DEFAULT_PROFILE` en export AWS_DEFAULT_PROFILE=myawsprofile ``` -## Cluster turnup +### Cluster turnup -### Supported procedure: `get-kube` +#### Supported procedure: `get-kube` ```shell #Using wget From 541ca2c426707fa6865799dee876f872e97d6d6e Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Wed, 26 Oct 2016 10:12:29 +0200 Subject: [PATCH 4/4] Small corrections how to curl eviction endpoint --- docs/admin/disruptions.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/admin/disruptions.md b/docs/admin/disruptions.md index c6e2b7852a..0743b565e6 100644 --- a/docs/admin/disruptions.md +++ b/docs/admin/disruptions.md @@ -61,17 +61,17 @@ itself. To attempt an eviction (perhaps more REST-precisely, to attempt to { "apiVersion": "policy/v1alpha1", "kind": "Eviction", - "name": "quux", - "namespace": "default" + "metadata": { + "name": "quux", + "namespace": "default" + } } ``` -and here is how you would attempt this with `curl` +You can attempt an eviction using `curl`: ```bash -curl -v -X POST -H 'Content-type: application/json' -http://127.0.0.1:8080/api/v1/namespaces/default/pods/quux/eviction -d -eviction.json +$ curl -v -H 'Content-type: application/json' http://127.0.0.1:8080/api/v1/namespaces/default/pods/quux/eviction -d @eviction.json ``` The API can respond in one of three ways.