From fa569b7bff7fa693a12e970d05157bd49974b979 Mon Sep 17 00:00:00 2001 From: Cristian Falcas Date: Thu, 13 Oct 2016 17:22:50 +0300 Subject: [PATCH] add liveness probe for apiserver pod --- manifests/master/params.pp | 6 +++--- manifests/node/params.pp | 2 +- metadata.json | 2 +- templates/pods/pod_kube-apiserver.yml.erb | 7 +++++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/manifests/master/params.pp b/manifests/master/params.pp index d561938..f67999c 100644 --- a/manifests/master/params.pp +++ b/manifests/master/params.pp @@ -5,7 +5,7 @@ $kube_api_manage_as = 'service' $kube_api_container_image = 'gcr.io/google_containers/hyperkube-amd64:v1.4.0' $kube_api_pod_cpu = '100m' - $kube_api_pod_memory = '400Mi' + $kube_api_pod_memory = '700Mi' $kube_api_service_ensure = running $kube_api_journald_forward_enable = false $kube_api_service_enable = true @@ -92,7 +92,7 @@ $kube_controller_manage_as = 'service' $kube_controller_container_image = 'gcr.io/google_containers/hyperkube-amd64:v1.4.0' $kube_controller_pod_cpu = '100m' - $kube_controller_pod_memory = '400Mi' + $kube_controller_pod_memory = '200Mi' $kube_controller_service_enable = true $kube_controller_address = '127.0.0.1' $kube_controller_allocate_node_cidrs = false @@ -165,7 +165,7 @@ $kube_scheduler_manage_as = 'service' $kube_scheduler_container_image = 'gcr.io/google_containers/hyperkube-amd64:v1.4.0' $kube_scheduler_pod_cpu = '100m' - $kube_scheduler_pod_memory = '400Mi' + $kube_scheduler_pod_memory = '200Mi' $kube_scheduler_address = '127.0.0.1' $kube_scheduler_algorithm_provider = 'DefaultProvider' $kube_scheduler_google_json_key = undef diff --git a/manifests/node/params.pp b/manifests/node/params.pp index 6dccdbd..55185a1 100644 --- a/manifests/node/params.pp +++ b/manifests/node/params.pp @@ -114,7 +114,7 @@ $kube_proxy_manage_as = 'service' $kube_proxy_container_image = 'gcr.io/google_containers/hyperkube-amd64:v1.4.0' $kube_proxy_pod_cpu = '100m' - $kube_proxy_pod_memory = '400Mi' + $kube_proxy_pod_memory = '200Mi' $kube_proxy_bind_address = '127.0.0.1' $kube_proxy_cleanup_iptables = false $kube_proxy_cluster_cidr = undef diff --git a/metadata.json b/metadata.json index ec50dad..55e3788 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "cristifalcas-kubernetes", - "version": "3.2.0", + "version": "3.3.0", "author": "Cristian Falcas", "license": "Apache-2.0", "summary": "Configuring and installing kubernetes", diff --git a/templates/pods/pod_kube-apiserver.yml.erb b/templates/pods/pod_kube-apiserver.yml.erb index 94f9861..545d656 100644 --- a/templates/pods/pod_kube-apiserver.yml.erb +++ b/templates/pods/pod_kube-apiserver.yml.erb @@ -19,6 +19,13 @@ spec: requests: cpu: <%= @pod_cpu %> memory: <%= @pod_memory %> + livenessProbe: + httpGet: + host: 127.0.0.1 + path: /healthz + port: <%= @insecure_port %> + initialDelaySeconds: 30 + timeoutSeconds: 3 ports: - containerPort: <%= @secure_port %> hostPort: <%= @secure_port %>