pfab 0.44.0 → 0.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8215d1b329b50c1aa95a629f1ff2df3e2c631d692bd993b3e0d7f14a1743f9c4
-  data.tar.gz: d559f2e1b6b73f3b1f4e67e317cd5bd0775872e32c0ffba3f23863bcbd71d2da
+  metadata.gz: 5a2970a1b00c38842a3b0693e5314222745bd713b1fc73120365d785a2d0b6f3
+  data.tar.gz: 92e562f582413ebc5507c76001f9b0af0a07a9dcdefc8f73b9e5161dbcd84b2e
 SHA512:
-  metadata.gz: 25171dd91137cca8da6c1103260f9a933e5bd41036c183a1fe41bcb9c5a0a36e91d85f3b3b57049b9b362e852f205c2f6b6aff928a9e5d0fc62f3379d39c3fea
-  data.tar.gz: 31a8c4ecd944ab6226a93ace3049f8ab34b526c074adf2934c53cef70186cbc08d2547cdd320ca2aa6cc1719ada365ff871e736459488971b8aaaee65c12f2d7
+  metadata.gz: c3a9a891fac6b90b7e23c762d1f389000267f758d6b273aea9b9d9f219fb9b00d1afeed4b0c15b3c412ef48501ef50eb057aaa3c6a9ad119197362f02380db9e
+  data.tar.gz: 86463f57bc124b48ffc3a71bf0295a0fd1a3aec29c8b49ddcecaf27ca25fcdf0e598052ecdea72dfd962bb7b58c08a1cc8c258038859c425dc613dd4690255d9

data/Gemfile.lock

@@ -26,8 +26,8 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     builder (3.2.4)
-    byebug (10.0.2)
-    coderay (1.1.2)
+    byebug (11.1.3)
+    coderay (1.1.3)
     commander (4.4.6)
       highline (~> 1.7.2)
     concurrent-ruby (1.1.9)
@@ -70,7 +70,7 @@ GEM
     jwt (2.3.0)
     kamelcase (0.0.2)
       semver2 (~> 3)
-    method_source (0.9.2)
+    method_source (1.0.0)
     mini_portile2 (2.8.0)
     minitest (5.15.0)
     multi_json (1.15.0)
@@ -86,12 +86,12 @@ GEM
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
     power_assert (1.1.3)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.10.1)
+      byebug (~> 11.0)
+      pry (>= 0.13, < 0.15)
     psych (4.0.2)
     public_suffix (4.0.6)
     racc (1.6.0)

data/README.markdown

@@ -60,12 +60,18 @@ deployables:
     memory: 600Mi/768Mi
 
 
+env_from:
+    - configMapRef:
+        name: my_config_map
+    - secretRef:
+        name: my_secrets
+
 staging:
   environment:
-    ENV: staging
+    ENV_VAR_URL: "staging.example.com"
 production:
   environment:
-    ENV: production
+    ENV_VAR_URL: "example.com"
 env_secrets:
   AWS_SECRET_ACCESS_KEY: secretstore/aws_secret_access_key
 environment:
@@ -105,7 +111,7 @@ Local Testing
 -----------------------------------------
 ```bash
 bundle exec rake build
-gem install --local pkg/pfab-0.11.0.gem
+gem install --local pkg/pfab-0.44.0.gem
 ```
 ```ruby
 gem 'pfab', :path => "../pfab"
@@ -119,7 +125,7 @@ Releasing
 - ```git commit ```
 - ```REMOTE_BRANCH=main LOCAL_BRANCH=main bundle exec rake git:release```
 - ```REMOTE_BRANCH=main LOCAL_BRANCH=main bundle exec rake build```
-- ```gem push pkg/pfab-0.15.0.gem```
+- ```gem push pkg/pfab-0.45.0.gem```
 
 Copyright
 ---------

data/lib/pfab/cli.rb

@@ -211,6 +211,10 @@ module Pfab
         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")
         puts_and_system("git push origin --tags")
+
+        # watch
+        selector = "application=#{@application_yaml['name']}"
+        kubectl "get pods -l #{selector} -w"
       end
     end
 
@@ -265,7 +269,7 @@ module Pfab
         end
       end
 
-      build_cmd = "docker buildx build -t #{image_name} --platform linux/amd64 ."
+      build_cmd = "docker buildx build -t #{image_name} --platform linux/amd64 #{build_args} ."
       puts build_cmd
       result = system(build_cmd)
 
@@ -316,6 +320,14 @@ module Pfab
       @application_yaml["name"]
     end
 
+    def build_args
+      args = @application_yaml["build_args"] || []
+      if args.any?
+        return args.map{|a| "--build-arg #{a}=#{a}"}.join(" ")
+      end
+      ""
+    end
+
     def container_repository
       @_container_repository ||= config["container.repository"]
     end

data/lib/pfab/templates/base.rb

@@ -63,6 +63,15 @@ module Pfab
         "#{@data['application']}.#{application_type}.#{@data['deployed_name']}"
       end
 
+      def env_from
+        env_from = []
+        env_from << @data.dig("application_yaml", :env_from)
+        env_from << @data.dig("application_yaml", @data["env"], :env_from)
+        env_from.flatten!
+        env_from.compact!
+        env_from.empty? ? nil : env_from
+      end
+
       def env_vars
         env_vars = { "DEPLOYED_NAME" => { value: @data['deployed_name'] },
                      "DEPLOY_ID" => { value: deploy_id },

data/lib/pfab/templates/cron.rb

@@ -60,6 +60,7 @@ module Pfab
                         name: @data['deployed_name'],
                         command: get_command,
                         env: env_vars,
+                        envFrom: env_from,
                         resources: resources,
                       },
                     ],

data/lib/pfab/templates/daemon.rb

@@ -56,6 +56,7 @@ module Pfab
                     name: @data['deployed_name'],
                     command: get_command,
                     env: env_vars,
+                    envFrom: env_from,
                     resources: resources,
                   }
                 ]

data/lib/pfab/templates/job.rb

@@ -51,6 +51,7 @@ module Pfab
                     name: @data['deployed_name'],
                     command: get_command,
                     env: env_vars,
+                    envFrom: env_from,
                     resources: resources,
                   },
                 ],

data/lib/pfab/templates/web.rb

@@ -250,6 +250,7 @@ module Pfab
                     name: @data['deployed_name'],
                     command: get_command,
                     env: env_vars,
+                    envFrom: env_from,
                     resources: resources,
                     ports: ports,
                     livenessProbe: livenessProbe,
@@ -257,7 +258,7 @@ module Pfab
                     startupProbe: startupProbe,
                     lifecycle: lifecycle,
                     volumeMounts: volume_mounts
-                  }
+                  }.compact
                 ],
                 volumes: volumes
               }.compact,

data/lib/pfab/version.rb

@@ -1,7 +1,7 @@
 module Pfab
   module Version
     MAJOR = 0
-    MINOR = 44
+    MINOR = 46
     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.44.0 ruby lib
+# stub: pfab 0.46.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.44.0"
+  s.version = "0.46.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 = "2023-08-11"
+  s.date = "2023-11-03"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -44,33 +44,19 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/prefab-cloud/pfab".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.3.7".freeze
+  s.rubygems_version = "3.4.6".freeze
   s.summary = "helper gem".freeze
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-  end
+  s.specification_version = 4
 
-  if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<commander>.freeze, [">= 0"])
-    s.add_runtime_dependency(%q<activesupport>.freeze, [">= 0"])
-    s.add_runtime_dependency(%q<pry-byebug>.freeze, [">= 0"])
-    s.add_runtime_dependency(%q<styled_yaml>.freeze, ["~> 0.0.1"])
-    s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-    s.add_development_dependency(%q<bundler>.freeze, ["~> 2.3"])
-    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
-    s.add_dependency(%q<commander>.freeze, [">= 0"])
-    s.add_dependency(%q<activesupport>.freeze, [">= 0"])
-    s.add_dependency(%q<pry-byebug>.freeze, [">= 0"])
-    s.add_dependency(%q<styled_yaml>.freeze, ["~> 0.0.1"])
-    s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-    s.add_dependency(%q<bundler>.freeze, ["~> 2.3"])
-    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
+  s.add_runtime_dependency(%q<commander>.freeze, [">= 0"])
+  s.add_runtime_dependency(%q<activesupport>.freeze, [">= 0"])
+  s.add_runtime_dependency(%q<pry-byebug>.freeze, [">= 0"])
+  s.add_runtime_dependency(%q<styled_yaml>.freeze, ["~> 0.0.1"])
+  s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+  s.add_development_dependency(%q<bundler>.freeze, ["~> 2.3"])
+  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"])
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.44.0
+  version: 0.46.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-11 00:00:00.000000000 Z
+date: 2023-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: helper gem