kubes 0.3.2 → 0.4.1

data/lib/kubes/hooks/concern.rb

@@ -0,0 +1,10 @@
+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.build # build hooks
+      hooks.run_hooks(&block)
+    end
+  end
+end

data/lib/kubes/hooks/dsl.rb

@@ -13,7 +13,8 @@ module Kubes::Hooks
     end
 
     def each_hook(type, name, props={})
-      @hooks[type][name] = props
+      @hooks[type][name] ||= []
+      @hooks[type][name] << props
     end
   end
 end

data/lib/kubes/hooks/runner.rb

@@ -0,0 +1,22 @@
+module Kubes::Hooks
+  class Runner
+    include Kubes::Util::Sh
+    include Kubes::Logging
+
+    def initialize(hook)
+      @hook = hook
+      @execute = @hook["execute"]
+    end
+
+    def run
+      case @execute
+      when String
+        sh(@execute, exit_on_fail: @hook["exit_on_fail"])
+      when -> (e) { e.respond_to?(:public_instance_methods) && e.public_instance_methods.include?(:call) }
+        @execute.new.call
+      else
+        @execute.call
+      end
+    end
+  end
+end

data/lib/kubes/kubectl.rb

@@ -2,6 +2,7 @@ module Kubes
   class Kubectl
     extend Memoist
     include Kubes::Util::Sh
+    include Kubes::Hooks::Concern
 
     def initialize(name, options={})
       @name, @options = name, options
@@ -14,24 +15,19 @@ module Kubes
       options[:exit_on_fail] = exit_on_fail unless exit_on_fail.nil?
 
       params = args.flatten.join(' ')
-      command = "kubectl #{@name} #{params}" # @name: apply or delete
+      args = "#{@name} #{params}" # @name: apply or delete
 
       switch_context do
-        run_hooks(@name) do
+        run_hooks("kubectl.rb", name: @name, file: @options[:file]) do
           if options[:capture]
-            capture(command, options)
+            self.class.capture(args, options) # already includes kubectl
           else
-            sh(command, options)
+            self.class.execute(args, options)
           end
         end
       end
     end
 
-    def execute(args, options={})
-      command = "kubectl #{args}"
-      capture(command)
-    end
-
     # Useful for kustomize mode
     def validate!
       return true unless Kubes.kustomize?
@@ -44,9 +40,8 @@ module Kubes
     end
 
     def exit_on_fail
-      kubectl = Kubes.config.kubectl
-      exit_on_fail = kubectl.send("exit_on_fail_for_#{@name}")
-      exit_on_fail.nil? ? kubectl.exit_on_fail : exit_on_fail
+      return false if ENV['KUBES_EXIT_ON_FAIL'] == '0'
+      Kubes.config.kubectl.exit_on_fail[@name]
     end
 
     def switch_context(&block)
@@ -65,12 +60,6 @@ module Kubes
       end
     end
 
-    def run_hooks(name, &block)
-      hooks = Kubes::Hooks::Builder.new(name, "#{Kubes.root}/.kubes/config/kubectl/hooks.rb")
-      hooks.build # build hooks
-      hooks.run_hooks(&block)
-    end
-
     def args
       # base at end in case of redirection. IE: command > /path
       custom.args + default.args
@@ -90,9 +79,23 @@ module Kubes
     memoize :default
 
     class << self
+      include Kubes::Util::Sh
       def run(name, options={})
         new(name, options).run
       end
+
+      def execute(args, options={})
+        sh("kubectl #{args}", options)
+      end
+
+      def capture(args, options={})
+        resp = sh_capture("kubectl #{args}", options)
+        if args.include?('-o json')
+          JSON.load(resp) # data
+        else
+          resp
+        end
+      end
     end
   end
 end

data/lib/kubes/kubectl/batch.rb

@@ -1,5 +1,6 @@
 class Kubes::Kubectl
   class Batch
+    include Kubes::Hooks::Concern
     include Kubes::Logging
     include Kubes::Util::Consider
     include Ordering
@@ -11,11 +12,13 @@ class Kubes::Kubectl
     def run
       # @options[:preview] is really only used for kubectl delete
       logger.info "Will run:" if @options[:preview]
-      sorted_files.each do |file|
-        if @options[:preview]
-          logger.info "    kubectl #{@name} -f #{file}"
-        else
-          Kubes::Kubectl.run(@name, @options.merge(file: file))
+      run_hooks("kubes.rb", name: @name) do
+        sorted_files.each do |file|
+          if @options[:preview]
+            logger.info "    kubectl #{@name} -f #{file}"
+          else
+            Kubes::Kubectl.run(@name, @options.merge(file: file))
+          end
         end
       end
     end

data/lib/kubes/kubectl/{decider.rb → dispatcher.rb}

@@ -1,5 +1,5 @@
 class Kubes::Kubectl
-  class Decider
+  class Dispatcher
     def initialize(name, options={})
       @name, @options = name.to_s, options
     end

data/lib/kubes/kubectl/fetch/base.rb

@@ -2,6 +2,7 @@ require "json"
 
 module Kubes::Kubectl::Fetch
   class Base
+    extend Memoist
     include Kubes::Logging
     include Kubes::Util::Sh
 
@@ -9,16 +10,18 @@ module Kubes::Kubectl::Fetch
       @options = options
     end
 
-    def fetch_items
-      o = {
-        capture: true,
-        output: "json",
-        show_command: false,
-      }
-      kubectl = Kubes::Kubectl.new(:get, @options.merge(o)) # kubes get -f .kubes/output
-      resp = kubectl.run
-      data = JSON.load(resp)
-      data['items']
+    def fetch(kind)
+      return [] unless namespace
+      data = Kubes::Kubectl.capture("get #{kind} -o json -n #{namespace}")
+      data['items'] || [] # Note: When fetching only 1 resource, items is not part of structure
     end
+
+    def namespace
+      path = ".kubes/output/shared/namespace.yaml"
+      return unless File.exist?(path)
+      data = Kubes::Kubectl.capture("get -f #{path} -o json")
+      data['metadata']['name']
+    end
+    memoize :namespace
   end
 end

data/lib/kubes/kubectl/fetch/deployment.rb

@@ -1,31 +1,41 @@
 module Kubes::Kubectl::Fetch
   class Deployment < Base
+    extend Memoist
+
     def metadata
-      items = fetch_items
+      deployment['metadata'] if found
+    end
+
+    def spec
+      deployment['spec'] if found
+    end
+
+    def deployment
+      items = fetch(:deployment)
       # Not checking if deployment exists because kubes will error on `kubes get` from missing deployments already
       deployments = items.select { |i| i['kind'] == "Deployment" }
 
-      if deployments.size > 1 && !@options[:name]
+      if !@options[:deployment] && !@options[:pod] && deployments.size > 1
         names = deployments.map { |d| d['metadata']['name'] }
         logger.info <<~EOL
           INFO: More than one deployment found.
           Deployment names: #{names.join(', ')}
           Using #{names.first}
-          Note: You can specify the deployment to use with --name or -n
+          Note: You can specify the deployment to use with --deployment or -d
         EOL
       end
 
-      deployment = find_deployment(deployments)
-      unless deployment
-        logger.error "ERROR: No deployment found".color(:red)
-        exit 1
-      end
-      deployment['metadata']
+      find_deployment(deployments)
+    end
+    memoize :deployment
+
+    def found
+      !!deployment
     end
 
     def find_deployment(deployments)
-      if @options[:name]
-        deployments.find { |d| d['metadata']['name'] == @options[:name] }
+      if @options[:deployment]
+        deployments.find { |d| d['metadata']['name'] == @options[:deployment] }
       else
         deployments.first
       end

data/lib/kubes/kubectl/fetch/pods.rb

@@ -1,21 +1,10 @@
 module Kubes::Kubectl::Fetch
   class Pods < Base
-    def show
-      items = fetch_items
-      # Not checking if deployment exists because kubes will error on `kubes get` from missing deployments already
-      deployments = items.select { |i| i['kind'] == "Deployment" }
-
-      deployments.each do |deployment|
-        logger.info "Pods for deployment #{deployment['metadata']['name']}:".color(:green)
-        show_for(deployment)
-      end
-    end
+    extend Memoist
 
-    def show_for(deployment)
-      metadata = deployment['metadata']
-      labels = metadata['labels'].map { |k,v| "#{k}=#{v}" }.join(',')
-      ns = metadata['namespace']
-      sh("kubectl get pod -l #{labels} -n #{ns}")
+    def show
+      return unless namespace
+      sh("kubectl get pod -n #{namespace}")
     end
   end
 end

data/lib/kubes/kubectl/kustomize.rb

@@ -5,7 +5,7 @@ class Kubes::Kubectl
 
       def detect?
         expr = "#{Kubes.root}/.kubes/resources/**/*"
-        !!Dir.glob(expr).detect { |p| p.include?("kustomization.yaml") }
+        !!Dir.glob(expr).detect { |p| p.include?("kustomization.y") } # allow for both .yml and .yaml to work
       end
       memoize :detect?
     end

data/lib/kubes/kubectl/ordering.rb

@@ -12,9 +12,21 @@ class Kubes::Kubectl
 
         "#{role_i}/#{kind_i}"
       end
+
+      sorted = filter_files(sorted)
+
       @name == "delete" ? sorted.reverse : sorted
     end
 
+    def filter_files(sorted)
+      skip = Kubes.config.skip
+      skip += ENV['KUBES_SKIP'].split(' ') if ENV['KUBES_SKIP']
+      return sorted if skip.empty?
+      sorted.reject do |file|
+        skip.detect { |text| file.include?(text) }
+      end
+    end
+
     # type: kinds or roles
     # value: Examples: kind: deployment, role: web
     def index_for(type, value)

data/lib/kubes/util/consider.rb

@@ -3,7 +3,8 @@ module Kubes::Util
     def consider?(path)
       File.file?(path) &&
       !path.include?('/resources/base') &&
-      !path.include?('/base.yaml')
+      !path.include?('/base.yaml') &&
+      !path.include?('/base.yml')
     end
   end
 end

data/lib/kubes/util/sh.rb

@@ -30,7 +30,7 @@ module Kubes::Util
       success
     end
 
-    def capture(command, options={})
+    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]
       out = `#{command}`.strip

data/lib/kubes/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.3.2"
+  VERSION = "0.4.1"
 end

data/lib/templates/dsl/.kubes/resources/base/all.rb.tt

@@ -1,2 +1,7 @@
-namespace "<%= app %>"
+<%
+unless namespace == "default"
+  namespace_line = %Q|namespace "#{namespace}"\n|
+end
+-%>
+<%= namespace_line if namespace_line -%>
 labels(app: "<%= app %>")

data/lib/templates/dsl/.kubes/resources/shared/namespace.rb.tt

@@ -1,2 +1,2 @@
-name "<%= app %>"
+name "<%= namespace %>"
 labels(app: "<%= app %>")

data/lib/templates/dsl/.kubes/resources/web/deployment.rb

@@ -1,7 +1,7 @@
 name "web"
 labels(role: "web")
 
-replicas 1
+replicas 1 # overridden on a env basis
 image built_image # IE: user/<%= app %>:kubes-2020-06-13T19-55-16-43afc6e
 
 # revisionHistoryLimit 1 # uncomment to reduce old ReplicaSets, default is 10 https://bit.ly/3hqrzyP

data/lib/templates/yaml/.kubes/resources/base/all.yaml.tt

@@ -1,2 +1,2 @@
 metadata:
-  namespace: <%= app %>
+  namespace: <%= namespace %>

data/lib/templates/yaml/.kubes/resources/shared/namespace.yaml.tt

@@ -1,6 +1,6 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: <%= app %>
+  name: <%= namespace %>
   labels:
     app: <%= app %>

data/lib/templates/yaml/.kubes/resources/web/deployment.yaml.tt

@@ -5,7 +5,7 @@ metadata:
   labels:
     role: web
 spec:
-  replicas: 1
+  replicas: 1  # overridden on a env basis
   selector:
     matchLabels:
       role: web

data/spec/fixtures/decorators/deployment/both/envFrom.yaml

@@ -0,0 +1,31 @@
+---
+metadata:
+  namespace: default
+  labels:
+    app: demo
+    role: web
+  name: demo-web
+spec:
+  selector:
+    matchLabels:
+      app: demo
+      role: web
+  template:
+    metadata:
+      labels:
+        app: demo
+        role: web
+    spec:
+      containers:
+      - name: demo-web
+        image: gcr.io/project/demo-web:kubes-2020-06-23T00-07-54
+        envFrom:
+        - secretRef:
+            name: demo-secret
+        - configMapRef:
+            name: demo-config-map
+        - configMapRef:
+            name: demo-config-map-2
+  replicas: 1
+apiVersion: apps/v1
+kind: Deployment

data/spec/fixtures/decorators/deployment/both/valueFrom.yaml

@@ -0,0 +1,33 @@
+---
+metadata:
+  namespace: default
+  labels:
+    app: demo
+    role: web
+  name: demo-web
+spec:
+  selector:
+    matchLabels:
+      app: demo
+      role: web
+  template:
+    metadata:
+      labels:
+        app: demo
+        role: web
+    spec:
+      containers:
+      - name: demo-web
+        image: gcr.io/project/demo-web:kubes-2020-06-23T00-07-54
+        env:
+        - name: MYSQL_ROOT_PASSWORD
+          valueFrom:
+            configMapKeyRef:
+              name: demo-config-map
+              key: password
+            secretKeyRef:
+              name: demo-secret
+              key: password
+  replicas: 1
+apiVersion: apps/v1
+kind: Deployment