kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate storage-backend (#3906)

pull/3926/head
Seongjin Cho 2018-12-20 18:01:39 +09:00 committed by Kubernetes Prow Robot
parent fbe9e0ac1a
commit e7b835eb4c
4 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
View File

@ -68,7 +68,6 @@ apiServerExtraArgs:
{% if kube_version is version('v1.9', '>=') %} {% if kube_version is version('v1.9', '>=') %}
endpoint-reconciler-type: lease endpoint-reconciler-type: lease
{% endif %} {% endif %}
storage-backend: etcd3
{% if etcd_events_cluster_enabled %} {% if etcd_events_cluster_enabled %}
etcd-servers-overrides: "/events#{{ etcd_events_access_addresses }}" etcd-servers-overrides: "/events#{{ etcd_events_access_addresses }}"
{% endif %} {% endif %}

1
roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
View File

@ -53,7 +53,6 @@ apiServerExtraArgs:
{% if kube_version is version('v1.9', '>=') %} {% if kube_version is version('v1.9', '>=') %}
endpoint-reconciler-type: lease endpoint-reconciler-type: lease
{% endif %} {% endif %}
storage-backend: etcd3
{% if etcd_events_cluster_enabled %} {% if etcd_events_cluster_enabled %}
etcd-servers-overrides: "/events#{{ etcd_events_access_addresses }}" etcd-servers-overrides: "/events#{{ etcd_events_access_addresses }}"
{% endif %} {% endif %}

1
roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2
View File

@ -70,7 +70,6 @@ apiServerExtraArgs:
{% if kube_version is version('v1.9', '>=') %} {% if kube_version is version('v1.9', '>=') %}
endpoint-reconciler-type: lease endpoint-reconciler-type: lease
{% endif %} {% endif %}
storage-backend: etcd3
{% if etcd_events_cluster_enabled %} {% if etcd_events_cluster_enabled %}
etcd-servers-overrides: "/events#{{ etcd_events_access_addresses }}" etcd-servers-overrides: "/events#{{ etcd_events_access_addresses }}"
{% endif %} {% endif %}

1
roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
View File

@ -68,7 +68,6 @@ apiServer:
{% if kube_version is version('v1.9', '>=') %} {% if kube_version is version('v1.9', '>=') %}
endpoint-reconciler-type: lease endpoint-reconciler-type: lease
{% endif %} {% endif %}
storage-backend: etcd3
{% if etcd_events_cluster_enabled %} {% if etcd_events_cluster_enabled %}
etcd-servers-overrides: "/events#{{ etcd_events_access_addresses }}" etcd-servers-overrides: "/events#{{ etcd_events_access_addresses }}"
{% endif %} {% endif %}