pfab 0.23.0 → 0.26.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/pfab/cli.rb +1 -0
- data/lib/pfab/templates/base.rb +4 -2
- data/lib/pfab/templates/cron.rb +8 -2
- data/lib/pfab/templates/daemon.rb +7 -1
- data/lib/pfab/templates/job.rb +7 -1
- data/lib/pfab/templates/web.rb +22 -2
- data/lib/pfab/version.rb +1 -1
- data/pfab.gemspec +3 -3
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d629e4ecbcc8a87eda06580322ab28a566aa5d72dcbd05152a0dca10c6cbf589
|
4
|
+
data.tar.gz: 96c65901140ddd33f55a12db4221c01ab2a73d2928dda3aa1c528bfb86b56cc9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 847a71248a41795b117504bc71287ebf04752690014f1c2c6c345dda9009e7f59ff5c08059133487eec170d3933f6f0682c8b4ab13877c2d97518b9d3a1c0f77
|
7
|
+
data.tar.gz: 37298e5c0b92b373d3baebd29d1f7c5e7db2b5fe05dfbcb569a4bbf8336ff35e2527d624502a5976defd68edf046032d676e59d075e7762042df64ef2b05dd1f
|
data/lib/pfab/cli.rb
CHANGED
@@ -203,6 +203,7 @@ module Pfab
|
|
203
203
|
end
|
204
204
|
puts_and_system("kubectl apply -f .application-k8s-#{$env}-#{app_name}.yaml")
|
205
205
|
puts_and_system("git tag release-#{$env}-#{app_name}-#{Time.now.strftime("%Y-%m-%d-%H-%M-%S")} HEAD")
|
206
|
+
puts_and_system("git push origin --tags")
|
206
207
|
end
|
207
208
|
end
|
208
209
|
|
data/lib/pfab/templates/base.rb
CHANGED
@@ -52,10 +52,12 @@ module Pfab
|
|
52
52
|
end
|
53
53
|
|
54
54
|
def env_vars
|
55
|
-
|
56
55
|
env_vars = { "DEPLOYED_NAME" => { value: @data['deployed_name'] },
|
57
56
|
"DEPLOY_ID" => { value: deploy_id },
|
58
|
-
"POD_ID" => { valueFrom: { fieldRef: { fieldPath: 'metadata.name' } } }
|
57
|
+
"POD_ID" => { valueFrom: { fieldRef: { fieldPath: 'metadata.name' } } },
|
58
|
+
"DD_ENV" => { valueFrom: { fieldRef: { fieldPath: "metadata.labels['tags.datadoghq.com/env']" } } },
|
59
|
+
"DD_SERVICE" => { valueFrom: { fieldRef: { fieldPath: "metadata.labels['tags.datadoghq.com/service']" } } },
|
60
|
+
"DD_VERSION" => { valueFrom: { fieldRef: { fieldPath: "metadata.labels['tags.datadoghq.com/version']" } } }
|
59
61
|
}
|
60
62
|
|
61
63
|
# load defaults
|
data/lib/pfab/templates/cron.rb
CHANGED
@@ -11,7 +11,7 @@ module Pfab
|
|
11
11
|
|
12
12
|
def job
|
13
13
|
{
|
14
|
-
apiVersion: "batch/
|
14
|
+
apiVersion: "batch/v1",
|
15
15
|
kind: "CronJob",
|
16
16
|
metadata: {
|
17
17
|
name: "#{@data['deployed_name']}-#{@data['sha']}",
|
@@ -20,7 +20,10 @@ module Pfab
|
|
20
20
|
application: @data['application'],
|
21
21
|
"deployed-name" => @data['deployed_name'],
|
22
22
|
"application-type" => application_type,
|
23
|
-
"deploy-id" => deploy_id
|
23
|
+
"deploy-id" => deploy_id,
|
24
|
+
"tags.datadoghq.com/env": @data['env'],
|
25
|
+
"tags.datadoghq.com/service": @data['deployed_name'],
|
26
|
+
"tags.datadoghq.com/version": "#{@data['sha']}"
|
24
27
|
}
|
25
28
|
},
|
26
29
|
spec: {
|
@@ -44,6 +47,9 @@ module Pfab
|
|
44
47
|
application: @data['application'],
|
45
48
|
"deployed-name" => @data['deployed_name'],
|
46
49
|
"application-type" => "cron",
|
50
|
+
"tags.datadoghq.com/env": @data['env'],
|
51
|
+
"tags.datadoghq.com/service": @data['deployed_name'],
|
52
|
+
"tags.datadoghq.com/version": "#{@data['sha']}"
|
47
53
|
},
|
48
54
|
},
|
49
55
|
spec: {
|
@@ -20,7 +20,10 @@ module Pfab
|
|
20
20
|
application: @data['application'],
|
21
21
|
"deployed-name" => @data['deployed_name'],
|
22
22
|
"application-type" => application_type,
|
23
|
-
"deploy-id" => deploy_id
|
23
|
+
"deploy-id" => deploy_id,
|
24
|
+
"tags.datadoghq.com/env": @data['env'],
|
25
|
+
"tags.datadoghq.com/service": @data['deployed_name'],
|
26
|
+
"tags.datadoghq.com/version":"#{@data['sha']}"
|
24
27
|
}
|
25
28
|
},
|
26
29
|
spec: {
|
@@ -40,6 +43,9 @@ module Pfab
|
|
40
43
|
application: @data['application'],
|
41
44
|
"deployed-name" => @data['deployed_name'],
|
42
45
|
"application-type" => "daemon",
|
46
|
+
"tags.datadoghq.com/env": @data['env'],
|
47
|
+
"tags.datadoghq.com/service": @data['deployed_name'],
|
48
|
+
"tags.datadoghq.com/version": "#{@data['sha']}"
|
43
49
|
},
|
44
50
|
},
|
45
51
|
spec: {
|
data/lib/pfab/templates/job.rb
CHANGED
@@ -20,7 +20,10 @@ module Pfab
|
|
20
20
|
application: @data['application'],
|
21
21
|
"deployed-name" => @data['deployed_name'],
|
22
22
|
"application-type" => application_type,
|
23
|
-
"deploy-id" => deploy_id
|
23
|
+
"deploy-id" => deploy_id,
|
24
|
+
"tags.datadoghq.com/env": @data['env'],
|
25
|
+
"tags.datadoghq.com/service": @data['deployed_name'],
|
26
|
+
"tags.datadoghq.com/version":"#{@data['sha']}"
|
24
27
|
}
|
25
28
|
},
|
26
29
|
spec: {
|
@@ -32,6 +35,9 @@ module Pfab
|
|
32
35
|
application: @data['application'],
|
33
36
|
"deployed-name" => @data['deployed_name'],
|
34
37
|
"application-type" => "job",
|
38
|
+
"tags.datadoghq.com/env": @data['env'],
|
39
|
+
"tags.datadoghq.com/service": @data['deployed_name'],
|
40
|
+
"tags.datadoghq.com/version": "#{@data['sha']}"
|
35
41
|
},
|
36
42
|
},
|
37
43
|
spec: {
|
data/lib/pfab/templates/web.rb
CHANGED
@@ -151,7 +151,10 @@ module Pfab
|
|
151
151
|
application: @data['application'],
|
152
152
|
"deployed-name" => @data['deployed_name'],
|
153
153
|
"application-type" => application_type,
|
154
|
-
"deploy-id" => deploy_id
|
154
|
+
"deploy-id" => deploy_id,
|
155
|
+
"tags.datadoghq.com/env": @data['env'],
|
156
|
+
"tags.datadoghq.com/service": @data['deployed_name'],
|
157
|
+
"tags.datadoghq.com/version":"#{@data['sha']}"
|
155
158
|
}
|
156
159
|
},
|
157
160
|
spec: {
|
@@ -176,6 +179,9 @@ module Pfab
|
|
176
179
|
application: @data['application'],
|
177
180
|
"deployed-name" => @data['deployed_name'],
|
178
181
|
"application-type" => "web",
|
182
|
+
"tags.datadoghq.com/env": @data['env'],
|
183
|
+
"tags.datadoghq.com/service": @data['deployed_name'],
|
184
|
+
"tags.datadoghq.com/version": "#{@data['sha']}"
|
179
185
|
},
|
180
186
|
},
|
181
187
|
spec: {
|
@@ -188,8 +194,22 @@ module Pfab
|
|
188
194
|
resources: resources,
|
189
195
|
livenessProbe: livenessProbe,
|
190
196
|
readinessProbe: readinessProbe,
|
197
|
+
volumeMounts: [
|
198
|
+
{
|
199
|
+
name: "apmsocketpath",
|
200
|
+
mountPath: "/var/run/datadog"
|
201
|
+
}
|
202
|
+
]
|
203
|
+
}
|
204
|
+
],
|
205
|
+
volumes: [
|
206
|
+
{
|
207
|
+
name: "apmsocketpath",
|
208
|
+
hostPath: {
|
209
|
+
path: "/var/run/datadog/",
|
210
|
+
}
|
191
211
|
}
|
192
|
-
]
|
212
|
+
],
|
193
213
|
},
|
194
214
|
},
|
195
215
|
},
|
data/lib/pfab/version.rb
CHANGED
data/pfab.gemspec
CHANGED
@@ -2,16 +2,16 @@
|
|
2
2
|
# DO NOT EDIT THIS FILE DIRECTLY
|
3
3
|
# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
|
4
4
|
# -*- encoding: utf-8 -*-
|
5
|
-
# stub: pfab 0.
|
5
|
+
# stub: pfab 0.26.0 ruby lib
|
6
6
|
|
7
7
|
Gem::Specification.new do |s|
|
8
8
|
s.name = "pfab".freeze
|
9
|
-
s.version = "0.
|
9
|
+
s.version = "0.26.0"
|
10
10
|
|
11
11
|
s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
|
12
12
|
s.require_paths = ["lib".freeze]
|
13
13
|
s.authors = ["Jeff Dwyer".freeze]
|
14
|
-
s.date = "2022-
|
14
|
+
s.date = "2022-09-01"
|
15
15
|
s.description = "k8s helper".freeze
|
16
16
|
s.email = "jdwyer@prefab.cloud".freeze
|
17
17
|
s.executables = ["pfab".freeze]
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: pfab
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.26.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jeff Dwyer
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-09-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: commander
|