From e7b835eb4cff34a8c29b1eb90a3170a5c77422ec Mon Sep 17 00:00:00 2001
From: Seongjin Cho <w4-sjcho@users.noreply.github.com>
Date: Thu, 20 Dec 2018 18:01:39 +0900
Subject: [PATCH] Fix duplicate storage-backend (#3906)
---
.../kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 | 1 -
.../kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 | 1 -
.../kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 | 1 -
roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 | 1 -
4 files changed, 4 deletions(-)
diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
index 254b8e71a..17e891e04 100644
--- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
@@ -68,7 +68,6 @@ apiServerExtraArgs:
{% if kube_version is version('v1.9', '>=') %}
endpoint-reconciler-type: lease
{% endif %}
- storage-backend: etcd3
{% if etcd_events_cluster_enabled %}
etcd-servers-overrides: "/events#{{ etcd_events_access_addresses }}"
{% endif %}
diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
index c56990448..d133bc14e 100644
--- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
@@ -53,7 +53,6 @@ apiServerExtraArgs:
{% if kube_version is version('v1.9', '>=') %}
endpoint-reconciler-type: lease
{% endif %}
- storage-backend: etcd3
{% if etcd_events_cluster_enabled %}
etcd-servers-overrides: "/events#{{ etcd_events_access_addresses }}"
{% endif %}
diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2
index 502eff39f..84849242b 100644
--- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2
@@ -70,7 +70,6 @@ apiServerExtraArgs:
{% if kube_version is version('v1.9', '>=') %}
endpoint-reconciler-type: lease
{% endif %}
- storage-backend: etcd3
{% if etcd_events_cluster_enabled %}
etcd-servers-overrides: "/events#{{ etcd_events_access_addresses }}"
{% endif %}
diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
index 45153ae9c..ee638d554 100644
--- a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
@@ -68,7 +68,6 @@ apiServer:
{% if kube_version is version('v1.9', '>=') %}
endpoint-reconciler-type: lease
{% endif %}
- storage-backend: etcd3
{% if etcd_events_cluster_enabled %}
etcd-servers-overrides: "/events#{{ etcd_events_access_addresses }}"
{% endif %}
--
GitLab