From 59efd48f37efd053cf700fb9efc68e458c4ccd86 Mon Sep 17 00:00:00 2001 From: Balazs Szekeres Date: Tue, 16 Jul 2019 15:18:57 +0200 Subject: [PATCH] Etcd proxy added caas-etcd Use etcd proxy in kube api server. Change-Id: I8314d28c5fca6d568f3a8a75d1fc195dbe227122 Signed-off-by: Balazs Szekeres --- ansible/roles/kube_master/defaults/main.yaml | 5 +---- caas-kubernetes.spec | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ansible/roles/kube_master/defaults/main.yaml b/ansible/roles/kube_master/defaults/main.yaml index bc71bb9..95deb1a 100644 --- a/ansible/roles/kube_master/defaults/main.yaml +++ b/ansible/roles/kube_master/defaults/main.yaml @@ -46,10 +46,7 @@ apiserver_params: - "--bind-address={{ apiserver }}" - "--client-ca-file=/etc/openssl/ca.pem" - "--enable-bootstrap-token-auth=true" - - "--etcd-cafile=/etc/etcd/ssl/ca.pem" - - "--etcd-certfile=/etc/etcd/ssl/etcd{{ nodeindex }}.pem" - - "--etcd-keyfile=/etc/etcd/ssl/etcd{{ nodeindex }}-key.pem" - - "--etcd-servers={% for host in groups['caas_master'] %}https://{{ hostvars[host]['networking']['infra_internal']['ip'] }}:{{ caas.etcd_api_port }}{% if not loop.last %},{% endif %}{% endfor %}" + - "--etcd-servers=http://{{ hostvars[hostname]['networking']['infra_internal']['ip'] }}:{{ caas.etcd_proxy_port }}{% for host in ( groups['caas_master'] | reject('search', hostname) ) %},http://{{ hostvars[host]['networking']['infra_internal']['ip'] }}:{{ caas.etcd_proxy_port }}{% endfor %}" - "--experimental-encryption-provider-config={{ caas.cert_path }}/{{ caas._secrets_conf }}" - "--feature-gates={{ apiserver_feature_gates | get_kube_options }}" - "--insecure-port=0" diff --git a/caas-kubernetes.spec b/caas-kubernetes.spec index c57072c..146b0cd 100644 --- a/caas-kubernetes.spec +++ b/caas-kubernetes.spec @@ -15,7 +15,7 @@ %define COMPONENT kubernetes %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 1.15.0 -%define RPM_MINOR_VERSION 3 +%define RPM_MINOR_VERSION 4 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} %define KUBERNETESPAUSE_VERSION 3.1 -- 2.16.6