pfab 0.14.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a53ce6280e22d0792b71639b4b591ee8521778d42ffb300ba68878849ab2b248
-  data.tar.gz: 6bbaa9903e186b835137679e8a7b2fe4d5d333c112488b12fce777453cbf9857
+  metadata.gz: c80def412f2a0527b88bb127543b59863ef43ef049a7b5192fd79f399a5ae706
+  data.tar.gz: 5176b0c7e1ab03193d6c174218b6cd37918831df6807441b966a9137afdacea8
 SHA512:
-  metadata.gz: 0f24d62c35b317c5d5b452a25f7dbafca3b696efc8ce6d669a579eb2765d1a71c3ae45dbb782053ffaa5e807892e00f906553c7f9247baedfe5fa4007cd32bcd
-  data.tar.gz: '029d7e10ba71749f79f8bedac4310dc8d8934ef1c16683c63988c7e3fabd780242828004a14668de5bc4c525bc0fd48c018b9eb8ef06abe27118b4175f270b2b'
+  metadata.gz: 564a5caf247097c151e13522a334568e6c7f9af3f61e1f38b3afe22c1ee0a25e4416219e1c176e52e7179ec496e67b10e454c4164172281966100c9d247eac40
+  data.tar.gz: cc624dbb446f95e5a619226bb15b53c42a7bec10131da87be5dc6cf6eb33cb962e06e512556136feb48805b17fad01e434274fb773681f1f0598bc73a3a4b294

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:
@@ -115,9 +116,10 @@ Releasing
 
 - modify version.rb
 - ```bundle exec rake gemspec```
+- ```git commit ```
 - ```bundle exec rake git:release```
 - ```bundle exec rake build```
-- ```gem push pkg/pfab-0.12.0.gem```
+- ```gem push pkg/pfab-0.15.0.gem```
 
 Copyright
 ---------

data/lib/pfab/cli.rb

@@ -209,11 +209,12 @@ module Pfab
 
       full_image_name = "#{container_repository}/#{image_name}:#{rev}"
 
-      cmd = "docker images -q #{full_image_name}"
+      # return 0 if image exists 1 if not
+      cmd = "docker manifest inspect #{full_image_name} > /dev/null ; echo $?"
       say "Looking for images with #{cmd}"
-      existing = `#{cmd}`
+      existing = `#{cmd}`.strip
 
-      if !existing.to_s.empty? && !force
+      if existing == "0" && !force
         say "Found image #{full_image_name} already, skipping prebuild, build & push"
         return true
       end
@@ -234,13 +235,23 @@ module Pfab
         end
       end
 
-      puts_and_system "docker build -t #{image_name} --platform amd64 ."
+      build_cmd = "docker build -t #{image_name} --platform amd64 ."
+      puts build_cmd
+      result = system(build_cmd)
 
-      puts_and_system "docker tag #{image_name}:latest #{image_name}:#{rev}"
-      puts_and_system "docker tag #{image_name}:#{rev} #{full_image_name}"
+      puts "Build Result #{result}"
+
+      if result
+        puts_and_system "docker tag #{image_name}:latest #{image_name}:#{rev}"
+        puts_and_system "docker tag #{image_name}:#{rev} #{full_image_name}"
+
+        puts_and_system "docker push #{container_repository}/#{image_name}:#{rev}"
+        return true
+      else
+        say "Build Did Not Succeed"
+        return false
+      end
 
-      puts_and_system "docker push #{container_repository}/#{image_name}:#{rev}"
-      return true
     end
 
     def yy
@@ -307,7 +318,7 @@ module Pfab
     def calculate_runnables(runnable_type)
       application = @application_yaml["name"]
       apps = {}
-      @application_yaml[runnable_type].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] = {

data/lib/pfab/templates/web.rb

@@ -21,7 +21,8 @@ module Pfab
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
-            }
+            },
+            annotations: service_annotations,
           },
           spec: {
             selector: {
@@ -38,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",
@@ -53,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,
@@ -91,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 = 14
+    MINOR = 17
     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.14.0 ruby lib
+# stub: pfab 0.16.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.14.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 = "2022-01-15"
+  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",
@@ -44,22 +43,31 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/prefab-cloud/pfab".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.2.32".freeze
+  s.rubygems_version = "3.0.3.1".freeze
   s.summary = "helper gem".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
-  end
 
-  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_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-    s.add_development_dependency(%q<bundler>.freeze, ["~> 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"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') 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_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>.freeze, ["~> 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
+      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<rdoc>.freeze, ["~> 3.12"])
+      s.add_dependency(%q<bundler>.freeze, ["~> 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
   else
     s.add_dependency(%q<commander>.freeze, [">= 0"])
     s.add_dependency(%q<activesupport>.freeze, [">= 0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-15 00:00:00.000000000 Z
+date: 2022-06-16 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