kubes 0.2.2 → 0.3.0

data/lib/kubes/compiler/dsl/syntax/service.rb

@@ -33,8 +33,19 @@ module Kubes::Compiler::Dsl::Syntax
 
     def default_spec
       {
+        clusterIP: clusterIP,
+        externalIPs: externalIPs,
+        externalName: externalName,
+        externalTrafficPolicy: externalTrafficPolicy,
+        healthCheckNodePort: healthCheckNodePort,
+        ipFamily: ipFamily,
+        loadBalancerIP: loadBalancerIP,
+        loadBalancerSourceRanges: loadBalancerSourceRanges,
         ports: ports,
+        publishNotReadyAddresses: publishNotReadyAddresses,
         selector: selector,
+        sessionAffinity: sessionAffinity,
+        sessionAffinityConfig: sessionAffinityConfig,
         type: type,
       }
     end

data/lib/kubes/compiler/shared/helpers.rb

@@ -20,7 +20,8 @@ module Kubes::Compiler::Shared
     end
 
     def extra
-      ENV['KUBES_EXTRA']
+      extra = ENV['KUBES_EXTRA']
+      extra&.strip&.empty? ? nil : extra # if blank string then also return nil
     end
 
     def base64(v)

data/lib/kubes/config.rb

@@ -35,6 +35,8 @@ module Kubes
 
       config.repo = nil # expected to be set by .kubes/config.rb
 
+      config.builder = "docker" # IE: docker or gcloud
+
       config
     end
 

data/lib/kubes/docker.rb

@@ -0,0 +1,19 @@
+module Kubes
+  class Docker
+    def initialize(options, name)
+      @options = options
+      @name = name
+    end
+
+    def run
+      strategy = strategy_class.new(@options, @name) # @name: docker or push
+      strategy.run
+    end
+
+    def strategy_class
+      strategy = Kubes.config.builder.to_s.camelize # IE: Docker or Gcloud
+      klass_name = "Kubes::Docker::Strategy::#{@name.camelize}::#{strategy}"
+      klass_name.constantize
+    end
+  end
+end

data/lib/kubes/docker/strategy/build/base.rb

@@ -0,0 +1,24 @@
+module Kubes::Docker::Strategy::Build
+  class Base
+    extend Memoist
+    include Kubes::Docker::Strategy::Utils
+
+    def initialize(options, name)
+      @options, @name = options, name
+    end
+
+    def run
+      reserve_image_name
+      check_dockerfile!
+      perform
+      store_image_name
+    end
+
+    def check_dockerfile!
+      # Dockerfile is also used in args/default.rb, will have to combine if Dockerfile is made configurable
+      return if File.exist?("Dockerfile")
+      logger.error "ERROR: The Dockerfile does not exist. Cannot build the docker image without a Dockerfile".color(:red)
+      exit 1
+    end
+  end
+end

data/lib/kubes/docker/strategy/build/docker.rb

@@ -0,0 +1,11 @@
+module Kubes::Docker::Strategy::Build
+  class Docker < Base
+    def perform
+      params = args.flatten.join(' ')
+      command = "docker build #{params}"
+      run_hooks "build" do
+        sh(command)
+      end
+    end
+  end
+end

data/lib/kubes/docker/strategy/build/gcloud.rb

@@ -0,0 +1,10 @@
+module Kubes::Docker::Strategy::Build
+  class Gcloud < Base
+    def perform
+      command = "gcloud builds submit --tag #{@@image_name}"
+      run_hooks "build" do
+        sh(command)
+      end
+    end
+  end
+end

data/lib/kubes/docker/strategy/hooks.rb

@@ -0,0 +1,9 @@
+module Kubes::Docker::Strategy
+  module Hooks
+    def run_hooks(name, &block)
+      hooks = Kubes::Hooks::Builder.new(name, "#{Kubes.root}/.kubes/config/docker/hooks.rb")
+      hooks.build # build hooks
+      hooks.run_hooks(&block)
+    end
+  end
+end

data/lib/kubes/docker/{base.rb → strategy/image_name.rb}

@@ -1,36 +1,6 @@
-module Kubes::Docker
-  class Base
+module Kubes::Docker::Strategy
+  module ImageName
     extend Memoist
-    include Kubes::Logging
-    include Kubes::Util::Sh
-
-    def initialize(options={})
-      @options = options
-      @name = self.class.name.split('::').last.underscore
-    end
-
-    def run_hooks(name, &block)
-      hooks = Kubes::Hooks::Builder.new(name, "#{Kubes.root}/.kubes/config/docker/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
-    end
-
-    def custom
-      custom = Kubes::Args::Custom.new(@name, "#{Kubes.root}/.kubes/config/docker/args.rb")
-      custom.build
-      custom
-    end
-    memoize :custom
-
-    def default
-      Args::Default.new(@name, image_name, @options)
-    end
-    memoize :default
 
     @@image_name = nil
     def reserve_image_name
@@ -84,5 +54,22 @@ module Kubes::Docker
       @git_sha = `cd #{Kubes.root} && git rev-parse --short HEAD`
       @git_sha.strip!
     end
+
+    def args
+      # base at end in case of redirection. IE: command > /path
+      custom.args + default.args
+    end
+
+    def custom
+      custom = Kubes::Args::Custom.new(@name, "#{Kubes.root}/.kubes/config/docker/args.rb")
+      custom.build
+      custom
+    end
+    memoize :custom
+
+    def default
+      Kubes::Docker::Args::Default.new(@name, image_name, @options)
+    end
+    memoize :default
   end
 end

data/lib/kubes/docker/strategy/push/base.rb

@@ -0,0 +1,9 @@
+module Kubes::Docker::Strategy::Push
+  class Base
+    include Kubes::Docker::Strategy::Utils
+
+    def initialize(options, name)
+      @options, @name = options, name
+    end
+  end
+end

data/lib/kubes/docker/{push.rb → strategy/push/docker.rb}

@@ -1,8 +1,5 @@
-module Kubes::Docker
-  class Push < Base
-    include Kubes::Logging
-    include Kubes::Util::Time
-
+module Kubes::Docker::Strategy::Push
+  class Docker < Base
     def run
       update_auth_token
       start_time = Time.now

data/lib/kubes/docker/strategy/push/gcloud.rb

@@ -0,0 +1,9 @@
+module Kubes::Docker::Strategy::Push
+  class Gcloud < Base
+    def run
+      run_hooks "push" do
+        # noop, gcloud builds submit already pushes the image
+      end
+    end
+  end
+end

data/lib/kubes/docker/strategy/utils.rb

@@ -0,0 +1,9 @@
+module Kubes::Docker::Strategy
+  module Utils
+    include Kubes::Logging
+    include Kubes::Util::Sh
+    include Kubes::Util::Time
+    include Kubes::Docker::Strategy::ImageName
+    include Kubes::Docker::Strategy::Hooks
+  end
+end

data/lib/kubes/hooks/builder.rb

@@ -23,8 +23,9 @@ module Kubes::Hooks
     def run_hooks
       build
       run_hook("before")
-      yield if block_given?
+      out = yield if block_given?
       run_hook("after")
+      out
     end
 
     def run_hook(type)

data/lib/kubes/kubectl.rb

@@ -9,17 +9,29 @@ module Kubes
 
     def run
       validate!
+
+      options = @options.dup
+      options[:exit_on_fail] = exit_on_fail unless exit_on_fail.nil?
+
       params = args.flatten.join(' ')
       command = "kubectl #{@name} #{params}" # @name: apply or delete
-      options = {}
-      options[:exit_on_fail] = exit_on_fail unless exit_on_fail.nil?
+
       switch_context do
         run_hooks(@name) do
-          sh(command, options)
+          if options[:capture]
+            capture(command, options)
+          else
+            sh(command, 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?

data/lib/kubes/kubectl/batch.rb

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

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

@@ -0,0 +1,24 @@
+require "json"
+
+module Kubes::Kubectl::Fetch
+  class Base
+    include Kubes::Logging
+    include Kubes::Util::Sh
+
+    def initialize(options={})
+      @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']
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+module Kubes::Kubectl::Fetch
+  class Deployment < Base
+    def metadata
+      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" }
+
+      if deployments.size > 1 && !@options[:name]
+        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
+        EOL
+      end
+
+      deployment = find_deployment(deployments)
+      unless deployment
+        logger.error "ERROR: No deployment found".color(:red)
+        exit 1
+      end
+      deployment['metadata']
+    end
+
+    def find_deployment(deployments)
+      if @options[:name]
+        deployments.find { |d| d['metadata']['name'] == @options[:name] }
+      else
+        deployments.first
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+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
+
+    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}")
+    end
+  end
+end

data/lib/kubes/util/sh.rb

@@ -32,6 +32,7 @@ module Kubes::Util
 
     def 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
       unless $?.success?
         logger.error "ERROR: running #{command}".color(:red)

data/lib/kubes/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

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

@@ -5,5 +5,7 @@ replicas 1
 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
+# maxUnavailable 25
+
+# More docs: kubes.guru/docs/dsl/resources/deployment/
 
-# More docs: kubes.guru/docs/dsl/deployment/

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

@@ -5,4 +5,4 @@ labels(role: "web")
 # port 80
 targetPort dockerfile_port # expose port in Dockerfile
 
-# More docs: kubes.guru/docs/dsl/service/
+# More docs: kubes.guru/docs/dsl/resources/service/

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

@@ -9,11 +9,6 @@ spec:
   selector:
     matchLabels:
       role: web
-  strategy:
-    rollingUpdate:
-      maxSurge: 25
-      maxUnavailable: 25
-    type: RollingUpdate
   template:
     metadata:
       labels:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-18 00:00:00.000000000 Z
+date: 2020-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -214,9 +214,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".dockerignore"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -231,7 +233,9 @@ files:
 - docs/Rakefile
 - docs/_config.yml
 - docs/_docs/auto-context.md
+- docs/_docs/ci/cloudbuild.md
 - docs/_docs/config.md
+- docs/_docs/config/builder.md
 - docs/_docs/config/docker.md
 - docs/_docs/config/env.md
 - docs/_docs/config/kubectl.md
@@ -313,6 +317,8 @@ files:
 - docs/_includes/layering/layers.md
 - docs/_includes/learn/cluster.md
 - docs/_includes/learn/next-steps.md
+- docs/_includes/learn/repo
+- docs/_includes/learn/repos.md
 - docs/_includes/learn/review.md
 - docs/_includes/learn/start.md
 - docs/_includes/reference.md
@@ -325,11 +331,15 @@ files:
 - docs/_reference/kubes-completion_script.md
 - docs/_reference/kubes-delete.md
 - docs/_reference/kubes-deploy.md
+- docs/_reference/kubes-describe.md
 - docs/_reference/kubes-docker-build.md
 - docs/_reference/kubes-docker-help.md
 - docs/_reference/kubes-docker-push.md
 - docs/_reference/kubes-docker.md
+- docs/_reference/kubes-exec.md
+- docs/_reference/kubes-get.md
 - docs/_reference/kubes-init.md
+- docs/_reference/kubes-logs.md
 - docs/_reference/kubes-version.md
 - docs/_sass/bootstrap-overrides.scss
 - docs/_sass/buttons.scss
@@ -453,12 +463,15 @@ files:
 - lib/kubes/cli/deploy.rb
 - lib/kubes/cli/describe.rb
 - lib/kubes/cli/docker.rb
+- lib/kubes/cli/exec.rb
 - lib/kubes/cli/get.rb
 - lib/kubes/cli/help.rb
 - lib/kubes/cli/help/completion.md
 - lib/kubes/cli/help/completion_script.md
 - lib/kubes/cli/help/deploy.md
+- lib/kubes/cli/help/exec.md
 - lib/kubes/cli/init.rb
+- lib/kubes/cli/logs.rb
 - lib/kubes/cli/sequence.rb
 - lib/kubes/command.rb
 - lib/kubes/compiler.rb
@@ -510,10 +523,17 @@ files:
 - lib/kubes/completer/script.sh
 - lib/kubes/config.rb
 - lib/kubes/core.rb
+- lib/kubes/docker.rb
 - lib/kubes/docker/args/default.rb
-- lib/kubes/docker/base.rb
-- lib/kubes/docker/build.rb
-- lib/kubes/docker/push.rb
+- lib/kubes/docker/strategy/build/base.rb
+- lib/kubes/docker/strategy/build/docker.rb
+- lib/kubes/docker/strategy/build/gcloud.rb
+- lib/kubes/docker/strategy/hooks.rb
+- lib/kubes/docker/strategy/image_name.rb
+- lib/kubes/docker/strategy/push/base.rb
+- lib/kubes/docker/strategy/push/docker.rb
+- lib/kubes/docker/strategy/push/gcloud.rb
+- lib/kubes/docker/strategy/utils.rb
 - lib/kubes/hooks/builder.rb
 - lib/kubes/hooks/dsl.rb
 - lib/kubes/kubectl.rb
@@ -522,6 +542,9 @@ files:
 - lib/kubes/kubectl/args/standard.rb
 - lib/kubes/kubectl/batch.rb
 - lib/kubes/kubectl/decider.rb
+- lib/kubes/kubectl/fetch/base.rb
+- lib/kubes/kubectl/fetch/deployment.rb
+- lib/kubes/kubectl/fetch/pods.rb
 - lib/kubes/kubectl/kustomize.rb
 - lib/kubes/kubectl/ordering.rb
 - lib/kubes/logger.rb