pfab 0.12.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44e68c756c9f6d131629ce9a8df02cd64f307deccc0ccd65c54d4333417ed51c
-  data.tar.gz: 605415a8325fb6c7e34857d87a0db498304e51620aeb8220d9102c9ecd5777fe
+  metadata.gz: b9b74403a3e35834fc91e161a00965bd13444cd6dc5f4189947e7a5e92168a29
+  data.tar.gz: fbac3572c2f5b0f59b20195fcdd77657b511f6af95d430fc8d71c23e7a079748
 SHA512:
-  metadata.gz: 4b909077e5797e562428f6de5d7715b934d935803dd0defa34a6ffada850dbd1e339ca6f4bd1ca22b3485141b4246f04e569591d23318c1343dcc4e2c691f132
-  data.tar.gz: 2ad2b3cf8d71b962d33626b5cd7af421d6a4bc3eddbe601a405a4e722fc95dd265094341c9dc6af491927bca83c48a0b757519c42bbbeb434da9b6008cdfeb11
+  metadata.gz: 01031a7a713ec836556fc3351c92955d46e67a6ed5dbdc73281fdb96b16d6aaa368a34b9fc61590d0f0aaa1cfcf13393e743b98a8cfc72c415f364b0f1e9f6ee
+  data.tar.gz: cc337ac58b41e94928356bfa846099f29546966da829799dd07d1661da308ca12e606b2ccfef2d9ebb6bfd8cfb98ecd96e65a37e5cf8ef77b0b7a3c49d714e7e

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:
@@ -114,8 +115,11 @@ 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.15.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/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
@@ -17,7 +21,8 @@ module Pfab
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
-            }
+            },
+            annotations: service_annotations,
           },
           spec: {
             selector: {
@@ -34,6 +39,12 @@ module Pfab
         }
       end
 
+      def service_annotations
+        h = {}
+        h["traefik.ingress.kubernetes.io/service.serversscheme"] = "h2c" if get("protocol") == "h2c"
+        h
+      end
+
       def ingress
         {
           apiVersion: "networking.k8s.io/v1",
@@ -49,12 +60,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 +86,14 @@ module Pfab
               paths: [
                 {
                   path: "/",
+                  pathType: "Prefix",
                   backend: {
-                    serviceName: @data['deployed_name'],
-                    servicePort: "http",
+                    service: {
+                      name: @data['deployed_name'],
+                      port: {
+                        name: "http"
+                      }
+                    }
                   },
                 },
               ],
@@ -82,8 +111,9 @@ 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
       end
 

data/lib/pfab/version.rb

@@ -1,7 +1,7 @@
 module Pfab
   module Version
     MAJOR = 0
-    MINOR = 12
+    MINOR = 16
     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.12.0 ruby lib
+# stub: pfab 0.16.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.12.0"
+  s.version = "0.16.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-12-06"
+  s.date = "2022-01-18"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
-    ".ruby-version",
     ".tool-versions",
     "Gemfile",
     "Gemfile.lock",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-06 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -132,7 +132,6 @@ extra_rdoc_files:
 - README.markdown
 files:
 - ".document"
-- ".ruby-version"
 - ".tool-versions"
 - Gemfile
 - Gemfile.lock

data/.ruby-version

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