pfab 0.11.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86a0173094dded1e5b572b11593274b17abcfa2f29e7aac04977918af2d5674c
-  data.tar.gz: 3e189a70dc5126e40f8e81e13f84872964e35b06561251c6e260efa42a517de2
+  metadata.gz: f44e4e52088b70f22abb23eadd83fcc6aaeb2425ff364f09e575bf4f129836a2
+  data.tar.gz: 345422cee58debfccf961a6658f48064735d045446ce671685313a17abe4290c
 SHA512:
-  metadata.gz: '09b0ce9accab6e86643d1dff636a84c0b6aa077d1309ff82867fa3e7125255bdb60fa2639a74766d2575b239ea8cb8933ec7ac94f6659d0ce55336aca59704d0'
-  data.tar.gz: 67427d6c7818d428945a36736cb45ac024967ccacd189087a3146f2458f85e12316e2e9e7497c1801d65bbae70055480c8e7a22a30f9aeb2d190f3a998456446
+  metadata.gz: 0e3fba3155e96609eea6edb3483a2a4980aacfbbb05df8cb2f5f6ef10b1ff31bb02563ed0e03e960c7c593f93590239e381352ba612c0e79279770bc841c0e49
+  data.tar.gz: 6bb77697b5a49f4e13aadc08b48b64c8529a7864a68c3f7f8758493e2371743e30a6cc294660038651624e7d271783670c1a58e6bad1dde09c9f91f8951a787c

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

@@ -40,6 +40,7 @@ deployables:
     type: web
     port: 8443
     protocol: h2c # tell traefik this is going to be http2
+    tls_cert_secret: my-tls-secret
     command: java -Xmx550m -javaagent:/app/dd-java-agent.jar -jar myjar.jar server /app/grpc.yml
     readinessProbe:
       exec:
@@ -100,12 +101,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
-- ```rake gemspec:release```
-- ```rake gemcutter:release```
+- ```bundle exec rake gemspec```
+- ```git commit ```
+- ```bundle exec rake git:release```
+- ```bundle exec rake build```
+- ```gem push pkg/pfab-0.12.0.gem```
 
 Copyright
 ---------

data/lib/pfab/cli.rb

@@ -27,8 +27,6 @@ module Pfab
         $app_name = app_name
       end
 
-      @apps = apps
-
       command :build do |c|
         c.syntax = "pfab build"
         c.summary = "build image"
@@ -142,14 +140,14 @@ module Pfab
         c.option "-c", "--command COMMAND", "Run a command with the ENV vars of the selected app"
         c.action do |_args, options|
           $env = :development
-          app_name = get_app_name
+          app_name = get_app_name(include_run_locals: true)
           puts "RUNNING THE FOLLOWING LOCALLY"
 
           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(" ")
-          options.default command: @apps[app_name][:command]
+          options.default command: all_runnables[app_name][:command]
 
           puts_and_system "#{env_var_string} #{options.command}"
         end
@@ -182,11 +180,10 @@ module Pfab
       run!
     end
 
-
     def cmd_apply
       set_kube_context
       get_apps.each do |app_name|
-        app = @apps[app_name]
+        app = deployables[app_name]
         if app[:deployable_type] == "cron"
           deployed_name = deployed_name(app)
           puts_and_system("kubectl delete cronjob -l deployed-name=#{deployed_name}")
@@ -237,7 +234,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}"
@@ -247,7 +244,7 @@ module Pfab
     end
 
     def yy
-      Pfab::Yamls.new(apps: @apps,
+      Pfab::Yamls.new(apps: all_runnables,
                       application_yaml: @application_yaml,
                       env: $env,
                       sha: get_current_sha,
@@ -257,7 +254,7 @@ module Pfab
     end
 
     def cmd_generate_yaml
-      wrote = yy.generate_all
+      wrote = yy.generate(deployables.keys)
       puts "Generated #{wrote}"
     end
 
@@ -295,14 +292,22 @@ module Pfab
       end
     end
 
-    def apps
-      @_apps ||= calculate_apps
+    def deployables
+      @_deployables ||= calculate_runnables("deployables")
+    end
+
+    def run_locals
+      @_rl ||= calculate_runnables("run_locals")
+    end
+
+    def all_runnables
+      deployables.merge(run_locals)
     end
 
-    def calculate_apps
+    def calculate_runnables(runnable_type)
       application = @application_yaml["name"]
       apps = {}
-      @application_yaml["deployables"].each do |deployable, dep|
+      (@application_yaml[runnable_type] || []).each do |deployable, dep|
         deployable_type = dep["type"]
         app_name = [application, deployable_type, deployable].join("-")
         apps[app_name] = {
@@ -329,16 +334,17 @@ module Pfab
       JSON.parse(pods_str)
     end
 
-    def get_app_name(all: false)
+    def get_app_name(all: false, include_run_locals: false)
       return $app_name unless $app_name.nil?
-      apps = @apps.keys
+      apps = deployables.keys
+      apps.concat(run_locals.keys) if include_run_locals
       apps << "all" if all
       $app_name = choose("which app?", *apps)
     end
 
     def get_apps
       name = get_app_name(all: true)
-      (name == "all") ? @apps.keys : [name]
+      (name == "all") ? deployables.keys : [name]
     end
   end
 end

data/lib/pfab/templates/base.rb

@@ -43,7 +43,7 @@ module Pfab
       end
 
       def env_vars
-        env_vars = { "DEPLOYED_NAME": { value: @data['deployed_name'] } }
+        env_vars = { "DEPLOYED_NAME" => { value: @data['deployed_name'] } }
 
         # load defaults
         load_env_vars(env_vars, @data.dig("application_yaml", :environment))

data/lib/pfab/templates/web.rb

@@ -2,9 +2,13 @@ module Pfab
   module Templates
     class Web < Base
       def write_to(f)
-        f << YAML.dump(service.deep_stringify_keys)
-        f << YAML.dump(ingress.deep_stringify_keys)
-        f << YAML.dump(deployment.deep_stringify_keys)
+        if get("host").nil?
+          puts "No host to deploy to for #{@data['deployed_name']}. Skipping."
+        else
+          f << YAML.dump(service.deep_stringify_keys)
+          f << YAML.dump(ingress.deep_stringify_keys)
+          f << YAML.dump(deployment.deep_stringify_keys)
+        end
       end
 
       def service
@@ -49,12 +53,25 @@ module Pfab
           },
           spec: {
             rules: rules,
+            tls: tls_hosts
           },
         }
       end
 
+      def tls_hosts
+        hosts.map do |host|
+          {
+            hosts: [host],
+            secretName: get("tls_cert_secret")
+          }
+        end
+      end
+
+      def hosts
+        get("host").split(",")
+      end
+
       def rules
-        hosts = get("host").split(",")
         hosts.map do |host|
           {
             host: host,
@@ -62,9 +79,14 @@ module Pfab
               paths: [
                 {
                   path: "/",
+                  pathType: "Prefix",
                   backend: {
-                    serviceName: @data['deployed_name'],
-                    servicePort: "http",
+                    service: {
+                      name: @data['deployed_name'],
+                      port: {
+                        name: "http"
+                      }
+                    }
                   },
                 },
               ],
@@ -82,6 +104,8 @@ module Pfab
           "traefik.protocol" => get("protocol") || "http",
           "traefik.frontend.headers.SSLRedirect" => "true",
           "traefik.docker.network" => "traefik",
+          "traefik.ingress.kubernetes.io/router.entrypoints" => "websecure",
+          "traefik.ingress.kubernetes.io/router.tls" => "true"
         }
         h["ingress.kubernetes.io/protocol"] = "h2c" if get("protocol") == "h2c"
         h

data/lib/pfab/version.rb

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

data/lib/pfab/yamls.rb

@@ -27,13 +27,13 @@ module Pfab
       data
     end
 
-    def generate_all
+    def generate(keys)
 
-      @apps.map do |app, props|
+      keys.each do |key|
+        props = @apps[key]
+        data = data_for(key, props)
 
-        data = data_for(app, props)
-
-        filename = ".application-k8s-#{data["env"]}-#{app}.yaml"
+        filename = ".application-k8s-#{data["env"]}-#{key}.yaml"
         File.open(filename, "w") do |f|
           case props[:deployable_type]
           when "web" then

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.11.0 ruby lib
+# stub: pfab 0.15.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.11.0"
+  s.version = "0.15.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-11-30"
+  s.date = "2022-01-18"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
-    ".ruby-version",
+    ".tool-versions",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -43,7 +43,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.11.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-30 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -132,7 +132,7 @@ extra_rdoc_files:
 - README.markdown
 files:
 - ".document"
-- ".ruby-version"
+- ".tool-versions"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -170,8 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3.1
 signing_key:
 specification_version: 4
 summary: helper gem

data/.ruby-version

@@ -1 +0,0 @@
-2.5.3