pfab 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1db6c13d2a16691762f10d9a2fc0c835d9d0283019cd04ebba830c02e08f4c09
-  data.tar.gz: eaeec7721e636ddd56aff43dcdcb63c551265a949e8752cfbe65f8900a6fa314
+  metadata.gz: 36192c1d9882ed963296259ea22a27a4ffe2a91383cf655aa1392e301034513e
+  data.tar.gz: 7c5a42aea011a6a4e0ce8b18c50a01a7b309921c7186ee47449c336fe077a99e
 SHA512:
-  metadata.gz: 74223dfa577bdfd69b2ae01e3b5319b60a2f0305f080a23ae112f2eb3a63315b5249174834c8b519549cd9a8806dc06bc5ae947548e7c6d9046eebc5cb092bae
-  data.tar.gz: 827157bcaf656877fa2788704bc55e0a057baaf762831af1ec6bf9b61e396d6ca4ce815b7bb271784eec8e94cc462ec8ab6c1f0f005ef252e3c86d49dc098575
+  metadata.gz: 878bcbc12941d77f2d7cad35a2568afc194171c33239c6b3565abf2c506754a896fcffc3043e78a90cf3e4cfadf000ee22138ddb88c0069db81e1d5ea30152eb
+  data.tar.gz: 6d7465ce4a0b3854cd814ad1069e834a1487d5399d6d2b0a6cae50747c27a24fe0904cae581240863ee9c981bb63ff98e2397557fa0a175d29ef0707f95f790a

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/pfab.rb

@@ -2,6 +2,7 @@ require "pfab/cli"
 require "pfab/yamls"
 require "pfab/templates/base"
 require "pfab/templates/job"
+require "pfab/templates/daemon"
 require "pfab/templates/web"
 
 module Pfab

data/lib/pfab/cli.rb

@@ -122,9 +122,27 @@ module Pfab
     end
 
     def cmd_build(force: false)
-
       rev = get_current_sha
       say "This repo is at rev: #{rev}"
+      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}"
+      end
+
+      prebuild = @application_yaml["prebuild"]
+      if prebuild.empty?
+        say "No prebuild task"
+      else
+        say "Prebuild, running system(#{prebuild})"
+        result = system(prebuild)
+        if result
+          notify_ok 'Pfab prebuild success'
+        else
+          say "Pfab prebuild did not return success. Exiting"
+          return false
+        end
+      end
 
       full_image_name = "#{container_repository}/#{image_name}:#{rev}"
 
@@ -154,7 +172,7 @@ module Pfab
                                        env: $env,
                                        sha: get_current_sha,
                                        image_name: image_name,
-                                       container_repository: container_repository
+                                       config: config
       )
       puts "Generated #{wrote}"
     end

data/lib/pfab/templates/base.rb

@@ -14,7 +14,33 @@ module Pfab
       end
 
       def get(key)
-        app_vars[@data["env"]][key] || app_vars[key]
+        app_vars.dig(@data["env"], key) || app_vars[key]
+      end
+
+
+      def cpu(req_type)
+        default_cpu_string = @data["config"]["default_cpu_string"] || "50m/250m"
+        (request, limit) = (get("cpu") || default_cpu_string).split("/")
+        req_type == :limit ? limit : request
+      end
+
+      def memory(req_type)
+        default_memory_string = @data["config"]["default_memory_string"] || "256Mi/500Mi"
+        (request, limit) = (get("memory") || default_memory_string).split("/")
+        req_type == :limit ? limit : request
+      end
+
+      def resources
+        {
+          requests: {
+            cpu: cpu(:request),
+            memory: memory(:request),
+          },
+          limits: {
+            cpu: cpu(:limit),
+            memory: memory(:limit),
+          }
+        }
       end
 
       def env_vars

data/lib/pfab/templates/daemon.rb

@@ -0,0 +1,57 @@
+module Pfab
+  module Templates
+    class Daemon < Base
+      def write_to(f)
+        f << YAML.dump(deployment.deep_stringify_keys)
+      end
+
+      def deployment
+        {
+          kind: "Deployment",
+          apiVersion: "extensions/v1beta1",
+          metadata: {
+            name: @data['deployed_name'],
+            namespace: @data['env'],
+            labels: {
+              application: @data['application'],
+              "deployed-name" => @data['deployed_name'],
+              "application-type" => "daemon",
+            }
+          },
+          spec: {
+            replicas: get("replicas") || 1,
+            selector: {
+              matchLabels: {
+                "deployed-name" => @data['deployed_name'],
+              },
+            },
+            strategy: {
+              type: "Recreate"
+            },
+            revisionHistoryLimit: 5,
+            template: {
+              metadata: {
+                labels: {
+                  application: @data['application'],
+                  "deployed-name" => @data['deployed_name'],
+                  "application-type" => "daemon",
+                },
+              },
+              spec: {
+                containers: [
+                  {
+                    image: image_name,
+                    name: @data['deployed_name'],
+                    command: get("command").split(" "),
+                    env: env_vars,
+                    resources: resources,
+                  }
+                ]
+              },
+            },
+          },
+        }
+      end
+    end
+  end
+end

data/lib/pfab/templates/job.rb

@@ -36,16 +36,7 @@ module Pfab
                     name: @data['deployed_name'],
                     command: app_vars["command"].split(" "),
                     env: env_vars,
-                    resources: {
-                      requests: {
-                        cpu: @data["cpu"] || "50m",
-                        memory: @data["memory"] || "256Mi",
-                      },
-                      limits: {
-                        cpu: @data["cpu"] || "250m",
-                        memory: @data["memory"] || "256Mi",
-                      },
-                    },
+                    resources: resources,
                   },
                 ],
                 restartPolicy: "Never",

data/lib/pfab/templates/web.rb

@@ -57,7 +57,7 @@ module Pfab
                       path: "/",
                       backend: {
                         serviceName: @data['deployed_name'],
-                        servicePort: "http",
+                        servicePort: get("service_port") || "http",
                       },
                     },
                   ],
@@ -124,16 +124,7 @@ module Pfab
                     name: @data['deployed_name'],
                     command: get("command").split(" "),
                     env: env_vars,
-                    resources: {
-                      requests: {
-                        cpu: @data["cpu"] || "50m",
-                        memory: @data["memory"] || "256Mi",
-                      },
-                      limits: {
-                        cpu: @data["cpu"] || "250m",
-                        memory: @data["memory"] || "256Mi",
-                      },
-                    },
+                    resources: resources,
                     livenessProbe: {
                       httpGet: {
                         path: get("health_check_path") || "/",

data/lib/pfab/yamls.rb

@@ -1,7 +1,7 @@
 require 'pry'
 module Pfab
   class Yamls
-    def self.generate_for(apps:, application_yaml:, image_name:, env:, sha:, container_repository:)
+    def self.generate_for(apps:, application_yaml:, image_name:, env:, sha:, config:)
 
       apps.each do |app, props|
         puts app
@@ -10,7 +10,8 @@ module Pfab
           "env" => env.to_s,
           'image_name' => image_name,
           'sha' => sha,
-          'container_repository' => container_repository,
+          'container_repository' => config["container.repository"],
+          'config' => config,
           'props' => props,
           'deployed_name' => app,
           'application' => application_yaml["name"],
@@ -23,6 +24,8 @@ module Pfab
             processed = Pfab::Templates::Web.new(data).write_to(f)
           when "job" then
             processed = Pfab::Templates::Job.new(data).write_to(f)
+          when "daemon" then
+            processed = Pfab::Templates::Daemon.new(data).write_to(f)
           end
         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.2.0 ruby lib
+# stub: pfab 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.2.0"
+  s.version = "0.3.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-29"
+  s.date = "2018-12-31"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "lib/pfab.rb",
     "lib/pfab/cli.rb",
     "lib/pfab/templates/base.rb",
+    "lib/pfab/templates/daemon.rb",
     "lib/pfab/templates/job.rb",
     "lib/pfab/templates/web.rb",
     "lib/pfab/yamls.rb",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-29 00:00:00.000000000 Z
+date: 2018-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -143,6 +143,7 @@ files:
 - lib/pfab.rb
 - lib/pfab/cli.rb
 - lib/pfab/templates/base.rb
+- lib/pfab/templates/daemon.rb
 - lib/pfab/templates/job.rb
 - lib/pfab/templates/web.rb
 - lib/pfab/yamls.rb