pfab 0.9.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96b769d61b9ae509f7daec59b57a0925851635e0e5b7f8693d0c476bda283506
-  data.tar.gz: 9b86749ba6031a208ef3c63a0ffcab8692df8dc9c77fd51602428499f4d2f6f3
+  metadata.gz: 589356fb8374a27bf709147331e7f7a7106906b9f65f2f8bb78baf8baab8664d
+  data.tar.gz: cccaf81ec5b065111cd88c22be0d704ffc3050908a15cbdb21e3cda4b46d7cd0
 SHA512:
-  metadata.gz: 80073215c5381aabd0f91d83d6181dd824c8f1c39c83a8159b2ab96ab761169cec454810518962c9caf7348fbf3925b040117e02d64200006c4d5dddd2ed5da2
-  data.tar.gz: aeab2b3c8c1587f91213eea9d6cc96aad580092306cdec0494f4fdbaa23859f0d0f781b155c1d6ce796960c6ff4c976f293c7bf812636568d11f142851f28531
+  metadata.gz: 2bc8c48d7d2ae782d43c78d50570cf906c4eabeeee0d2d7d20379d6460ab7e8de458d526ddd711389c369d9ade90866134f1f2551b1a9303a172476f00068518
+  data.tar.gz: eac9d21bf4893e11041b9c3d7a98eae5ff457085128e935605f7e86d25397c5ade4cf6ce5e8fcc9177b98b13bf2f002159750d6ac5220667b03c8d08686227d4

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.6.9

data/Gemfile

@@ -12,7 +12,7 @@ gem "pry-byebug"
 group :development do
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0"
-  gem "juwelier", "~> 2.4.9"
+  gem "juwelier", "~> 2.4.9", git: "https://github.com/flajann2/juwelier"
   gem "simplecov", ">= 0"
   gem "test-unit", ">= 0"
 end

data/Gemfile.lock

@@ -1,3 +1,20 @@
+GIT
+  remote: https://github.com/flajann2/juwelier
+  revision: de59d5a2ddea00c1f18957ab62129c1c141acce1
+  specs:
+    juwelier (2.4.9)
+      builder
+      bundler
+      git
+      github_api
+      highline
+      kamelcase (~> 0)
+      nokogiri
+      psych
+      rake
+      rdoc
+      semver2
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -6,7 +23,7 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     builder (3.2.4)
     byebug (10.0.2)
@@ -17,12 +34,26 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     docile (1.3.1)
-    faraday (1.3.0)
+    faraday (1.8.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
     faraday-net_http (1.0.1)
-    git (1.8.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    git (1.9.1)
       rchardet (~> 1.8)
     github_api (0.19.0)
       addressable (~> 2.4)
@@ -35,31 +66,19 @@ GEM
     i18n (1.2.0)
       concurrent-ruby (~> 1.0)
     json (1.8.6)
-    juwelier (2.4.9)
-      builder
-      bundler
-      git
-      github_api
-      highline
-      kamelcase (~> 0)
-      nokogiri
-      psych
-      rake
-      rdoc
-      semver2
-    jwt (2.2.2)
+    jwt (2.3.0)
     kamelcase (0.0.2)
       semver2 (~> 3)
     method_source (0.9.2)
-    mini_portile2 (2.5.0)
+    mini_portile2 (2.6.1)
     minitest (5.11.3)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.11.2)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    oauth2 (1.4.4)
+    oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
@@ -72,15 +91,15 @@ GEM
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
-    psych (3.3.1)
+    psych (4.0.2)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
-    rake (13.0.3)
+    rake (13.0.6)
     rchardet (1.8.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     semver2 (3.4.2)
     simplecov (0.16.1)
       docile (~> 1.1)
@@ -100,11 +119,11 @@ DEPENDENCIES
   activesupport
   bundler (~> 1.0)
   commander
-  juwelier (~> 2.4.9)
+  juwelier (~> 2.4.9)!
   pry-byebug
   rdoc (~> 3.12)
   simplecov
   test-unit
 
 BUNDLED WITH
-   1.16.6
+   1.17.2

data/README.markdown

@@ -100,6 +100,25 @@ Contributing to pfab
     is fine, but please isolate to its own commit so I can cherry-pick
     around it.
 
+Local Testing
+-----------------------------------------
+```bash
+bundle exec rake build
+gem install --local pkg/pfab-0.11.0.gem
+```
+```ruby
+gem 'pfab', :path => "../pfab"
+```
+
+Releasing
+-----------------------------------------
+
+- modify version.rb
+- ```bundle exec rake gemspec```
+- ```bundle exec rake git:release```
+- ```bundle exec rake build```
+- ```gem push pkg/pfab-0.12.0.gem```
+
 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}"
@@ -237,7 +237,7 @@ module Pfab
         end
       end
 
-      puts_and_system "docker build -t #{image_name} ."
+      puts_and_system "docker build -t #{image_name} --platform amd64 ."
 
       puts_and_system "docker tag #{image_name}:latest #{image_name}:#{rev}"
       puts_and_system "docker tag #{image_name}:#{rev} #{full_image_name}"

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']}",
@@ -62,9 +62,14 @@ module Pfab
               paths: [
                 {
                   path: "/",
+                  pathType: "Prefix",
                   backend: {
-                    serviceName: @data['deployed_name'],
-                    servicePort: "http",
+                    service: {
+                      name: @data['deployed_name'],
+                      port: {
+                        name: "http"
+                      }
+                    }
                   },
                 },
               ],

data/lib/pfab/version.rb

@@ -1,7 +1,7 @@
 module Pfab
   module Version
     MAJOR = 0
-    MINOR = 9
+    MINOR = 13
     PATCH = 0
     BUILD = nil
 

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.9.0 ruby lib
+# stub: pfab 0.13.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.9.0"
+  s.version = "0.13.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 = "2021-03-16"
+  s.date = "2021-12-06"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".ruby-version",
+    ".tool-versions",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -43,7 +44,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/prefab-cloud/pfab".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.7.8".freeze
+  s.rubygems_version = "3.0.3.1".freeze
   s.summary = "helper gem".freeze
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Jeff Dwyer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -133,6 +133,7 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".ruby-version"
+- ".tool-versions"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -155,7 +156,7 @@ homepage: http://github.com/prefab-cloud/pfab
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,9 +171,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.0.3.1
+signing_key:
 specification_version: 4
 summary: helper gem
 test_files: []