From b8f0de307405717206819af4e635ce1a6ef4ab4a Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 29 Apr 2019 09:02:21 +0300 Subject: [PATCH] Fixed etcd-servers-overrides in kubeadm config (#4668) * kube-apiserver will fail if used comma as separator --- .../kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 | 2 +- .../kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 | 2 +- .../kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 index 8419c3d7f..088c26f48 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 @@ -54,7 +54,7 @@ apiServerExtraArgs: endpoint-reconciler-type: lease {% endif %} {% if etcd_events_cluster_enabled %} - etcd-servers-overrides: "/events#{{ etcd_events_access_addresses }}" + etcd-servers-overrides: "/events#{{ etcd_events_access_addresses_semicolon }}" {% endif %} service-node-port-range: {{ kube_apiserver_node_port_range }} kubelet-preferred-address-types: "{{ kubelet_preferred_address_types }}" diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 index 0ee50fa83..92abf8587 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 @@ -73,7 +73,7 @@ apiServerExtraArgs: endpoint-reconciler-type: lease {% endif %} {% if etcd_events_cluster_enabled %} - etcd-servers-overrides: "/events#{{ etcd_events_access_addresses }}" + etcd-servers-overrides: "/events#{{ etcd_events_access_addresses_semicolon }}" {% endif %} service-node-port-range: {{ kube_apiserver_node_port_range }} kubelet-preferred-address-types: "{{ kubelet_preferred_address_types }}" diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 index f8b13275d..6754584db 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 @@ -70,7 +70,7 @@ apiServer: endpoint-reconciler-type: lease {% endif %} {% if etcd_events_cluster_enabled %} - etcd-servers-overrides: "/events#{{ etcd_events_access_addresses }}" + etcd-servers-overrides: "/events#{{ etcd_events_access_addresses_semicolon }}" {% endif %} service-node-port-range: {{ kube_apiserver_node_port_range }} kubelet-preferred-address-types: "{{ kubelet_preferred_address_types }}"