pfab 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9979c3fb7ac0f07322332db1eb53e54b510b3f28adca771c7a2a51f27696c14
-  data.tar.gz: e468d799e0c4547835dcfe7b261515f890728c5f1b00f2023522bd5871a5bd38
+  metadata.gz: d731b1aced5361202684f5f3f782ff6846816818499c0d8ce4892cbcb728661d
+  data.tar.gz: 147ae1a483a6a980b138070ffe858ddea9b0bcca8bd86fc311c63d7693bc39a3
 SHA512:
-  metadata.gz: afb107189bd11eaac4f8c11cf127c21b163e3c97bb397692375b4bcfee69071b6b476312a49309c079bfd2fee1dda69fe061a8d835b6e23526f31d732022506f
-  data.tar.gz: fadaf09dd358eeb636b6e1ba12cca060933b98f7c32b3a8ab697b7f62ae1c27382a2454a21881bb51882205bdc958710f2dd2593bd3604a7debfdfe0dde84207
+  metadata.gz: c520165411f2fe9023385c896677032c3decd4552209b9e5fab5af6c852b82bac357bb3fe07bd34bb9a02c05990de193b2101e45f2379b7c32dcd3d7dfa8953c
+  data.tar.gz: f963ee37ca9fcaac8f57b6be715b6d06fbe4ebed20ce06ba6fc768d338cf8f231c7f39f13ddbfc242345f169171aa94786e7eec1b42ac038019e96cf313c1e23

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/pfab.rb

@@ -4,6 +4,7 @@ require "pfab/templates/base"
 require "pfab/templates/job"
 require "pfab/templates/daemon"
 require "pfab/templates/web"
+require "pfab/templates/cron"
 
 module Pfab
 end

data/lib/pfab/cli.rb

@@ -18,8 +18,9 @@ module Pfab
       else
         raise "I need to be run in a directory with a application.yaml"
       end
-
       global_option("--verbose") { $verbose = true }
+      $dryrun = false
+      global_option("--dryrun") { $dryrun = true }
       $env = :staging
       global_option("-p") { $env = :production }
       global_option("-a", "--application_name APP_NAME", "run without prompting for app") do |app_name|
@@ -56,6 +57,8 @@ module Pfab
         c.syntax = "pfab shipit"
         c.summary = "build, generate, apply"
         c.action do
+          app_name = get_app_name(all: true)
+          puts "Shipping #{app_name}"
           success = cmd_build
           if success
             cmd_generate_yaml
@@ -82,6 +85,24 @@ module Pfab
         end
       end
 
+      command :exec do |c|
+        c.syntax = "pfab exec"
+        c.summary = "kubectl exec into a  pod"
+        c.description = "CLI to the Cloud"
+        c.example "exec into the first pod in staging",
+                  "pfab exec"
+        c.example "exec into the first pod in production",
+                  "ezp -p exec"
+        c.action do
+          set_kube_context
+          app_name = get_app_name
+
+          first_pod = get_first_pod app_name
+
+          puts_and_system "kubectl exec -it #{first_pod} -- /bin/bash"
+        end
+      end
+
       command :status do |c|
         c.syntax = "pfab status"
         c.summary = "status of an app"
@@ -119,9 +140,10 @@ module Pfab
 
     def cmd_apply
       set_kube_context
-      app_name = get_app_name
-      puts_and_system("kubectl apply -f .application-k8s-#{$env}-#{app_name}.yaml")
-      puts_and_system("git tag release-#{$env}-#{app_name}-#{Time.now.strftime("%Y-%m-%d")} HEAD")
+      get_apps.each do |app_name|
+        puts_and_system("kubectl apply -f .application-k8s-#{$env}-#{app_name}.yaml")
+        puts_and_system("git tag release-#{$env}-#{app_name}-#{Time.now.strftime("%Y-%m-%d-%H-%M-%S")} HEAD")
+      end
     end
 
     def cmd_build(force: false)
@@ -151,7 +173,7 @@ module Pfab
 
       say "No image #{full_image_name} present, building"
 
-      prebuild = @application_yaml["prebuild"]
+      prebuild = @application_yaml["prebuild"] || ""
       if prebuild.empty?
         say "No prebuild task"
       else
@@ -208,7 +230,11 @@ module Pfab
 
     def puts_and_system cmd
       puts cmd
-      system cmd
+      if $dryrun
+        puts "dry run, didn't run that"
+      else
+        system cmd
+      end
     end
 
     def apps
@@ -245,9 +271,16 @@ module Pfab
       JSON.parse(pods_str)
     end
 
-    def get_app_name
+    def get_app_name(all: false)
       return $app_name unless $app_name.nil?
-      choose("which app?", *@apps.keys)
+      apps = @apps.keys
+      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]
     end
   end
 end

data/lib/pfab/templates/base.rb

@@ -47,13 +47,8 @@ module Pfab
 
         env_vars = [
           { name: "DEPLOYED_NAME", value: @data['deployed_name'] },
-          { name: "DOGSTATSD_HOST_IP",
-            valueFrom: {
-              fieldRef: { fieldPath: "status.hostIP" }
-            }
-          },
         ]
-        
+
         load_env_vars(env_vars, @data["application_yaml"][:environment])
         load_env_vars(env_vars, @data["application_yaml"][@data["env"]][:environment])
 
@@ -65,7 +60,15 @@ module Pfab
 
       def load_env_vars(env_vars, hash)
         (hash || {}).each do |env_var_name, v|
-          env_vars << { name: env_var_name, value: v }
+          if v.start_with? "field/"
+            (_, field_name) = v.split("/")
+            env_vars << { name: env_var_name, valueFrom: {
+              fieldRef: { fieldPath: field_name }
+            } }
+          else
+            env_vars << { name: env_var_name, value: v }
+          end
+
         end
       end
 

data/lib/pfab/templates/cron.rb

@@ -0,0 +1,64 @@
+module Pfab
+  module Templates
+    class Cron < Base
+      def write_to(f)
+        f << YAML.dump(job.deep_stringify_keys)
+      end
+
+      def job
+        {
+          apiVersion: "batch/v1beta1",
+          kind: "CronJob",
+          metadata: {
+            name: "#{@data['deployed_name']}-#{@data['sha']}",
+            namespace: @data['env'],
+            labels: {
+              application: @data['application'],
+              "deployed-name" => @data['deployed_name'],
+              "application-type" => "job",
+            }
+          },
+          spec: {
+            schedule: get("schedule"),
+            jobTemplate: {
+              metadata: {
+                name: "#{@data['deployed_name']}-#{@data['sha']}",
+                namespace: @data['env'],
+                labels: {
+                  application: @data['application'],
+                  "deployed-name" => @data['deployed_name'],
+                  "application-type" => "cron",
+                },
+              },
+              spec: {
+                template: {
+                  metadata: {
+                    labels: {
+                      application: @data['application'],
+                      "deployed-name" => @data['deployed_name'],
+                      "application-type" => "cron",
+                    },
+                  },
+                  spec: {
+
+                    containers: [
+                      {
+                        image: image_name,
+                        name: @data['deployed_name'],
+                        command: app_vars["command"].split(" "),
+                        env: env_vars,
+                        resources: resources,
+                      },
+                    ],
+                    restartPolicy: "Never",
+                  },
+                },
+                backoffLimit: 2,
+              },
+            },
+          },
+        }
+      end
+    end
+  end
+end

data/lib/pfab/templates/web.rb

@@ -88,7 +88,7 @@ module Pfab
             path: get("health_check_path") || "/",
             port: get("port"),
           },
-          initialDelaySeconds: 5,
+          initialDelaySeconds: 15,
         }
       end
 

data/lib/pfab/yamls.rb

@@ -27,6 +27,8 @@ module Pfab
             processed = Pfab::Templates::Job.new(data).write_to(f)
           when "daemon" then
             processed = Pfab::Templates::Daemon.new(data).write_to(f)
+          when "cron" then
+            processed = Pfab::Templates::Cron.new(data).write_to(f)
           end
         end
         filename

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.5.0 ruby lib
+# stub: pfab 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.5.0"
+  s.version = "0.6.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 = "2019-01-03"
+  s.date = "2019-01-08"
   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/cron.rb",
     "lib/pfab/templates/daemon.rb",
     "lib/pfab/templates/job.rb",
     "lib/pfab/templates/web.rb",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-03 00:00:00.000000000 Z
+date: 2019-01-08 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/cron.rb
 - lib/pfab/templates/daemon.rb
 - lib/pfab/templates/job.rb
 - lib/pfab/templates/web.rb