kubes 0.5.0 → 0.6.3

data/lib/kubes/compiler/strategy.rb

@@ -16,12 +16,13 @@ class Kubes::Compiler
     end
 
     def strategy_class
-      ext = File.extname(@path)
-      case ext
-      when '.rb'   then Dsl
-      when '.yaml','.yml' then Erb
-      else Pass
-      end
+      ext = File.extname(@path).sub('.','').to_sym
+      map = {
+        rb: Dsl,
+        yaml: Erb,
+        yml: Erb,
+      }
+      map[ext]
     end
   end
 end

data/lib/kubes/compiler/strategy/base.rb

@@ -1,13 +1,70 @@
 class Kubes::Compiler::Strategy
   class Base
-    include Kubes::Logging
+    include Kubes::Compiler::Layering
+    include Kubes::Compiler::Util::Normalize
     include Kubes::Compiler::Util::SaveFile
-    include Kubes::Compiler::Shared::CustomHelpers
+    include Kubes::Logging
 
     def initialize(options={})
       @options = options
       @path = options[:path]
       @save_file = save_file(@path)
+      @data = @options[:data] || {}
+    end
+
+    def run
+      render_files(pre_layers)
+      render(@path) # main resource definition
+      render_files(post_layers)
+
+      Result.new(@save_file, @data)
+    end
+
+    def render_files(paths)
+      paths.each do |path|
+        next unless File.exist?(path) # layers may not exist
+        render(path)
+      end
+    end
+
+    # render and merge
+    def render(path)
+      result = render_strategy(path)
+      if result.is_a?(Kubes::Compiler::Dsl::Core::Blocks)
+        result = result.results
+      end
+      @data.deeper_merge!(result)
+    end
+
+    # Delegate to Dsl or Erb strategy again and pass @data down to allow rendering of a mix of yaml and rb files.
+    def render_strategy(path)
+      if path.include?('.rb')
+        dsl_class.new(@options.merge(path: path, data: @data)).run
+      else
+        Erb.new(@options.merge(data: @data)).render_result(path)
+      end
+    end
+
+    # Must be defined here in case coming from Kubes::Compiler::Strategy::Erb#render_strategy
+    def dsl_class
+      if block_form?
+        Kubes::Compiler::Dsl::Core::Blocks
+      else
+        syntax_class
+      end
+    end
+
+    def syntax_class
+      klass_name = normalize_kind(@save_file) # IE: @save_file: web/service.yaml
+      "Kubes::Compiler::Dsl::Syntax::#{klass_name}".constantize
+    rescue NameError
+      logger.debug "Using default resource for: #{klass_name}"
+      Kubes::Compiler::Dsl::Syntax::Resource # default
+    end
+
+    def block_form?
+      type = extract_type(@save_file)
+      type.pluralize == type
     end
   end
 end

data/lib/kubes/compiler/strategy/dsl.rb

@@ -1,33 +1,4 @@
 class Kubes::Compiler::Strategy
   class Dsl < Base
-    include Kubes::Compiler::Util::Normalize
-
-    def run
-      load_custom_helpers
-      dsl = dsl_class.new(@options) # Deployment, Service, etc
-      data = dsl.run
-      Result.new(@save_file, data)
-    end
-
-    def dsl_class
-      if block_form?
-        Kubes::Compiler::Dsl::Core::Blocks
-      else
-        syntax_class
-      end
-    end
-
-    def syntax_class
-      klass_name = normalize_kind(@save_file)
-      "Kubes::Compiler::Dsl::Syntax::#{klass_name}".constantize
-    rescue NameError
-      logger.debug "Using default resource for: #{klass_name}"
-      Kubes::Compiler::Dsl::Syntax::Resource # default
-    end
-
-    def block_form?
-      type = extract_type(@save_file)
-      type.pluralize == type
-    end
   end
 end

data/lib/kubes/compiler/strategy/erb.rb

@@ -4,31 +4,19 @@ class Kubes::Compiler::Strategy
   class Erb < Base
     extend Kubes::Compiler::Dsl::Core::Fields
     include Kubes::Compiler::Dsl::Core::Helpers
+    include Kubes::Compiler::Layering
     include Kubes::Compiler::Shared::CustomHelpers
+    include Kubes::Compiler::Shared::CustomVariables
     include Kubes::Compiler::Shared::Helpers
-    include Kubes::Compiler::Layering
-
-    def run
+    include Kubes::Compiler::Shared::PluginHelpers
+
+    def initialize(options={})
+      super
+      # For ERB scope is in this same Strategy::Erb class
+      # For DSL scope is within the each for the Resource classes. IE: kubes/compile/dsl/core/base.rb
+      load_plugin_helpers
+      load_custom_variables
       load_custom_helpers
-      @data = {}
-
-      render_files(pre_layers)
-      render(@path) # main resource definition
-      render_files(post_layers)
-
-      Result.new(@save_file, @data)
-    end
-
-    def render_files(paths)
-      paths.each do |path|
-        render(path)
-      end
-    end
-
-    # render and merge
-    def render(path)
-      result = render_result(path)
-      @data.deeper_merge!(result)
     end
 
     def render_result(path)

data/lib/kubes/compiler/util/normalize.rb

@@ -1,11 +1,14 @@
 module Kubes::Compiler::Util
   module Normalize
     def normalize_kind(path)
-      extract_type(path).underscore.camelize # Deployment, Service, Ingress, ManagedCertificate, etc
+      info = path.sub(%r{.*/.kubes/resources/}, '')
+      extract_type(info).underscore.camelize # Deployment, Service, Ingress, ManagedCertificate, etc
     end
 
-    def extract_type(path)
-      File.basename(path).sub('.yaml','').sub('.yml','').sub('.rb','').sub(/-.*/,'')
+    # info: web/service.yaml
+    def extract_type(info)
+      _, kind = info.split('/')
+      kind.sub('.yaml','').sub('.yml','').sub('.rb','').sub(/-.*/,'')
     end
   end
 end

data/lib/kubes/compiler/util/yaml_dump.rb

@@ -4,12 +4,12 @@ require "yaml"
 module Kubes::Compiler::Util
   module YamlDump
     def yaml_dump(data)
-      if data.is_a?(Kubes::Compiler::Dsl::Core::Blocks)
-        items = data.results.map { |k,v| standardize_yaml(v) }
-        items.map(&:to_yaml).join("")
-      else
+      if data.key?("kind")  # single resource in YAML
         data = standardize_yaml(data)
         data.to_yaml
+      else
+        items = data.map { |k,v| standardize_yaml(v) }
+        items.map(&:to_yaml).join("")
       end
     end
 

data/lib/kubes/config.rb

@@ -31,6 +31,7 @@ module Kubes
       config.kubectl.order.kinds = kind_order
 
       config.repo = nil # expected to be set by .kubes/config.rb
+      config.repo_auto_auth = true
 
       config.logger = Logger.new($stderr)
       config.logger.level = ENV['KUBES_LOG_LEVEL'] || :info
@@ -81,9 +82,22 @@ module Kubes
       yield(@config)
     end
 
+    # Load configs example:
+    #
+    # .kubes/config.rb
+    # .kubes/config/env/dev.rb
+    # .kubes/config/plugins/google.rb
+    # .kubes/config/plugins/google/dev.rb
+    #
     def load_configs
       evaluate_file(".kubes/config.rb")
       evaluate_file(".kubes/config/env/#{Kubes.env}.rb")
+      Kubes::Plugin.plugins.each do |klass|
+        # klass: IE: KubesAws, KubesGoogle
+        name = klass.to_s.underscore.sub('kubes_','') # kubes_google => google
+        evaluate_file(".kubes/config/plugins/#{name}.rb")
+        evaluate_file(".kubes/config/plugins/#{name}/#{Kubes.env}.rb")
+      end
     end
   end
 end

data/lib/kubes/hooks/builder.rb

@@ -6,20 +6,36 @@ module Kubes::Hooks
     include Kubes::Logging
 
     attr_accessor :name
-    def initialize(dsl_file, options={})
-      @dsl_file, @options = dsl_file, options # IE: .kubes/config/hooks/kubectl.rb
+    def initialize(file, options={})
+      @file, @options = file, options # IE: .kubes/config/hooks/kubectl.rb
+      @dsl_file = "#{Kubes.root}/.kubes/config/hooks/#{@file}"
       @output_file = options[:file] # IE: .kubes/output/web/service.yaml
       @name = options[:name].to_s
       @hooks = {before: {}, after: {}}
     end
 
     def build
-      return @hooks unless File.exist?(@dsl_file)
       evaluate_file(@dsl_file)
+      evaluate_plugin_hooks
       @hooks.deep_stringify_keys!
     end
     memoize :build
 
+    def evaluate_plugin_hooks
+      Kubes::Plugin.plugins.each do |klass|
+        hooks_class = hooks_class(klass)
+        next unless hooks_class
+        plugin_hooks = hooks_class.new
+        path = "#{plugin_hooks.path}/#{@file}"
+        evaluate_file(path)
+      end
+    end
+
+    def hooks_class(klass)
+      "#{klass}::Hooks".constantize # IE: KubesGoogle::Hooks
+    rescue NameError
+    end
+
     def run_hooks
       build
       run_each_hook("before")
@@ -42,8 +58,7 @@ module Kubes::Hooks
       id = "#{command} #{type} #{@name}"
       on = " on: #{hook["on"]}" if hook["on"]
       label = " label: #{hook["label"]}" if hook["label"]
-      logger.info  "Running #{id} hook.#{on}#{label}"
-      logger.debug "Hook options: #{hook}"
+      logger.info  "Hook: Running #{id} hook.#{on}#{label}"
       Runner.new(hook).run
     end
 

data/lib/kubes/hooks/concern.rb

@@ -2,7 +2,7 @@ module Kubes::Hooks
   module Concern
     # options example: {:name=>"apply", :file=>".kubes/output/web/service.yaml"}
     def run_hooks(file, options={}, &block)
-      hooks = Kubes::Hooks::Builder.new("#{Kubes.root}/.kubes/config/hooks/#{file}", options)
+      hooks = Kubes::Hooks::Builder.new(file, options)
       hooks.build # build hooks
       hooks.run_hooks(&block)
     end

data/lib/kubes/kubectl/batch.rb

@@ -22,10 +22,17 @@ class Kubes::Kubectl
               Kubes::Kubectl.run(@name, @options.merge(file: file))
             end
           end
+          prune # important to call within run_hooks for case of GKE IP whitelisting
         end
       end
     end
 
+    def prune
+      return unless @name == "apply" # only run for apply
+      return unless Kubes.config.auto_prune # prune old secrets and config maps
+      Kubes::CLI::Prune.new(@options.merge(yes: true, quiet: true)).run
+    end
+
     def switch_context(&block)
       kubectl = Kubes.config.kubectl
       context = kubectl.context

data/lib/kubes/plugin.rb

@@ -0,0 +1,14 @@
+module Kubes
+  module Plugin
+    @@plugins = []
+    def plugins
+      @@plugins
+    end
+
+    def register(klass)
+      @@plugins << klass
+    end
+
+    extend self
+  end
+end

data/lib/kubes/util/sh.rb

@@ -32,7 +32,7 @@ module Kubes::Util
 
     def sh_capture(command, options={})
       exit_on_fail = options[:exit_on_fail].nil? ? true : options[:exit_on_fail]
-      logger.info "=> #{command}" if options[:show_command]
+      logger.debug "=> #{command}"
       out = `#{command}`.strip
       unless $?.success?
         logger.error "ERROR: running #{command}".color(:red)

data/lib/kubes/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.5.0"
+  VERSION = "0.6.3"
 end

data/lib/templates/new/helper/file.rb

@@ -0,0 +1,2 @@
+module <%= underscored_name.camelize %>
+end

data/lib/templates/new/{yaml → resource/yaml}/deployment.yaml

@@ -1,4 +1,3 @@
-test: 1
 apiVersion: apps/v1
 kind: Deployment
 metadata:

data/lib/templates/new/variable/file.rb

@@ -0,0 +1 @@
+@example = "<%= Kubes.env %>-value"

data/spec/fixtures/project/.kubes/resources/{service.rb → web/service.rb}

@@ -1,3 +1,3 @@
 name "demo-web"
 port 80
-target_port 3000
+targetPort 3000

data/spec/kubes/compiler/strategy/dsl_spec.rb

@@ -3,7 +3,7 @@ describe Kubes::Compiler::Strategy::Dsl do
   let(:options) { {path: fixture(resource) } }
 
   context "standard" do
-    let(:resource) { "project/.kubes/resources/deployment" }
+    let(:resource) { "project/.kubes/resources/web/deployment" }
     it "run" do
       result = dsl.run
       expect(dsl.dsl_class).to eq(Kubes::Compiler::Dsl::Syntax::Deployment)
@@ -25,7 +25,7 @@ describe Kubes::Compiler::Strategy::Dsl do
   end
 
   context "multiple files" do
-    let(:resource) { "multiple-files/deployment-1" }
+    let(:resource) { "multiple-files/.kubes/resources/web/deployment-1" }
     it "run" do
       result = dsl.run
       expect(dsl.dsl_class).to eq(Kubes::Compiler::Dsl::Syntax::Deployment)