pfab 0.44.0 → 0.46.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +9 -9
- data/README.markdown +10 -4
- data/lib/pfab/cli.rb +13 -1
- data/lib/pfab/templates/base.rb +9 -0
- data/lib/pfab/templates/cron.rb +1 -0
- data/lib/pfab/templates/daemon.rb +1 -0
- data/lib/pfab/templates/job.rb +1 -0
- data/lib/pfab/templates/web.rb +2 -1
- data/lib/pfab/version.rb +1 -1
- data/pfab.gemspec +14 -28
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5a2970a1b00c38842a3b0693e5314222745bd713b1fc73120365d785a2d0b6f3
|
4
|
+
data.tar.gz: 92e562f582413ebc5507c76001f9b0af0a07a9dcdefc8f73b9e5161dbcd84b2e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c3a9a891fac6b90b7e23c762d1f389000267f758d6b273aea9b9d9f219fb9b00d1afeed4b0c15b3c412ef48501ef50eb057aaa3c6a9ad119197362f02380db9e
|
7
|
+
data.tar.gz: 86463f57bc124b48ffc3a71bf0295a0fd1a3aec29c8b49ddcecaf27ca25fcdf0e598052ecdea72dfd962bb7b58c08a1cc8c258038859c425dc613dd4690255d9
|
data/Gemfile.lock
CHANGED
@@ -26,8 +26,8 @@ GEM
|
|
26
26
|
addressable (2.8.0)
|
27
27
|
public_suffix (>= 2.0.2, < 5.0)
|
28
28
|
builder (3.2.4)
|
29
|
-
byebug (
|
30
|
-
coderay (1.1.
|
29
|
+
byebug (11.1.3)
|
30
|
+
coderay (1.1.3)
|
31
31
|
commander (4.4.6)
|
32
32
|
highline (~> 1.7.2)
|
33
33
|
concurrent-ruby (1.1.9)
|
@@ -70,7 +70,7 @@ GEM
|
|
70
70
|
jwt (2.3.0)
|
71
71
|
kamelcase (0.0.2)
|
72
72
|
semver2 (~> 3)
|
73
|
-
method_source (0.
|
73
|
+
method_source (1.0.0)
|
74
74
|
mini_portile2 (2.8.0)
|
75
75
|
minitest (5.15.0)
|
76
76
|
multi_json (1.15.0)
|
@@ -86,12 +86,12 @@ GEM
|
|
86
86
|
multi_xml (~> 0.5)
|
87
87
|
rack (>= 1.2, < 3)
|
88
88
|
power_assert (1.1.3)
|
89
|
-
pry (0.
|
90
|
-
coderay (~> 1.1
|
91
|
-
method_source (~>
|
92
|
-
pry-byebug (3.
|
93
|
-
byebug (~>
|
94
|
-
pry (
|
89
|
+
pry (0.14.2)
|
90
|
+
coderay (~> 1.1)
|
91
|
+
method_source (~> 1.0)
|
92
|
+
pry-byebug (3.10.1)
|
93
|
+
byebug (~> 11.0)
|
94
|
+
pry (>= 0.13, < 0.15)
|
95
95
|
psych (4.0.2)
|
96
96
|
public_suffix (4.0.6)
|
97
97
|
racc (1.6.0)
|
data/README.markdown
CHANGED
@@ -60,12 +60,18 @@ deployables:
|
|
60
60
|
memory: 600Mi/768Mi
|
61
61
|
|
62
62
|
|
63
|
+
env_from:
|
64
|
+
- configMapRef:
|
65
|
+
name: my_config_map
|
66
|
+
- secretRef:
|
67
|
+
name: my_secrets
|
68
|
+
|
63
69
|
staging:
|
64
70
|
environment:
|
65
|
-
|
71
|
+
ENV_VAR_URL: "staging.example.com"
|
66
72
|
production:
|
67
73
|
environment:
|
68
|
-
|
74
|
+
ENV_VAR_URL: "example.com"
|
69
75
|
env_secrets:
|
70
76
|
AWS_SECRET_ACCESS_KEY: secretstore/aws_secret_access_key
|
71
77
|
environment:
|
@@ -105,7 +111,7 @@ Local Testing
|
|
105
111
|
-----------------------------------------
|
106
112
|
```bash
|
107
113
|
bundle exec rake build
|
108
|
-
gem install --local pkg/pfab-0.
|
114
|
+
gem install --local pkg/pfab-0.44.0.gem
|
109
115
|
```
|
110
116
|
```ruby
|
111
117
|
gem 'pfab', :path => "../pfab"
|
@@ -119,7 +125,7 @@ Releasing
|
|
119
125
|
- ```git commit ```
|
120
126
|
- ```REMOTE_BRANCH=main LOCAL_BRANCH=main bundle exec rake git:release```
|
121
127
|
- ```REMOTE_BRANCH=main LOCAL_BRANCH=main bundle exec rake build```
|
122
|
-
- ```gem push pkg/pfab-0.
|
128
|
+
- ```gem push pkg/pfab-0.45.0.gem```
|
123
129
|
|
124
130
|
Copyright
|
125
131
|
---------
|
data/lib/pfab/cli.rb
CHANGED
@@ -211,6 +211,10 @@ module Pfab
|
|
211
211
|
kubectl("apply -f .application-k8s-#{$env}-#{app_name}.yaml")
|
212
212
|
puts_and_system("git tag release-#{$env}-#{app_name}-#{Time.now.strftime("%Y-%m-%d-%H-%M-%S")} HEAD")
|
213
213
|
puts_and_system("git push origin --tags")
|
214
|
+
|
215
|
+
# watch
|
216
|
+
selector = "application=#{@application_yaml['name']}"
|
217
|
+
kubectl "get pods -l #{selector} -w"
|
214
218
|
end
|
215
219
|
end
|
216
220
|
|
@@ -265,7 +269,7 @@ module Pfab
|
|
265
269
|
end
|
266
270
|
end
|
267
271
|
|
268
|
-
build_cmd = "docker buildx build -t #{image_name} --platform linux/amd64 ."
|
272
|
+
build_cmd = "docker buildx build -t #{image_name} --platform linux/amd64 #{build_args} ."
|
269
273
|
puts build_cmd
|
270
274
|
result = system(build_cmd)
|
271
275
|
|
@@ -316,6 +320,14 @@ module Pfab
|
|
316
320
|
@application_yaml["name"]
|
317
321
|
end
|
318
322
|
|
323
|
+
def build_args
|
324
|
+
args = @application_yaml["build_args"] || []
|
325
|
+
if args.any?
|
326
|
+
return args.map{|a| "--build-arg #{a}=#{a}"}.join(" ")
|
327
|
+
end
|
328
|
+
""
|
329
|
+
end
|
330
|
+
|
319
331
|
def container_repository
|
320
332
|
@_container_repository ||= config["container.repository"]
|
321
333
|
end
|
data/lib/pfab/templates/base.rb
CHANGED
@@ -63,6 +63,15 @@ module Pfab
|
|
63
63
|
"#{@data['application']}.#{application_type}.#{@data['deployed_name']}"
|
64
64
|
end
|
65
65
|
|
66
|
+
def env_from
|
67
|
+
env_from = []
|
68
|
+
env_from << @data.dig("application_yaml", :env_from)
|
69
|
+
env_from << @data.dig("application_yaml", @data["env"], :env_from)
|
70
|
+
env_from.flatten!
|
71
|
+
env_from.compact!
|
72
|
+
env_from.empty? ? nil : env_from
|
73
|
+
end
|
74
|
+
|
66
75
|
def env_vars
|
67
76
|
env_vars = { "DEPLOYED_NAME" => { value: @data['deployed_name'] },
|
68
77
|
"DEPLOY_ID" => { value: deploy_id },
|
data/lib/pfab/templates/cron.rb
CHANGED
data/lib/pfab/templates/job.rb
CHANGED
data/lib/pfab/templates/web.rb
CHANGED
@@ -250,6 +250,7 @@ module Pfab
|
|
250
250
|
name: @data['deployed_name'],
|
251
251
|
command: get_command,
|
252
252
|
env: env_vars,
|
253
|
+
envFrom: env_from,
|
253
254
|
resources: resources,
|
254
255
|
ports: ports,
|
255
256
|
livenessProbe: livenessProbe,
|
@@ -257,7 +258,7 @@ module Pfab
|
|
257
258
|
startupProbe: startupProbe,
|
258
259
|
lifecycle: lifecycle,
|
259
260
|
volumeMounts: volume_mounts
|
260
|
-
}
|
261
|
+
}.compact
|
261
262
|
],
|
262
263
|
volumes: volumes
|
263
264
|
}.compact,
|
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.46.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.46.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 = "2023-
|
14
|
+
s.date = "2023-11-03"
|
15
15
|
s.description = "k8s helper".freeze
|
16
16
|
s.email = "jdwyer@prefab.cloud".freeze
|
17
17
|
s.executables = ["pfab".freeze]
|
@@ -44,33 +44,19 @@ 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.
|
47
|
+
s.rubygems_version = "3.4.6".freeze
|
48
48
|
s.summary = "helper gem".freeze
|
49
49
|
|
50
|
-
|
51
|
-
s.specification_version = 4
|
52
|
-
end
|
50
|
+
s.specification_version = 4
|
53
51
|
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
|
64
|
-
else
|
65
|
-
s.add_dependency(%q<commander>.freeze, [">= 0"])
|
66
|
-
s.add_dependency(%q<activesupport>.freeze, [">= 0"])
|
67
|
-
s.add_dependency(%q<pry-byebug>.freeze, [">= 0"])
|
68
|
-
s.add_dependency(%q<styled_yaml>.freeze, ["~> 0.0.1"])
|
69
|
-
s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
|
70
|
-
s.add_dependency(%q<bundler>.freeze, ["~> 2.3"])
|
71
|
-
s.add_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
|
72
|
-
s.add_dependency(%q<simplecov>.freeze, [">= 0"])
|
73
|
-
s.add_dependency(%q<test-unit>.freeze, [">= 0"])
|
74
|
-
end
|
52
|
+
s.add_runtime_dependency(%q<commander>.freeze, [">= 0"])
|
53
|
+
s.add_runtime_dependency(%q<activesupport>.freeze, [">= 0"])
|
54
|
+
s.add_runtime_dependency(%q<pry-byebug>.freeze, [">= 0"])
|
55
|
+
s.add_runtime_dependency(%q<styled_yaml>.freeze, ["~> 0.0.1"])
|
56
|
+
s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
|
57
|
+
s.add_development_dependency(%q<bundler>.freeze, ["~> 2.3"])
|
58
|
+
s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
|
59
|
+
s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
|
60
|
+
s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
|
75
61
|
end
|
76
62
|
|
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.46.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: 2023-
|
11
|
+
date: 2023-11-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: commander
|
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
185
185
|
- !ruby/object:Gem::Version
|
186
186
|
version: '0'
|
187
187
|
requirements: []
|
188
|
-
rubygems_version: 3.
|
188
|
+
rubygems_version: 3.4.6
|
189
189
|
signing_key:
|
190
190
|
specification_version: 4
|
191
191
|
summary: helper gem
|