From 9d32e2c3b0cf0a1111d462fe0365042466cf583a Mon Sep 17 00:00:00 2001 From: aca Date: Fri, 7 Feb 2020 19:09:44 +0900 Subject: [PATCH] fix duplicates when scheduler_extra_volumes defined (#5566) --- roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 | 1 - roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 | 1 - 2 files changed, 2 deletions(-) diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 index af17102ae..2641c761f 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 @@ -280,7 +280,6 @@ scheduler: {{ key }}: "{{ kube_kubeadm_scheduler_extra_args[key] }}" {% endfor %} {% endif %} - extraVolumes: {% if scheduler_extra_volumes %} extraVolumes: {% for volume in scheduler_extra_volumes %} diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 index 0201f0efc..17b187a06 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 @@ -283,7 +283,6 @@ scheduler: {{ key }}: "{{ kube_kubeadm_scheduler_extra_args[key] }}" {% endfor %} {% endif %} - extraVolumes: {% if scheduler_extra_volumes %} extraVolumes: {% for volume in scheduler_extra_volumes %}