pfab 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36192c1d9882ed963296259ea22a27a4ffe2a91383cf655aa1392e301034513e
-  data.tar.gz: 7c5a42aea011a6a4e0ce8b18c50a01a7b309921c7186ee47449c336fe077a99e
+  metadata.gz: 1d4e0472a9112fb68a842a98bc1851ae7acca8d6f89d18f383b1c0f51e1dfda9
+  data.tar.gz: f2b5a687241dd245a670bc2511478e260e9cfd258e77286dd996111ecc38995a
 SHA512:
-  metadata.gz: 878bcbc12941d77f2d7cad35a2568afc194171c33239c6b3565abf2c506754a896fcffc3043e78a90cf3e4cfadf000ee22138ddb88c0069db81e1d5ea30152eb
-  data.tar.gz: 6d7465ce4a0b3854cd814ad1069e834a1487d5399d6d2b0a6cae50747c27a24fe0904cae581240863ee9c981bb63ff98e2397557fa0a175d29ef0707f95f790a
+  metadata.gz: fb23d0a2422d5e9017eed252a475dff9ec48a5e66726b2e10011db46c21b30c5422856169b80aa3bee5eec55202f10a338202cfac1f90700ad8fffcc2b02a13c
+  data.tar.gz: e4039db2b30cf27f472b408ee9e8f41bc2fd68fa8464ef0b0b1e27ad187cd8ab01d0feb9b7371cbad180568e903ced20785b62c842bed5c5f2d2ab184620ff9a

data/README.markdown

@@ -7,6 +7,8 @@ nothing to see here
 set ~/.pfab.yaml
 ```
 container.repository: "gcr.io/$$$$$$$"
+default_cpu_string: "50m/250m"
+default_memory_string: "256Mi/500Mi"
 envs: 
   staging:
     context: "k8s-staging-context"

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/pfab/cli.rb

@@ -56,9 +56,11 @@ module Pfab
         c.syntax = "pfab shipit"
         c.summary = "build, generate, apply"
         c.action do
-          cmd_build
-          cmd_generate_yaml
-          cmd_apply
+          success = cmd_build
+          if success
+            cmd_generate_yaml
+            cmd_apply
+          end
         end
       end
 
@@ -127,7 +129,12 @@ module Pfab
       uncommitted_changes = `git diff-index HEAD --`.empty?
       if uncommitted_changes
         say "FYI! There are uncommitted changes."
-        say "carrying on and pushing local code to #{rev}"
+        continue = agree("Continue anyway?")
+        if continue
+          say "carrying on and pushing local code to #{rev}"
+        else
+          return false
+        end
       end
 
       prebuild = @application_yaml["prebuild"]
@@ -137,7 +144,7 @@ module Pfab
         say "Prebuild, running system(#{prebuild})"
         result = system(prebuild)
         if result
-          notify_ok 'Pfab prebuild success'
+          say 'Pfab prebuild success'
         else
           say "Pfab prebuild did not return success. Exiting"
           return false

data/lib/pfab/templates/web.rb

@@ -27,7 +27,7 @@ module Pfab
               {
                 name: "http",
                 port: 80,
-                targetPort: 3000,
+                targetPort: get("port"),
               }
             ]
           }
@@ -57,7 +57,7 @@ module Pfab
                       path: "/",
                       backend: {
                         serviceName: @data['deployed_name'],
-                        servicePort: get("service_port") || "http",
+                        servicePort: "http",
                       },
                     },
                   ],
@@ -69,15 +69,35 @@ module Pfab
       end
 
       def ingress_annotations
-        {
+        h = {
           "kubernetes.io/ingress.class" => "traefik",
           "traefik.frontend.passHostHeader" => "false",
           "traefik.frontend.priority" => "1",
           "traefik.frontend.entryPoints" => "https",
-          "traefik.protocol" => "http",
+          "traefik.protocol" => get("protocol") || "http",
           "traefik.frontend.headers.SSLRedirect" => "true",
           "traefik.docker.network" => "traefik",
         }
+        h["ingress.kubernetes.io/protocol"] = "h2c" if get("protocol") == "h2c"
+        h
+      end
+
+      def default_probe
+        {
+          httpGet: {
+            path: get("health_check_path") || "/",
+            port: get("port"),
+          },
+          initialDelaySeconds: 5,
+        }
+      end
+
+      def livenessProbe
+        get("livenessProbe") || default_probe
+      end
+
+      def readinessProbe
+        get("readinessProbe") || default_probe
       end
 
       def deployment
@@ -125,20 +145,8 @@ module Pfab
                     command: get("command").split(" "),
                     env: env_vars,
                     resources: resources,
-                    livenessProbe: {
-                      httpGet: {
-                        path: get("health_check_path") || "/",
-                        port: get("port"),
-                      },
-                      initialDelaySeconds: 5,
-                    },
-                    readinessProbe: {
-                      httpGet: {
-                        path: get("health_check_path") || "/",
-                        port: get("port"),
-                      },
-                      initialDelaySeconds: 5,
-                    },
+                    livenessProbe: livenessProbe,
+                    readinessProbe: readinessProbe,
                   }
                 ]
               },

data/lib/pfab/yamls.rb

@@ -3,7 +3,7 @@ module Pfab
   class Yamls
     def self.generate_for(apps:, application_yaml:, image_name:, env:, sha:, config:)
 
-      apps.each do |app, props|
+      apps.map do |app, props|
         puts app
 
         data = {
@@ -18,7 +18,8 @@ module Pfab
           'application_yaml' => application_yaml
         }
 
-        File.open(".application-k8s-#{env}-#{app}.yaml", "w") do |f|
+        filename = ".application-k8s-#{env}-#{app}.yaml"
+        File.open(filename, "w") do |f|
           case props[:deployable_type]
           when "web" then
             processed = Pfab::Templates::Web.new(data).write_to(f)
@@ -28,6 +29,7 @@ module Pfab
             processed = Pfab::Templates::Daemon.new(data).write_to(f)
           end
         end
+        filename
       end
 
     end

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.3.0 ruby lib
+# stub: pfab 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.3.0"
+  s.version = "0.4.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 = "2018-12-31"
+  s.date = "2019-01-02"
   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.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-31 00:00:00.000000000 Z
+date: 2019-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander