pfab 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c80def412f2a0527b88bb127543b59863ef43ef049a7b5192fd79f399a5ae706
-  data.tar.gz: 5176b0c7e1ab03193d6c174218b6cd37918831df6807441b966a9137afdacea8
+  metadata.gz: 39b274de173e627baf79bb67bceee55639a095a503709b3dc8b96076d6374e93
+  data.tar.gz: c94f1bce1be02fbe2158d6a1b51fede74379bf5a2234ec4fe53f08045d24171f
 SHA512:
-  metadata.gz: 564a5caf247097c151e13522a334568e6c7f9af3f61e1f38b3afe22c1ee0a25e4416219e1c176e52e7179ec496e67b10e454c4164172281966100c9d247eac40
-  data.tar.gz: cc624dbb446f95e5a619226bb15b53c42a7bec10131da87be5dc6cf6eb33cb962e06e512556136feb48805b17fad01e434274fb773681f1f0598bc73a3a4b294
+  metadata.gz: 9950a8bd021e9f1cbd2a41463a7a1a121e62d72b4841f0e798beb7b4788cb560b0b665aa5dc9d300031100efef71f9f466d257b67a6c35f4648bb010edc0d9cc
+  data.tar.gz: 632de04acb276119e836be46d479b10d32ae38598bd09497f5d1eb3aad95e3df4d8a3c1d9b5674ff60e287fcd4cd5ed10460a62d1590f245a8961b42744a3bf6

data/README.markdown

@@ -119,7 +119,7 @@ Releasing
 - ```git commit ```
 - ```bundle exec rake git:release```
 - ```bundle exec rake build```
-- ```gem push pkg/pfab-0.15.0.gem```
+- ```gem push pkg/pfab-0.12.0.gem```
 
 Copyright
 ---------

data/lib/pfab/cli.rb

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

data/lib/pfab/templates/web.rb

@@ -21,8 +21,7 @@ module Pfab
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
-            },
-            annotations: service_annotations,
+            }
           },
           spec: {
             selector: {
@@ -39,12 +38,6 @@ 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",
@@ -114,6 +107,7 @@ module Pfab
           "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 = 17
+    MINOR = 18
     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.16.0 ruby lib
+# stub: pfab 0.18.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.16.0"
+  s.version = "0.18.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-18"
+  s.date = "2022-07-16"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-16 00:00:00.000000000 Z
+date: 2022-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander