From bfaea6c2677983d2a18a5c093aae7267b81cb8e4 Mon Sep 17 00:00:00 2001 From: yatin karel Date: Sun, 31 Jul 2016 17:29:47 +0530 Subject: [PATCH] Add support for master elected component For k8s bay in HA mode, current all master components are active. Added support for master elected component to ensure only one master component is active. This will enhance the concurrency controller. Change-Id: I8a5489df0878a384a38bf755851c98b170282a1f Closes-Bug: #1504681 --- .../templates/fragments/enable-kube-controller-manager.yaml | 1 + .../templates/fragments/enable-kube-scheduler.yaml | 1 + .../templates/fragments/enable-kube-podmaster.sh | 2 ++ 3 files changed, 4 insertions(+) diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-controller-manager.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-controller-manager.yaml index e944b6cbf6..193729c3aa 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-controller-manager.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-controller-manager.yaml @@ -50,6 +50,7 @@ write_files: - /hyperkube - controller-manager - --master=http://127.0.0.1:8080 + - --leader-elect=true - --service-account-private-key-file=${SERVICE_ACCOUNT_PRIVATE_KEY_FILE} - --root-ca-file=${ROOT_CA_FILE} livenessProbe: diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-scheduler.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-scheduler.yaml index 9f956b6188..6a3fbedf2a 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-scheduler.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-scheduler.yaml @@ -40,6 +40,7 @@ write_files: - /hyperkube - scheduler - --master=http://127.0.0.1:8080 + - --leader-elect=true livenessProbe: httpGet: host: 127.0.0.1 diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/enable-kube-podmaster.sh b/magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/enable-kube-podmaster.sh index 2e95adc655..68fb5c7dc2 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/enable-kube-podmaster.sh +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/enable-kube-podmaster.sh @@ -90,6 +90,7 @@ spec: - /hyperkube - controller-manager - --master=http://127.0.0.1:8080 + - --leader-elect=true - --service-account-private-key-file=${SERVICE_ACCOUNT_PRIVATE_KEY_FILE} - --root-ca-file=${ROOT_CA_FILE} livenessProbe: @@ -136,6 +137,7 @@ spec: - /hyperkube - scheduler - --master=http://127.0.0.1:8080 + - --leader-elect=true livenessProbe: httpGet: host: 127.0.0.1