Merge pull request #7 from bpineau/removed_scheduler_opts

Two scheduler options removed from the 1.2 final release.
cristifalcas · May 23, 2016 · 9e88f2f · 9e88f2f
2 parents 79a5655 + 7a3e661
commit 9e88f2f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/templates/etc/kubernetes/scheduler.erb b/templates/etc/kubernetes/scheduler.erb
@@ -7,7 +7,7 @@
 # Add your own!
 KUBE_SCHEDULER_ARGS="<% -%>
  --address=<%= scope['kubernetes::master::scheduler::address'] -%>
-<% if @minimum_version.to_f > 1.0 then -%>
+<% if @minimum_version.to_f > 1.0 and @minimum_version.to_f < 1.2 then -%>
  --bind-pods-burst=<%= scope['kubernetes::master::scheduler::bind_pods_burst'] -%>
  --bind-pods-qps=<%= scope['kubernetes::master::scheduler::bind_pods_qps'] -%>
 <% end -%>
@@ -23,7 +23,7 @@ KUBE_SCHEDULER_ARGS="<% -%>
 <% if @minimum_version.to_f >= 1.2 then -%>
 <% if @leader_elect then -%>
  --leader-elect=<%= scope['kubernetes::master::scheduler::leader_elect'] -%>
- --leader-elect-lease-duration=<%= scope['kubernetes::master::scheduler:leader_elect_lease_duration'] -%>
+ --leader-elect-lease-duration=<%= scope['kubernetes::master::scheduler::leader_elect_lease_duration'] -%>
  --leader-elect-renew-deadline=<%= scope['kubernetes::master::scheduler::leader_elect_renew_deadline'] -%>
  --leader-elect-retry-period=<%= scope['kubernetes::master::scheduler::leader_elect_retry_period'] -%>
 <% end -%>