fix issue cloudfoundry-incubator#328

orange-cloudfoundry · Jun 11, 2019 · a589dd2 · a589dd2
1 parent 0b66efc
commit a589dd2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/jobs/kube-apiserver/templates/config/bpm.yml.erb b/jobs/kube-apiserver/templates/config/bpm.yml.erb
@@ -45,10 +45,14 @@ processes:
     end
   %>
   - --apiserver-count=<%= link('kube-apiserver').instances.size %>
-  <% if_link('cloud-provider') do |cloud_provider| %>
-  - --cloud-provider=<%= cloud_provider.p('cloud-provider.type') %>
-  - --cloud-config=/var/vcap/jobs/kube-apiserver/config/cloud-provider.ini
-  <% end %>
+  <%- if_link('cloud-provider') do |cloud_provider| -%>
+  <% if "external".eql? cloud_provider.p('cloud-provider.type') %>
+   - --cloud-config=/var/vcap/jobs/kube-apiserver/config/cloud-provider.ini
+  <% else %>
+   - --cloud-provider=cloud_provider.p('cloud-provider.type')
+   - --cloud-config=/var/vcap/jobs/kube-apiserver/config/cloud-provider.ini
+   <% end  %>
+  <%- end -%>
   <% if !etcd_servers_property_set %>
   - --etcd-servers=<%= etcd_endpoints %>
   <% end %>

diff --git a/jobs/kube-controller-manager/templates/config/bpm.yml.erb b/jobs/kube-controller-manager/templates/config/bpm.yml.erb
@@ -24,8 +24,12 @@ processes:
     end
   %>
   <%- if_link('cloud-provider') do |cloud_provider| -%>
-  - --cloud-provider=<%= cloud_provider.p('cloud-provider.type') %>
+  <% if "external".eql? cloud_provider.p('cloud-provider.type') %>
   - --cloud-config=/var/vcap/jobs/kube-controller-manager/config/cloud-provider.ini
+  <% else %>
+  - --cloud-provider=cloud_provider.p('cloud-provider.type') 
+  - --cloud-config=/var/vcap/jobs/kube-controller-manager/config/cloud-provider.ini
+ <% end %>
   <%- end -%>
   hooks:
     pre_start: /var/vcap/jobs/kube-controller-manager/bin/chmod-product-serial