pfab 0.22.0 → 0.25.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/lib/pfab/templates/base.rb +8 -2
  3. data/lib/pfab/templates/cron.rb +7 -1
  4. data/lib/pfab/templates/daemon.rb +7 -1
  5. data/lib/pfab/templates/job.rb +7 -1
  6. data/lib/pfab/templates/web.rb +22 -2
  7. data/lib/pfab/version.rb +1 -1
  8. data/pfab.gemspec +23 -14
  9. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3cf4984e6014745e194fa5d2b6cb12499548ae1113fd61c73529273554d1f5db
4
- data.tar.gz: febfd1b79e28f2227c40b2d122a9fd236d065f8b18a0c09fad82779f02174061
3
+ metadata.gz: 161cf6c476c53435c6bac139c10132e599589b4180533b2d06137d2a39a16296
4
+ data.tar.gz: 75910dc501c137feafcfb413939dbbdbe2c6c73f1d4bb97b039e4abd4ccf2a5a
5
5
  SHA512:
6
- metadata.gz: d3802f127e96a1b0f2fc57e6f38821783e0caa2fc065d7d718727960c201ea76d6d96420196256a26ecf2559904b70fbe2d5f45f6b5b71bdca47ffbbb7f4eef5
7
- data.tar.gz: 7366605a1c4882177ce807a26113d465a419e839193e795cafa17546f8b38cb7f0709dee5c72c1b771ba44e2147267d7cbd20b036d0f16db5c3851b2fff93829
6
+ metadata.gz: 80bcfb6f0860893abe2d7eee61012d5deb16721f08dbd5181823fcdce88afed2ec068697c66adc9f5fe5fcec9b3d24846a03f98dcda074a89342a209edab0128
7
+ data.tar.gz: b3bc0348374e7b234f2106b481bd20c39bf8dde514f1be2bc31e687f566d597b90275934e54cba433364b4588be84748d3b803ffec6a1f0504a1d619e2b60af6
data/lib/pfab/templates/base.rb CHANGED
@@ -42,16 +42,22 @@ module Pfab
42
42
  }
43
43
  end
44
44
 
45
+ # overridden in subtypes
46
+ def application_type
47
+ "base"
48
+ end
45
49
 
46
50
  def deploy_id
47
51
  "#{@data['application']}.#{application_type}.#{@data['deployed_name']}"
48
52
  end
49
53
 
50
54
  def env_vars
51
-
52
55
  env_vars = { "DEPLOYED_NAME" => { value: @data['deployed_name'] },
53
56
  "DEPLOY_ID" => { value: deploy_id },
54
- "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']" } } }
55
61
  }
56
62
 
57
63
  # load defaults
data/lib/pfab/templates/cron.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: {
@@ -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: {
data/lib/pfab/templates/daemon.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: {
@@ -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
@@ -1,7 +1,7 @@
1
1
  module Pfab
2
2
  module Version
3
3
  MAJOR = 0
4
- MINOR = 22
4
+ MINOR = 25
5
5
  PATCH = 0
6
6
  BUILD = nil
7
7
 
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.22.0 ruby lib
5
+ # stub: pfab 0.25.0 ruby lib
6
6
 
7
7
  Gem::Specification.new do |s|
8
8
  s.name = "pfab".freeze
9
- s.version = "0.22.0"
9
+ s.version = "0.25.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-07-21"
14
+ s.date = "2022-08-10"
15
15
  s.description = "k8s helper".freeze
16
16
  s.email = "jdwyer@prefab.cloud".freeze
17
17
  s.executables = ["pfab".freeze]
@@ -44,22 +44,31 @@ Gem::Specification.new do |s|
44
44
  ]
45
45
  s.homepage = "http://github.com/prefab-cloud/pfab".freeze
46
46
  s.licenses = ["MIT".freeze]
47
- s.rubygems_version = "3.2.32".freeze
47
+ s.rubygems_version = "3.0.3.1".freeze
48
48
  s.summary = "helper gem".freeze
49
49
 
50
50
  if s.respond_to? :specification_version then
51
51
  s.specification_version = 4
52
- end
53
52
 
54
- if s.respond_to? :add_runtime_dependency then
55
- s.add_runtime_dependency(%q<commander>.freeze, [">= 0"])
56
- s.add_runtime_dependency(%q<activesupport>.freeze, [">= 0"])
57
- s.add_runtime_dependency(%q<pry-byebug>.freeze, [">= 0"])
58
- s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
59
- s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
60
- s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
61
- s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
62
- s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
53
+ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
54
+ s.add_runtime_dependency(%q<commander>.freeze, [">= 0"])
55
+ s.add_runtime_dependency(%q<activesupport>.freeze, [">= 0"])
56
+ s.add_runtime_dependency(%q<pry-byebug>.freeze, [">= 0"])
57
+ s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
58
+ s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
59
+ s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
60
+ s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
61
+ s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
62
+ else
63
+ s.add_dependency(%q<commander>.freeze, [">= 0"])
64
+ s.add_dependency(%q<activesupport>.freeze, [">= 0"])
65
+ s.add_dependency(%q<pry-byebug>.freeze, [">= 0"])
66
+ s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
67
+ s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
68
+ s.add_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
69
+ s.add_dependency(%q<simplecov>.freeze, [">= 0"])
70
+ s.add_dependency(%q<test-unit>.freeze, [">= 0"])
71
+ end
63
72
  else
64
73
  s.add_dependency(%q<commander>.freeze, [">= 0"])
65
74
  s.add_dependency(%q<activesupport>.freeze, [">= 0"])
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.22.0
4
+ version: 0.25.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-07-21 00:00:00.000000000 Z
11
+ date: 2022-08-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: commander
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
171
171
  - !ruby/object:Gem::Version
172
172
  version: '0'
173
173
  requirements: []
174
- rubygems_version: 3.2.32
174
+ rubygems_version: 3.0.3.1
175
175
  signing_key:
176
176
  specification_version: 4
177
177
  summary: helper gem