fix blank line in token.csv

orange-cloudfoundry · Jan 16, 2021 · fb8e48f · fb8e48f
1 parent 42ed6a0
commit fb8e48f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/jobs/k3s-agent/spec b/jobs/k3s-agent/spec
@@ -105,6 +105,9 @@ properties:
   k3s.drain.selector:  #Not implemented
     description: Selector (label query) to filter on
 
+#token-file
+  k3s.token-file-content:
+    description: token-file content. see https://kubernetes.io/docs/reference/access-authn-authz/authentication/#static-token-file
 
 ## args
 

diff --git a/jobs/k3s-agent/templates/config/token.csv.erb b/jobs/k3s-agent/templates/config/token.csv.erb
@@ -1,3 +1,2 @@
-<% if_p('k3s.token-file-content') do |value| %>
-<%= p('k3s.token-file-content') %>
+<% if_p('k3s.token-file-content') do |value| %><%= p('k3s.token-file-content') %>
 <% end %>
diff --git a/jobs/k3s-server/templates/config/token.csv.erb b/jobs/k3s-server/templates/config/token.csv.erb
@@ -1,3 +1,2 @@
-<% if_p('k3s.token-file-content') do |value| %>
-<%= p('k3s.token-file-content') %>
+<% if_p('k3s.token-file-content') do |value| %><%= p('k3s.token-file-content') %>
 <% end %>