fix cidr templating for ctl

orange-cloudfoundry · Apr 20, 2023 · 47d6d98 · 47d6d98
1 parent a8fdd0a
commit 47d6d98
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/jobs/k3s-server/templates/bin/ctl.erb b/jobs/k3s-server/templates/bin/ctl.erb
@@ -117,22 +117,15 @@ case $1 in
 <% end %>
 
 <% if_p('k3s.cluster-cidr') do |value| %>
-<% p('k3s.cluster-cidr').each do |flag| %>
-    export FLAGS="$FLAGS --k3s.cluster-cidr=<%= flag %>"
-<% end %>
+    export FLAGS="$FLAGS --cluster-cidr=<%= value %>"
 <% end %>
 
-<% if_p('k3s.k3s.service-cidr') do |value| %>
-<% p('k3s.k3s.service-cidr').each do |flag| %>
-    export FLAGS="$FLAGS --k3s.service-cidr=<%= flag %>"
-<% end %>
+<% if_p('k3s.service-cidr') do |value| %>
+    export FLAGS="$FLAGS --service-cidr=<%= value %>"
 <% end %>
 
-
 <% if_p('k3s.cluster-dns') do |value| %>
-<% p('k3s.cluster-dns').each do |flag| %>
-    export FLAGS="$FLAGS --cluster-dns=<%= flag %>"
-<% end %>
+    export FLAGS="$FLAGS --cluster-dns=<%= value %>"
 <% end %>
 
 <% if_p('k3s.containerd_additional_env_vars') do |value| %>