pfab 0.10.0 → 0.11.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.markdown +7 -0
- data/lib/pfab/cli.rb +1 -1
- data/lib/pfab/templates/base.rb +17 -18
- data/lib/pfab/templates/web.rb +1 -1
- 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: 86a0173094dded1e5b572b11593274b17abcfa2f29e7aac04977918af2d5674c
|
4
|
+
data.tar.gz: 3e189a70dc5126e40f8e81e13f84872964e35b06561251c6e260efa42a517de2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: '09b0ce9accab6e86643d1dff636a84c0b6aa077d1309ff82867fa3e7125255bdb60fa2639a74766d2575b239ea8cb8933ec7ac94f6659d0ce55336aca59704d0'
|
7
|
+
data.tar.gz: 67427d6c7818d428945a36736cb45ac024967ccacd189087a3146f2458f85e12316e2e9e7497c1801d65bbae70055480c8e7a22a30f9aeb2d190f3a998456446
|
data/README.markdown
CHANGED
@@ -100,6 +100,13 @@ Contributing to pfab
|
|
100
100
|
is fine, but please isolate to its own commit so I can cherry-pick
|
101
101
|
around it.
|
102
102
|
|
103
|
+
Releasing
|
104
|
+
-----------------------------------------
|
105
|
+
|
106
|
+
- modify version.rb
|
107
|
+
- ```rake gemspec:release```
|
108
|
+
- ```rake gemcutter:release```
|
109
|
+
|
103
110
|
Copyright
|
104
111
|
---------
|
105
112
|
|
data/lib/pfab/cli.rb
CHANGED
@@ -148,7 +148,7 @@ module Pfab
|
|
148
148
|
env_vars = yy.env_vars(app_name).
|
149
149
|
reject { |v| v.has_key? :valueFrom }
|
150
150
|
|
151
|
-
env_var_string = env_vars.map { |item| "#{item[:name]}
|
151
|
+
env_var_string = env_vars.map { |item| "#{item[:name]}=\"#{item[:value]}\"" }.join(" ")
|
152
152
|
options.default command: @apps[app_name][:command]
|
153
153
|
|
154
154
|
puts_and_system "#{env_var_string} #{options.command}"
|
data/lib/pfab/templates/base.rb
CHANGED
@@ -17,7 +17,6 @@ module Pfab
|
|
17
17
|
app_vars.dig(@data["env"], key) || app_vars[key]
|
18
18
|
end
|
19
19
|
|
20
|
-
|
21
20
|
def cpu(req_type)
|
22
21
|
default_cpu_string = @data["config"]["default_cpu_string"] || "50m/250m"
|
23
22
|
(request, limit) = (get("cpu") || default_cpu_string).split("/")
|
@@ -44,44 +43,44 @@ module Pfab
|
|
44
43
|
end
|
45
44
|
|
46
45
|
def env_vars
|
46
|
+
env_vars = { "DEPLOYED_NAME": { value: @data['deployed_name'] } }
|
47
47
|
|
48
|
-
|
49
|
-
{ name: "DEPLOYED_NAME", value: @data['deployed_name'] },
|
50
|
-
]
|
51
|
-
|
48
|
+
# load defaults
|
52
49
|
load_env_vars(env_vars, @data.dig("application_yaml", :environment))
|
53
|
-
load_env_vars(env_vars, @data.dig("application_yaml", @data["env"], :environment))
|
54
|
-
|
55
50
|
load_secrets(env_vars, @data.dig("application_yaml", :env_secrets))
|
51
|
+
|
52
|
+
# load env overrides
|
53
|
+
load_env_vars(env_vars, @data.dig("application_yaml", @data["env"], :environment))
|
56
54
|
load_secrets(env_vars, @data.dig("application_yaml", @data["env"], :env_secrets))
|
57
55
|
|
58
|
-
env_vars
|
56
|
+
env_vars.map do |k, v|
|
57
|
+
{ name: k }.merge(v)
|
58
|
+
end
|
59
59
|
end
|
60
60
|
|
61
61
|
def load_env_vars(env_vars, hash)
|
62
62
|
(hash || {}).each do |env_var_name, v|
|
63
63
|
if v.to_s.start_with? "field/"
|
64
64
|
(_, field_name) = v.split("/")
|
65
|
-
env_vars
|
65
|
+
env_vars[env_var_name] = { valueFrom: {
|
66
66
|
fieldRef: { fieldPath: field_name }
|
67
67
|
} }
|
68
68
|
else
|
69
|
-
env_vars
|
69
|
+
env_vars[env_var_name] = { value: v }
|
70
70
|
end
|
71
|
-
|
72
71
|
end
|
73
72
|
end
|
74
73
|
|
75
74
|
def load_secrets(env_vars, hash)
|
76
75
|
(hash || {}).each do |env_var_name, v|
|
77
76
|
(ref, key) = v.split("/")
|
78
|
-
env_vars
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
77
|
+
env_vars[env_var_name] = {
|
78
|
+
valueFrom: {
|
79
|
+
secretKeyRef: {
|
80
|
+
name: ref,
|
81
|
+
key: key
|
82
|
+
}
|
83
|
+
} }
|
85
84
|
end
|
86
85
|
end
|
87
86
|
end
|
data/lib/pfab/templates/web.rb
CHANGED
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.11.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.11.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 = "2021-
|
14
|
+
s.date = "2021-11-30"
|
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.11.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: 2021-
|
11
|
+
date: 2021-11-30 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: commander
|