Skip to content

Commit f300f76

Browse files
collimarcocollimarco
committed
Fix bug: labels are strings and must not look like an exponential number
1 parent 8af68b1 commit f300f76

File tree

2 files changed

+50
-50
lines changed

2 files changed

+50
-50
lines changed

‎lib/cuber/templates/deployment.yml.erb‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ apiVersion: v1
33
metadata:
44
name: <%= @options[:app] %>
55
labels:
6-
app.kubernetes.io/name: <%= @options[:app] %>
7-
app.kubernetes.io/instance: <%= @options[:instance] %>
8-
app.kubernetes.io/version: <%= @options[:release] %>
6+
app.kubernetes.io/name: <%= @options[:app].to_s.to_json %>
7+
app.kubernetes.io/instance: <%= @options[:instance].to_s.to_json %>
8+
app.kubernetes.io/version: <%= @options[:release].to_s.to_json %>
99
app.kubernetes.io/managed-by: cuber
1010
annotations:
1111
image: <%= @options[:image].to_s.to_json %>
@@ -19,9 +19,9 @@ metadata:
1919
name: regcred
2020
namespace: <%= @options[:app] %>
2121
labels:
22-
app.kubernetes.io/name: <%= @options[:app] %>
23-
app.kubernetes.io/instance: <%= @options[:instance] %>
24-
app.kubernetes.io/version: <%= @options[:release] %>
22+
app.kubernetes.io/name: <%= @options[:app].to_s.to_json %>
23+
app.kubernetes.io/instance: <%= @options[:instance].to_s.to_json %>
24+
app.kubernetes.io/version: <%= @options[:release].to_s.to_json %>
2525
app.kubernetes.io/managed-by: cuber
2626
data:
2727
.dockerconfigjson: <%= @options[:dockerconfigjson] %>
@@ -34,9 +34,9 @@ metadata:
3434
name: app-secrets
3535
namespace: <%= @options[:app] %>
3636
labels:
37-
app.kubernetes.io/name: <%= @options[:app] %>
38-
app.kubernetes.io/instance: <%= @options[:instance] %>
39-
app.kubernetes.io/version: <%= @options[:release] %>
37+
app.kubernetes.io/name: <%= @options[:app].to_s.to_json %>
38+
app.kubernetes.io/instance: <%= @options[:instance].to_s.to_json %>
39+
app.kubernetes.io/version: <%= @options[:release].to_s.to_json %>
4040
app.kubernetes.io/managed-by: cuber
4141
data:
4242
<%- @options[:secrets].each do |key, value| -%>
@@ -50,9 +50,9 @@ metadata:
5050
name: env
5151
namespace: <%= @options[:app] %>
5252
labels:
53-
app.kubernetes.io/name: <%= @options[:app] %>
54-
app.kubernetes.io/instance: <%= @options[:instance] %>
55-
app.kubernetes.io/version: <%= @options[:release] %>
53+
app.kubernetes.io/name: <%= @options[:app].to_s.to_json %>
54+
app.kubernetes.io/instance: <%= @options[:instance].to_s.to_json %>
55+
app.kubernetes.io/version: <%= @options[:release].to_s.to_json %>
5656
app.kubernetes.io/managed-by: cuber
5757
data:
5858
<%- @options[:env].each do |key, value| -%>
@@ -66,9 +66,9 @@ metadata:
6666
name: web-pdb
6767
namespace: <%= @options[:app] %>
6868
labels:
69-
app.kubernetes.io/name: <%= @options[:app] %>
70-
app.kubernetes.io/instance: <%= @options[:instance] %>
71-
app.kubernetes.io/version: <%= @options[:release] %>
69+
app.kubernetes.io/name: <%= @options[:app].to_s.to_json %>
70+
app.kubernetes.io/instance: <%= @options[:instance].to_s.to_json %>
71+
app.kubernetes.io/version: <%= @options[:release].to_s.to_json %>
7272
app.kubernetes.io/managed-by: cuber
7373
spec:
7474
maxUnavailable: "50%"
@@ -84,17 +84,17 @@ metadata:
8484
name: migrate-<%= @options[:instance] %>
8585
namespace: <%= @options[:app] %>
8686
labels:
87-
app.kubernetes.io/name: <%= @options[:app] %>
88-
app.kubernetes.io/instance: <%= @options[:instance] %>
89-
app.kubernetes.io/version: <%= @options[:release] %>
87+
app.kubernetes.io/name: <%= @options[:app].to_s.to_json %>
88+
app.kubernetes.io/instance: <%= @options[:instance].to_s.to_json %>
89+
app.kubernetes.io/version: <%= @options[:release].to_s.to_json %>
9090
app.kubernetes.io/managed-by: cuber
9191
spec:
9292
template:
9393
metadata:
9494
labels:
95-
app.kubernetes.io/name: <%= @options[:app] %>
96-
app.kubernetes.io/instance: <%= @options[:instance] %>
97-
app.kubernetes.io/version: <%= @options[:release] %>
95+
app.kubernetes.io/name: <%= @options[:app].to_s.to_json %>
96+
app.kubernetes.io/instance: <%= @options[:instance].to_s.to_json %>
97+
app.kubernetes.io/version: <%= @options[:release].to_s.to_json %>
9898
app.kubernetes.io/managed-by: cuber
9999
spec:
100100
containers:
@@ -125,9 +125,9 @@ metadata:
125125
name: <%= procname %>
126126
namespace: <%= @options[:app] %>
127127
labels:
128-
app.kubernetes.io/name: <%= @options[:app] %>
129-
app.kubernetes.io/instance: <%= @options[:instance] %>
130-
app.kubernetes.io/version: <%= @options[:release] %>
128+
app.kubernetes.io/name: <%= @options[:app].to_s.to_json %>
129+
app.kubernetes.io/instance: <%= @options[:instance].to_s.to_json %>
130+
app.kubernetes.io/version: <%= @options[:release].to_s.to_json %>
131131
app.kubernetes.io/managed-by: cuber
132132
spec:
133133
revisionHistoryLimit: 0
@@ -138,9 +138,9 @@ spec:
138138
template:
139139
metadata:
140140
labels:
141-
app.kubernetes.io/name: <%= @options[:app] %>
142-
app.kubernetes.io/instance: <%= @options[:instance] %>
143-
app.kubernetes.io/version: <%= @options[:release] %>
141+
app.kubernetes.io/name: <%= @options[:app].to_s.to_json %>
142+
app.kubernetes.io/instance: <%= @options[:instance].to_s.to_json %>
143+
app.kubernetes.io/version: <%= @options[:release].to_s.to_json %>
144144
app.kubernetes.io/managed-by: cuber
145145
app: <%= procname %>-proc
146146
spec:
@@ -223,9 +223,9 @@ metadata:
223223
name: cron-<%= jobname %>
224224
namespace: <%= @options[:app] %>
225225
labels:
226-
app.kubernetes.io/name: <%= @options[:app] %>
227-
app.kubernetes.io/instance: <%= @options[:instance] %>
228-
app.kubernetes.io/version: <%= @options[:release] %>
226+
app.kubernetes.io/name: <%= @options[:app].to_s.to_json %>
227+
app.kubernetes.io/instance: <%= @options[:instance].to_s.to_json %>
228+
app.kubernetes.io/version: <%= @options[:release].to_s.to_json %>
229229
app.kubernetes.io/managed-by: cuber
230230
spec:
231231
schedule: <%= cron[:schedule].to_s.to_json %>
@@ -235,18 +235,18 @@ spec:
235235
jobTemplate:
236236
metadata:
237237
labels:
238-
app.kubernetes.io/name: <%= @options[:app] %>
239-
app.kubernetes.io/instance: <%= @options[:instance] %>
240-
app.kubernetes.io/version: <%= @options[:release] %>
238+
app.kubernetes.io/name: <%= @options[:app].to_s.to_json %>
239+
app.kubernetes.io/instance: <%= @options[:instance].to_s.to_json %>
240+
app.kubernetes.io/version: <%= @options[:release].to_s.to_json %>
241241
app.kubernetes.io/managed-by: cuber
242242
spec:
243243
backoffLimit: 0
244244
template:
245245
metadata:
246246
labels:
247-
app.kubernetes.io/name: <%= @options[:app] %>
248-
app.kubernetes.io/instance: <%= @options[:instance] %>
249-
app.kubernetes.io/version: <%= @options[:release] %>
247+
app.kubernetes.io/name: <%= @options[:app].to_s.to_json %>
248+
app.kubernetes.io/instance: <%= @options[:instance].to_s.to_json %>
249+
app.kubernetes.io/version: <%= @options[:release].to_s.to_json %>
250250
app.kubernetes.io/managed-by: cuber
251251
spec:
252252
containers:
@@ -277,9 +277,9 @@ metadata:
277277
name: ssl
278278
namespace: <%= @options[:app] %>
279279
labels:
280-
app.kubernetes.io/name: <%= @options[:app] %>
281-
app.kubernetes.io/instance: <%= @options[:instance] %>
282-
app.kubernetes.io/version: <%= @options[:release] %>
280+
app.kubernetes.io/name: <%= @options[:app].to_s.to_json %>
281+
app.kubernetes.io/instance: <%= @options[:instance].to_s.to_json %>
282+
app.kubernetes.io/version: <%= @options[:release].to_s.to_json %>
283283
app.kubernetes.io/managed-by: cuber
284284
data:
285285
tls.crt: <%= Base64.strict_encode64 File.read @options[:ssl][:crt] %>
@@ -295,9 +295,9 @@ metadata:
295295
name: web-service
296296
namespace: <%= @options[:app] %>
297297
labels:
298-
app.kubernetes.io/name: <%= @options[:app] %>
299-
app.kubernetes.io/instance: <%= @options[:instance] %>
300-
app.kubernetes.io/version: <%= @options[:release] %>
298+
app.kubernetes.io/name: <%= @options[:app].to_s.to_json %>
299+
app.kubernetes.io/instance: <%= @options[:instance].to_s.to_json %>
300+
app.kubernetes.io/version: <%= @options[:release].to_s.to_json %>
301301
app.kubernetes.io/managed-by: cuber
302302
spec:
303303
selector:
@@ -314,9 +314,9 @@ metadata:
314314
name: web-ingress
315315
namespace: <%= @options[:app] %>
316316
labels:
317-
app.kubernetes.io/name: <%= @options[:app] %>
318-
app.kubernetes.io/instance: <%= @options[:instance] %>
319-
app.kubernetes.io/version: <%= @options[:release] %>
317+
app.kubernetes.io/name: <%= @options[:app].to_s.to_json %>
318+
app.kubernetes.io/instance: <%= @options[:instance].to_s.to_json %>
319+
app.kubernetes.io/version: <%= @options[:release].to_s.to_json %>
320320
app.kubernetes.io/managed-by: cuber
321321
annotations:
322322
<%- @options[:lb].each do |key, value| -%>
@@ -345,9 +345,9 @@ metadata:
345345
name: load-balancer
346346
namespace: <%= @options[:app] %>
347347
labels:
348-
app.kubernetes.io/name: <%= @options[:app] %>
349-
app.kubernetes.io/instance: <%= @options[:instance] %>
350-
app.kubernetes.io/version: <%= @options[:release] %>
348+
app.kubernetes.io/name: <%= @options[:app].to_s.to_json %>
349+
app.kubernetes.io/instance: <%= @options[:instance].to_s.to_json %>
350+
app.kubernetes.io/version: <%= @options[:release].to_s.to_json %>
351351
app.kubernetes.io/managed-by: cuber
352352
annotations:
353353
<%- @options[:lb].each do |key, value| -%>

‎lib/cuber/templates/pod.yml.erb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ metadata:
44
name: <%= @options[:pod] %>
55
namespace: <%= @options[:app] %>
66
labels:
7-
app.kubernetes.io/name: <%= @options[:app] %>
8-
app.kubernetes.io/version: <%= @options[:release] %>
7+
app.kubernetes.io/name: <%= @options[:app].to_s.to_json %>
8+
app.kubernetes.io/version: <%= @options[:release].to_s.to_json %>
99
app.kubernetes.io/managed-by: cuber
1010
spec:
1111
containers:

0 commit comments

Comments
 (0)