pfab 0.10.0 → 0.11.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2bbc17afd25c1aa631080d916b9c19528916b81d6c57d360f524b56d53e53849
4
- data.tar.gz: b2df229562760fc8879aedf8f55dc2e1ef36e956195d5bc2b03454caa173dde0
3
+ metadata.gz: 86a0173094dded1e5b572b11593274b17abcfa2f29e7aac04977918af2d5674c
4
+ data.tar.gz: 3e189a70dc5126e40f8e81e13f84872964e35b06561251c6e260efa42a517de2
5
5
  SHA512:
6
- metadata.gz: 47c99495b251f2c33b15dc56d261857fad0bc9defb9b2fb7498e4511a35c4a36fcd9c6d562254f732e03ba76e260bdea09b5619cc918bbea8ff78748dfc92127
7
- data.tar.gz: 7da4ba60ee697c0f0979828086d17fc1c9b18f82dc1192dcafa969a747204667e33f6040b8dd4981a73f36fb9c800c7bcc8a5f0c0247eaa21b43868c5a5ffc9e
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]}=#{item[:value]}" }.join(" ")
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}"
@@ -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
- env_vars = [
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 << { name: env_var_name, valueFrom: {
65
+ env_vars[env_var_name] = { valueFrom: {
66
66
  fieldRef: { fieldPath: field_name }
67
67
  } }
68
68
  else
69
- env_vars << { name: env_var_name, value: v }
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 << { name: env_var_name,
79
- valueFrom: {
80
- secretKeyRef: {
81
- name: ref,
82
- key: key
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
@@ -36,7 +36,7 @@ module Pfab
36
36
 
37
37
  def ingress
38
38
  {
39
- apiVersion: "extensions/v1beta1",
39
+ apiVersion: "networking.k8s.io/v1",
40
40
  kind: "Ingress",
41
41
  metadata: {
42
42
  name: "ingress-#{@data['deployed_name']}",
data/lib/pfab/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Pfab
2
2
  module Version
3
3
  MAJOR = 0
4
- MINOR = 10
4
+ MINOR = 11
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.10.0 ruby lib
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.10.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-10-31"
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.10.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-10-31 00:00:00.000000000 Z
11
+ date: 2021-11-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: commander