From 295103adc0d36624ab381db07cdaca15b614e4e2 Mon Sep 17 00:00:00 2001 From: Sergii Golovatiuk Date: Tue, 21 Feb 2017 15:44:36 +0100 Subject: [PATCH] Allow to specify etcd backend for kube-api Kubernetes project is about to set etcdv3 as default storage engine in 1.6. This patch allows to specify particular backend for kube-apiserver. User may force the option to etcdv3 for new environment. At the same time if the environment uses v2 it will continue uses it until user decides to upgrade to v3. Signed-off-by: Sergii Golovatiuk --- roles/kubernetes/master/defaults/main.yml | 1 + .../master/templates/manifests/kube-apiserver.manifest.j2 | 1 + 2 files changed, 2 insertions(+) diff --git a/roles/kubernetes/master/defaults/main.yml b/roles/kubernetes/master/defaults/main.yml index 510968b13..e47d7cdc7 100644 --- a/roles/kubernetes/master/defaults/main.yml +++ b/roles/kubernetes/master/defaults/main.yml @@ -29,3 +29,4 @@ kube_apiserver_memory_limit: 2000M kube_apiserver_cpu_limit: 800m kube_apiserver_memory_requests: 256M kube_apiserver_cpu_requests: 300m +kube_apiserver_storage_backend: etcd2 diff --git a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 index c05030697..86c9e2d78 100644 --- a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 +++ b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 @@ -41,6 +41,7 @@ spec: - --service-account-key-file={{ kube_cert_dir }}/apiserver-key.pem - --secure-port={{ kube_apiserver_port }} - --insecure-port={{ kube_apiserver_insecure_port }} + - --storage-backend={{ kube_apiserver_storage_backend }} {% if kube_api_runtime_config is defined %} {% for conf in kube_api_runtime_config %} - --runtime-config={{ conf }}