pfab 0.38.0 → 0.40.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 +2 -1
- data/README.markdown +1 -1
- data/lib/pfab/cli.rb +15 -12
- data/lib/pfab/templates/base.rb +8 -4
- data/lib/pfab/templates/cron.rb +1 -1
- data/lib/pfab/templates/daemon.rb +1 -1
- data/lib/pfab/templates/job.rb +1 -1
- data/lib/pfab/templates/web.rb +1 -1
- data/lib/pfab/version.rb +1 -1
- data/lib/pfab/yamls.rb +8 -5
- 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: ea6666e8410d0fda1c32440cbc67bcccc785f0ebee5c4153d3d7b0da28ba8d70
|
4
|
+
data.tar.gz: 694e207c3967ef416109e119627b77a3a90e52d52f0e02c1a2844d8b3bcedcc8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 58b1891a0ed84d96f0d32c85f70676cbb62bbf4bc71a828dd5df13ef3b313464fe203bd426994557f12bc7938f4867a5c180cd31314052e094bc6b2d9a59123a
|
7
|
+
data.tar.gz: efce322eb37bc567781e4331acac9f6c8f3795d1835cc8bd1a6729f9af94a10a713723114a52ba4ebe4fac53280fdbe95e87f2c2a207b4882a5945aade01fe72
|
data/Gemfile.lock
CHANGED
data/README.markdown
CHANGED
data/lib/pfab/cli.rb
CHANGED
@@ -88,7 +88,7 @@ module Pfab
|
|
88
88
|
|
89
89
|
first_pod = get_first_pod(app_name)
|
90
90
|
|
91
|
-
|
91
|
+
kubectl("logs -f #{first_pod}")
|
92
92
|
end
|
93
93
|
end
|
94
94
|
|
@@ -100,7 +100,7 @@ module Pfab
|
|
100
100
|
set_kube_context
|
101
101
|
app_name = get_app_name
|
102
102
|
|
103
|
-
|
103
|
+
kubectl "rollout restart deployment.apps/#{app_name}"
|
104
104
|
end
|
105
105
|
end
|
106
106
|
|
@@ -117,7 +117,7 @@ module Pfab
|
|
117
117
|
set_kube_context
|
118
118
|
app_name = get_app_name
|
119
119
|
first_pod = get_first_pod app_name
|
120
|
-
|
120
|
+
kubectl "exec -it #{first_pod} -- #{options.command || '/bin/sh'}"
|
121
121
|
end
|
122
122
|
end
|
123
123
|
|
@@ -142,11 +142,11 @@ module Pfab
|
|
142
142
|
selector = "application=#{@application_yaml['name']}"
|
143
143
|
|
144
144
|
if options.watch
|
145
|
-
|
145
|
+
kubectl "get pods -l #{selector} -w"
|
146
146
|
elsif $verbose
|
147
|
-
|
147
|
+
kubectl "describe pods -l #{selector}"
|
148
148
|
else
|
149
|
-
|
149
|
+
kubectl "get ingresses,jobs,services,cronjobs,deployments,pods -l #{selector}"
|
150
150
|
end
|
151
151
|
end
|
152
152
|
end
|
@@ -185,9 +185,9 @@ module Pfab
|
|
185
185
|
puts "THIS APPLIES TO THE ENTIRE NAMESPACE"
|
186
186
|
types = %w(Failed Pending Succeeded)
|
187
187
|
types.each do |type|
|
188
|
-
|
188
|
+
kubectl("get pods --field-selector status.phase=#{type}")
|
189
189
|
if agree("Delete those?")
|
190
|
-
|
190
|
+
kubectl("delete pods --field-selector status.phase=#{type}")
|
191
191
|
puts "Deleted"
|
192
192
|
end
|
193
193
|
end
|
@@ -206,9 +206,9 @@ module Pfab
|
|
206
206
|
app = deployables[app_name]
|
207
207
|
if app[:deployable_type] == "cron"
|
208
208
|
deployed_name = deployed_name(app)
|
209
|
-
|
209
|
+
kubectl("delete cronjob -l deployed-name=#{deployed_name}")
|
210
210
|
end
|
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
214
|
end
|
@@ -324,6 +324,10 @@ module Pfab
|
|
324
324
|
@_config ||= YAML.load(File.read(File.join(Dir.home, ".pfab.yaml")))
|
325
325
|
end
|
326
326
|
|
327
|
+
def kubectl cmd
|
328
|
+
puts_and_system "kubectl #{cmd} --namespace=#{yy.namespace}"
|
329
|
+
end
|
330
|
+
|
327
331
|
def puts_and_system cmd
|
328
332
|
puts cmd
|
329
333
|
if $dryrun
|
@@ -369,8 +373,7 @@ module Pfab
|
|
369
373
|
end
|
370
374
|
|
371
375
|
def get_pods(app)
|
372
|
-
get_pods_str = "kubectl get pods -o json -l deployed-name=#{app}"
|
373
|
-
puts get_pods_str
|
376
|
+
get_pods_str = "kubectl get pods -o json -l deployed-name=#{app} --namespace=#{yy.namespace}"
|
374
377
|
pods_str = `#{get_pods_str}`
|
375
378
|
JSON.parse(pods_str)
|
376
379
|
end
|
data/lib/pfab/templates/base.rb
CHANGED
@@ -17,12 +17,16 @@ module Pfab
|
|
17
17
|
app_vars.dig(@data["env"], key) || app_vars[key]
|
18
18
|
end
|
19
19
|
|
20
|
-
def
|
21
|
-
@data[
|
20
|
+
def get_namespace
|
21
|
+
@data['namespace']
|
22
22
|
end
|
23
23
|
|
24
|
-
def
|
25
|
-
|
24
|
+
def get_command()
|
25
|
+
cmd = get("command")
|
26
|
+
if cmd.kind_of?(Array)
|
27
|
+
return cmd
|
28
|
+
end
|
29
|
+
return cmd.split(" ")
|
26
30
|
end
|
27
31
|
|
28
32
|
def cpu(req_type)
|
data/lib/pfab/templates/cron.rb
CHANGED
data/lib/pfab/templates/job.rb
CHANGED
data/lib/pfab/templates/web.rb
CHANGED
data/lib/pfab/version.rb
CHANGED
data/lib/pfab/yamls.rb
CHANGED
@@ -4,6 +4,8 @@ module Pfab
|
|
4
4
|
|
5
5
|
def initialize(apps:, application_yaml:, image_name:, env:, sha:, config:)
|
6
6
|
@apps = apps
|
7
|
+
namespace = application_yaml.dig(env.to_s, "namespace") || application_yaml["namespace"]
|
8
|
+
raise "No namespace founds" unless namespace
|
7
9
|
@base_data = {
|
8
10
|
"env" => env.to_s,
|
9
11
|
'image_name' => image_name,
|
@@ -11,7 +13,8 @@ module Pfab
|
|
11
13
|
'container_repository' => config["container.repository"],
|
12
14
|
'config' => config,
|
13
15
|
'application' => application_yaml["name"],
|
14
|
-
'application_yaml' => application_yaml
|
16
|
+
'application_yaml' => application_yaml,
|
17
|
+
'namespace' => namespace,
|
15
18
|
}
|
16
19
|
end
|
17
20
|
|
@@ -27,8 +30,11 @@ module Pfab
|
|
27
30
|
data
|
28
31
|
end
|
29
32
|
|
30
|
-
def
|
33
|
+
def namespace
|
34
|
+
@base_data['namespace']
|
35
|
+
end
|
31
36
|
|
37
|
+
def generate(keys)
|
32
38
|
keys.each do |key|
|
33
39
|
props = @apps[key]
|
34
40
|
data = data_for(key, props)
|
@@ -48,9 +54,6 @@ module Pfab
|
|
48
54
|
end
|
49
55
|
filename
|
50
56
|
end
|
51
|
-
|
52
57
|
end
|
53
|
-
|
54
|
-
|
55
58
|
end
|
56
59
|
end
|
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.40.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.40.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-04-14"
|
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.40.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-04-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: commander
|