pfab 0.8.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 224ab8cfa23f3ee0a33cb46be50f3754650c99c5ebd5ba22e1671e2cf086de67
-  data.tar.gz: 3edfbec234d5aef944976bc296bee56018fa0b33f5a87ef3d934355e165f9033
+  metadata.gz: 86a0173094dded1e5b572b11593274b17abcfa2f29e7aac04977918af2d5674c
+  data.tar.gz: 3e189a70dc5126e40f8e81e13f84872964e35b06561251c6e260efa42a517de2
 SHA512:
-  metadata.gz: dd8954a340c7d2a2b3e603bb1dc168717c27db71b1344ba7c9ad55ca7069496da320d4fbd53cb6336dc4bebcdd795e800afab2a84cd52230b10f03985dc0c2af
-  data.tar.gz: 92dfb44127da6d5ba2900007e3f6f0052848dc8b2f05a043814928aa588d6627f1e20057e1ed987b374f92d52cee59e7c8d84882c644b2ad324d5ac59cc0a97e
+  metadata.gz: '09b0ce9accab6e86643d1dff636a84c0b6aa077d1309ff82867fa3e7125255bdb60fa2639a74766d2575b239ea8cb8933ec7ac94f6659d0ce55336aca59704d0'
+  data.tar.gz: 67427d6c7818d428945a36736cb45ac024967ccacd189087a3146f2458f85e12316e2e9e7497c1801d65bbae70055480c8e7a22a30f9aeb2d190f3a998456446

data/Gemfile

@@ -12,7 +12,7 @@ gem "pry-byebug"
 group :development do
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0"
-  gem "juwelier", "~> 2.1.0"
+  gem "juwelier", "~> 2.4.9"
   gem "simplecov", ">= 0"
   gem "test-unit", ">= 0"
 end

data/Gemfile.lock

@@ -6,9 +6,9 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    builder (3.2.3)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    builder (3.2.4)
     byebug (10.0.2)
     coderay (1.1.2)
     commander (4.4.6)
@@ -17,42 +17,51 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     docile (1.3.1)
-    faraday (0.12.2)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
-    git (1.3.0)
-    github_api (0.18.2)
+      ruby2_keywords
+    faraday-net_http (1.0.1)
+    git (1.8.1)
+      rchardet (~> 1.8)
+    github_api (0.19.0)
       addressable (~> 2.4)
       descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8)
+      faraday (>= 0.8, < 2)
       hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
-    hashie (3.5.7)
+    hashie (3.6.0)
     highline (1.7.10)
     i18n (1.2.0)
       concurrent-ruby (~> 1.0)
     json (1.8.6)
-    juwelier (2.1.3)
+    juwelier (2.4.9)
       builder
-      bundler (>= 1.13)
-      git (>= 1.2.5)
+      bundler
+      git
       github_api
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
+      highline
+      kamelcase (~> 0)
+      nokogiri
+      psych
       rake
       rdoc
-      semver
-    jwt (1.5.6)
+      semver2
+    jwt (2.2.2)
+    kamelcase (0.0.2)
+      semver2 (~> 3)
     method_source (0.9.2)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.5.0)
     minitest (5.11.3)
-    multi_json (1.13.1)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
+    multipart-post (2.1.1)
+    nokogiri (1.11.2)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
@@ -63,12 +72,16 @@ GEM
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
-    public_suffix (3.0.2)
-    rack (2.0.5)
-    rake (12.3.1)
+    psych (3.3.1)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rack (2.2.3)
+    rake (13.0.3)
+    rchardet (1.8.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    semver (1.0.1)
+    ruby2_keywords (0.0.4)
+    semver2 (3.4.2)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -87,7 +100,7 @@ DEPENDENCIES
   activesupport
   bundler (~> 1.0)
   commander
-  juwelier (~> 2.1.0)
+  juwelier (~> 2.4.9)
   pry-byebug
   rdoc (~> 3.12)
   simplecov

data/README.markdown

@@ -100,6 +100,13 @@ Contributing to pfab
     is fine, but please isolate to its own commit so I can cherry-pick
     around it.
 
+Releasing
+-----------------------------------------
+
+- modify version.rb
+- ```rake gemspec:release```
+- ```rake gemcutter:release```
+
 Copyright
 ---------
 

data/lib/pfab/cli.rb

@@ -128,7 +128,7 @@ module Pfab
           elsif $verbose
             puts_and_system "kubectl describe pods -l #{selector}"
           else
-            puts_and_system "kubectl get ingresses,jobs,services,cronjobs,deployments,pods --include-uninitialized=true -l #{selector}"
+            puts_and_system "kubectl get ingresses,jobs,services,cronjobs,deployments,pods -l #{selector}"
           end
         end
       end
@@ -148,7 +148,7 @@ module Pfab
           env_vars = yy.env_vars(app_name).
             reject { |v| v.has_key? :valueFrom }
 
-          env_var_string = env_vars.map { |item| "#{item[:name]}=#{item[:value]}" }.join(" ")
+          env_var_string = env_vars.map { |item| "#{item[:name]}=\"#{item[:value]}\"" }.join(" ")
           options.default command: @apps[app_name][:command]
 
           puts_and_system "#{env_var_string} #{options.command}"
@@ -186,6 +186,11 @@ module Pfab
     def cmd_apply
       set_kube_context
       get_apps.each do |app_name|
+        app = @apps[app_name]
+        if app[:deployable_type] == "cron"
+          deployed_name = deployed_name(app)
+          puts_and_system("kubectl delete cronjob -l deployed-name=#{deployed_name}")
+        end
         puts_and_system("kubectl apply -f .application-k8s-#{$env}-#{app_name}.yaml")
         puts_and_system("git tag release-#{$env}-#{app_name}-#{Time.now.strftime("%Y-%m-%d-%H-%M-%S")} HEAD")
       end
@@ -256,6 +261,10 @@ module Pfab
       puts "Generated #{wrote}"
     end
 
+    def deployed_name(app)
+      [app[:application], app[:deployable_type], app[:deployable]].join("-")
+    end
+
     def get_current_sha
       `git rev-parse --short --verify HEAD`.chomp
     end

data/lib/pfab/templates/base.rb

@@ -17,7 +17,6 @@ module Pfab
         app_vars.dig(@data["env"], key) || app_vars[key]
       end
 
-
       def cpu(req_type)
         default_cpu_string = @data["config"]["default_cpu_string"] || "50m/250m"
         (request, limit) = (get("cpu") || default_cpu_string).split("/")
@@ -44,44 +43,44 @@ module Pfab
       end
 
       def env_vars
+        env_vars = { "DEPLOYED_NAME": { value: @data['deployed_name'] } }
 
-        env_vars = [
-          { name: "DEPLOYED_NAME", value: @data['deployed_name'] },
-        ]
-
+        # load defaults
         load_env_vars(env_vars, @data.dig("application_yaml", :environment))
-        load_env_vars(env_vars, @data.dig("application_yaml", @data["env"], :environment))
-
         load_secrets(env_vars, @data.dig("application_yaml", :env_secrets))
+
+        # load env overrides
+        load_env_vars(env_vars, @data.dig("application_yaml", @data["env"], :environment))
         load_secrets(env_vars, @data.dig("application_yaml", @data["env"], :env_secrets))
 
-        env_vars
+        env_vars.map do |k, v|
+          { name: k }.merge(v)
+        end
       end
 
       def load_env_vars(env_vars, hash)
         (hash || {}).each do |env_var_name, v|
           if v.to_s.start_with? "field/"
             (_, field_name) = v.split("/")
-            env_vars << { name: env_var_name, valueFrom: {
+            env_vars[env_var_name] = { valueFrom: {
               fieldRef: { fieldPath: field_name }
             } }
           else
-            env_vars << { name: env_var_name, value: v }
+            env_vars[env_var_name] = { value: v }
           end
-
         end
       end
 
       def load_secrets(env_vars, hash)
         (hash || {}).each do |env_var_name, v|
           (ref, key) = v.split("/")
-          env_vars << { name: env_var_name,
-                        valueFrom: {
-                          secretKeyRef: {
-                            name: ref,
-                            key: key
-                          }
-                        } }
+          env_vars[env_var_name] = {
+            valueFrom: {
+              secretKeyRef: {
+                name: ref,
+                key: key
+              }
+            } }
         end
       end
     end

data/lib/pfab/templates/daemon.rb

@@ -8,7 +8,7 @@ module Pfab
       def deployment
         {
           kind: "Deployment",
-          apiVersion: "extensions/v1beta1",
+          apiVersion: "apps/v1",
           metadata: {
             name: @data['deployed_name'],
             namespace: @data['env'],

data/lib/pfab/templates/web.rb

@@ -36,7 +36,7 @@ module Pfab
 
       def ingress
         {
-          apiVersion: "extensions/v1beta1",
+          apiVersion: "networking.k8s.io/v1",
           kind: "Ingress",
           metadata: {
             name: "ingress-#{@data['deployed_name']}",
@@ -109,7 +109,7 @@ module Pfab
       def deployment
         {
           kind: "Deployment",
-          apiVersion: "extensions/v1beta1",
+          apiVersion: "apps/v1",
           metadata: {
             name: @data['deployed_name'],
             namespace: @data['env'],

data/lib/pfab/version.rb

@@ -1,8 +1,8 @@
 module Pfab
   module Version
     MAJOR = 0
-    MINOR = 8
-    PATCH = 3
+    MINOR = 11
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/pfab.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: pfab 0.8.3 ruby lib
+# stub: pfab 0.11.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.8.3"
+  s.version = "0.11.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Jeff Dwyer".freeze]
-  s.date = "2019-01-23"
+  s.date = "2021-11-30"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<pry-byebug>.freeze, [">= 0"])
       s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
-      s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.1.0"])
+      s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
       s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
       s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
     else
@@ -64,7 +64,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<pry-byebug>.freeze, [">= 0"])
       s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
       s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
-      s.add_dependency(%q<juwelier>.freeze, ["~> 2.1.0"])
+      s.add_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
       s.add_dependency(%q<simplecov>.freeze, [">= 0"])
       s.add_dependency(%q<test-unit>.freeze, [">= 0"])
     end
@@ -74,7 +74,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<pry-byebug>.freeze, [">= 0"])
     s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
     s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
-    s.add_dependency(%q<juwelier>.freeze, ["~> 2.1.0"])
+    s.add_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     s.add_dependency(%q<test-unit>.freeze, [">= 0"])
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Jeff Dwyer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.4.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.4.9
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +155,7 @@ homepage: http://github.com/prefab-cloud/pfab
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,9 +170,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: helper gem
 test_files: []