kubes 0.2.4 → 0.3.2

data/docs/_reference/kubes-init.md

@@ -15,7 +15,7 @@ Init project
 ## Options
 
 ```
-a, --app=APP                     # Docker repo name. Example: demo-web. Generates .kubes/APP/resources folder
+a, --app=APP                     # Docker repo name. Example: web. Generates .kubes/APP/resources folder
     [--force]                    # Bypass overwrite are you sure prompt for existing files
 t, [--type=TYPE]                 # Type: dsl or yaml
                                  # Default: yaml

data/docs/_reference/kubes-logs.md

@@ -0,0 +1,26 @@
+---
+title: kubes logs
+reference: true
+---
+
+## Usage
+
+    kubes logs
+
+## Description
+
+logs from all deployment pods
+
+
+## Options
+
+```
+    [--compile], [--no-compile]  # whether or not to compile the .kube/resources
+                                 # Default: true
+n, [--name=NAME]                 # deployment name to use. IE: demo-web
+f, [--follow], [--no-follow]     # Follow logs
+                                 # Default: true
+    [--verbose], [--no-verbose]  
+    [--noop], [--no-noop]        
+```
+

data/docs/_sass/theme.scss

@@ -13,12 +13,13 @@
   margin: auto;
   text-align: center;
   display: block;
+  width: 80%;
   padding-bottom: 30px;
 
   @media (min-width: 575px) {
     position: absolute;
     top: 50%;
-    max-width: none;
+    width: 100%;
     margin: 0;
     transform: translateY(-50%);
   }

data/docs/bin/web

@@ -5,4 +5,4 @@
 #   bin/web -P 8888
 
 bundle exec jekyll clean
-exec bundle exec jekyll serve --host 0.0.0.0 "$@"
+exec bundle exec jekyll serve "$@"

data/docs/index.html

@@ -9,13 +9,13 @@ sidebar: false
       <div class="col-sm-8 col-sm-offset-2">
         <div class="header-content">
           <div class="header-content-inner">
-            <h1>Kubes</h1>
+            <h1>Kubes: Kubernetes Deployment Tool</h1>
             <h2>Kubes is a Kubernetes Deployment Tool. It builds the docker image, creates the Kubernetes YAML, and runs kubectl apply. It automates the deployment process and saves you precious finger-typing energy.</h2>
           </div>
         </div>
       </div>
       <div class="col-sm-4">
-        <img src="/img/logos/kubes-sign.png" class="homepage-logo" />
+        <img src="/img/logos/kubes-white.png" class="homepage-logo" />
       </div>
     </div>
   </div>

data/docs/reference.md

@@ -10,6 +10,10 @@ title: CLI Reference
 * [kubes completion_script]({% link _reference/kubes-completion_script.md %})
 * [kubes delete]({% link _reference/kubes-delete.md %})
 * [kubes deploy]({% link _reference/kubes-deploy.md %})
+* [kubes describe]({% link _reference/kubes-describe.md %})
 * [kubes docker]({% link _reference/kubes-docker.md %})
+* [kubes exec]({% link _reference/kubes-exec.md %})
+* [kubes get]({% link _reference/kubes-get.md %})
 * [kubes init]({% link _reference/kubes-init.md %})
+* [kubes logs]({% link _reference/kubes-logs.md %})
 * [kubes version]({% link _reference/kubes-version.md %})

data/lib/kubes/cli.rb

@@ -9,6 +9,9 @@ module Kubes
     compile_option = Proc.new {
       option :compile, type: :boolean, default: true, desc: "whether or not to compile the .kube/resources"
     }
+    name_option = Proc.new {
+      option :name, aliases: %w[n], desc: "deployment name to use. IE: demo-web"
+    }
 
     desc "docker SUBCOMMAND", "Docker subcommands"
     long_desc Help.text(:docker)
@@ -60,15 +63,34 @@ module Kubes
       Describe.new(options.merge(role: role, resource: resource)).run
     end
 
+    desc "exec", "Exec into the latest container from the deployment"
+    long_desc Help.text(:exec)
+    compile_option.call
+    name_option.call
+    option :container, aliases: %w[c], desc: "Container name. If omitted, the first container in the pod will be chosen"
+    def exec(*cmd)
+      Exec.new(options.merge(cmd: cmd)).run
+    end
+
     desc "get [ROLE] [RESOURCE]", "Get Kubernetes resource using the compiled YAML files"
     long_desc Help.text(:get)
     image_option.call
     compile_option.call
     option :output, aliases: %w[o], desc: "Output format: json|yaml|wide|name"
+    option :show_pods, type: :boolean, default: true, desc: "Also show pods from deployments"
     def get(role=nil, resource=nil)
       Get.new(options.merge(role: role, resource: resource)).run
     end
 
+    desc "logs", "logs from all deployment pods"
+    long_desc Help.text(:logs)
+    compile_option.call
+    name_option.call
+    option :follow, aliases: %w[f], type: :boolean, default: true, desc: "Follow logs"
+    def logs(*cmd)
+      Logs.new(options.merge(cmd: cmd)).run
+    end
+
     long_desc Help.text(:init)
     Init.options.each { |args| option(*args) }
     register(Init, "init", "init", "Init project")

data/lib/kubes/cli/apply.rb

@@ -1,7 +1,7 @@
 class Kubes::CLI
   class Apply < Base
     def run
-      Compile.new(@options).run unless @options[:compile] == false
+      compile
       logger.info "Deploying kubes resources"
       Kubes::Kubectl::Decider.new(:apply, @options).run
     end

data/lib/kubes/cli/base.rb

@@ -5,5 +5,9 @@ class Kubes::CLI
     def initialize(options={})
       @options = options
     end
+
+    def compile
+      Compile.new(@options).run unless @options[:compile] == false
+    end
   end
 end

data/lib/kubes/cli/build.rb

@@ -1,8 +1,8 @@
 class Kubes::CLI
   class Build < Base
     def run
-      Kubes::Docker::Build.new(@options).run
-      Kubes::Docker::Push.new(@options).run
+      Kubes::Docker.new(@options, "build").run
+      Kubes::Docker.new(@options, "push").run
     end
   end
 end

data/lib/kubes/cli/delete.rb

@@ -3,9 +3,14 @@ class Kubes::CLI
     include Kubes::Util::Sure
 
     def run
+      compile
+      perform(preview: true) unless @options[:yes]
       sure?("This will delete resources. Are you sure?")
-      Compile.new(@options).run
-      Kubes::Kubectl::Decider.new(:delete, @options).run
+      perform(preview: false)
+    end
+
+    def perform(preview: false)
+      Kubes::Kubectl::Decider.new(:delete, @options.merge(preview: preview)).run
     end
   end
 end

data/lib/kubes/cli/describe.rb

@@ -1,7 +1,7 @@
 class Kubes::CLI
   class Describe < Base
     def run
-      Compile.new(@options).run unless @options[:compile] == false
+      compile
       Kubes::Kubectl.run(:describe, @options)
     end
   end

data/lib/kubes/cli/docker.rb

@@ -4,7 +4,7 @@ class Kubes::CLI
     long_desc Help.text("docker:build")
     option :push, type: :boolean, default: false
     def build
-      builder = Kubes::Docker::Build.new(options)
+      builder = Kubes::Docker.new(options, "build")
       builder.run
       push if options[:push]
     end
@@ -13,7 +13,7 @@ class Kubes::CLI
     long_desc Help.text("docker:push")
     option :push, type: :boolean, default: false
     def push
-      pusher = Kubes::Docker::Push.new(options)
+      pusher = Kubes::Docker.new(options, "push")
       pusher.run
     end
   end

data/lib/kubes/cli/exec.rb

@@ -0,0 +1,34 @@
+class Kubes::CLI
+  class Exec < Base
+    include Kubes::Util::Sh
+
+    def run
+      compile
+      metadata = Kubes::Kubectl::Fetch::Deployment.new(@options).metadata
+
+      labels = metadata['labels'].map { |k,v| "#{k}=#{v}" }.join(',')
+      ns = metadata['namespace']
+
+      resp = capture("kubectl get pod -l #{labels} -n #{ns} -o json")
+      data = JSON.load(resp)
+      pod = latest_pod(data['items'])
+
+      unless pod
+        logger.error "ERROR: Unable to find a running pod".color(:red)
+        exit 1
+      end
+
+      name = pod['metadata']['name']
+      container = " -c #{@options[:container]}" unless @options[:container].nil?
+      cmd = @options[:cmd].empty? ? "bash" : @options[:cmd].join(' ')
+      sh("kubectl exec -n #{ns} -ti #{name}#{container} -- #{cmd}")
+    end
+
+    # get latest running pod
+    def latest_pod(items)
+      running = items.select { |i| i['status']['phase'] == 'Running' }
+      sorted = running.sort_by { |i| i['metadata']['creationTimestamp'] || 0 }
+      sorted.last
+    end
+  end
+end

data/lib/kubes/cli/get.rb

@@ -1,8 +1,10 @@
 class Kubes::CLI
   class Get < Base
     def run
-      Compile.new(@options).run unless @options[:compile] == false
+      compile
       Kubes::Kubectl.run(:get, @options)
+      pods = Kubes::Kubectl::Fetch::Pods.new(@options)
+      pods.show if @options[:show_pods]
     end
   end
 end

data/lib/kubes/cli/help/exec.md

@@ -0,0 +1,24 @@
+The exec command finds the latest pod from the deployment and runs `kubectl exec -ti POD bash` to get you into it. It spares you from having to manually find and type it.
+
+## Examples
+
+    kubes exec
+    kubes exec sh
+    kubes exec ls -l
+
+## Multiple Deployments
+
+If you have have multiple deployments in your `.kubes/resources` then the command will use the first deployment by default. You can specify the specfic deployment with the `--name` or `-n` option.  Examples:
+
+    kubes exec --name web
+    kubes exec -n web
+    kubes exec -n clock
+    kubes exec -n worker
+    kubes exec -n web sh
+    kubes exec -n web ls -l
+
+## Multiple Pod Containers
+
+If you have have multiple containers in your pod. You can specify the specfic container with the `--container` or `-c` option.  Examples:
+
+    kubes exec --name web

data/lib/kubes/cli/logs.rb

@@ -0,0 +1,15 @@
+class Kubes::CLI
+  class Logs < Base
+    include Kubes::Util::Sh
+
+    def run
+      compile
+      metadata = Kubes::Kubectl::Fetch::Deployment.new(@options).metadata
+      name = metadata['name']
+      ns = metadata['namespace']
+
+      follow = " -f" if @options[:follow]
+      sh("kubectl logs deployment/#{name}#{follow} -n #{ns}")
+    end
+  end
+end

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

@@ -1,9 +1,10 @@
 module Kubes::Compiler::Dsl::Syntax
   class Deployment < Resource
     fields :container,          # <Object>
-           :containers,         # <[]Object>
            "matchLabels:hash",  # <map[string]string>
            :sidecar,            # <Object>
+           :sidecar_name,       # <string>
+           :sidecar_image,      # <string>
            :templateMetadata,   # <Object>
            :templateSpec        # <Object>
 
@@ -21,6 +22,42 @@ module Kubes::Compiler::Dsl::Syntax
     fields :maxSurge,         # <string>
            :maxUnavailable    # <string>
 
+    # kubectl explain deploy.spec.template.spec
+    fields :activeDeadlineSeconds,        # <integer>
+           :affinity,                     # <Object>
+           :automountServiceAccountToken, # <boolean>
+           :containers,                   # <[]Object> -required-
+           :dnsConfig,                    # <Object>
+           :dnsPolicy,                    # <string>
+           :enableServiceLinks,           # <boolean>
+           :ephemeralContainers,          # <[]Object>
+           :hostAliases,                  # <[]Object>
+           :hostIPC,                      # <boolean>
+           :hostNetwork,                  # <boolean>
+           :hostPID,                      # <boolean>
+           :hostname,                     # <string>
+           :imagePullSecrets,             # <[]Object>
+           :initContainers,               # <[]Object>
+           :nodeName,                     # <string>
+           :nodeSelector,                 # <map[string]string>
+           :overhead,                     # <map[string]string>
+           :preemptionPolicy,             # <string>
+           :priority,                     # <integer>
+           :priorityClassName,            # <string>
+           :readinessGates,               # <[]Object>
+           :restartPolicy,                # <string>
+           :runtimeClassName,             # <string>
+           :schedulerName,                # <string>
+           :securityContext,              # <Object>
+           :serviceAccount,               # <string>
+           :serviceAccountName,           # <string>
+           :shareProcessNamespace,        # <boolean>
+           :subdomain,                    # <string>
+           :terminationGracePeriodSeconds,# <integer>
+           :tolerations,                  # <[]Object>
+           :topologySpreadConstraints,    # <[]Object>
+           :volumes                       # <[]Object>
+
     # kubectl explain deployment.spec.template.spec.containers
     fields :args,                     # <[]string>
            :command,                  # <[]string>
@@ -104,7 +141,42 @@ module Kubes::Compiler::Dsl::Syntax
     end
 
     def default_templateSpec
-      { containers: containers }
+      {
+        activeDeadlineSeconds: activeDeadlineSeconds,
+        affinity: affinity,
+        automountServiceAccountToken: automountServiceAccountToken,
+        containers: containers,
+        dnsConfig: dnsConfig,
+        dnsPolicy: dnsPolicy,
+        enableServiceLinks: enableServiceLinks,
+        ephemeralContainers: ephemeralContainers,
+        hostAliases: hostAliases,
+        hostIPC: hostIPC,
+        hostNetwork: hostNetwork,
+        hostPID: hostPID,
+        hostname: hostname,
+        imagePullSecrets: imagePullSecrets,
+        initContainers: initContainers,
+        nodeName: nodeName,
+        nodeSelector: nodeSelector,
+        overhead: overhead,
+        preemptionPolicy: preemptionPolicy,
+        priority: priority,
+        priorityClassName: priorityClassName,
+        readinessGates: readinessGates,
+        restartPolicy: restartPolicy,
+        runtimeClassName: runtimeClassName,
+        schedulerName: schedulerName,
+        securityContext: securityContext,
+        serviceAccount: serviceAccount,
+        serviceAccountName: serviceAccountName,
+        shareProcessNamespace: shareProcessNamespace,
+        subdomain: subdomain,
+        terminationGracePeriodSeconds: terminationGracePeriodSeconds,
+        tolerations: tolerations,
+        topologySpreadConstraints: topologySpreadConstraints,
+        volumes: volumes,
+      }
     end
 
     def default_templateMetadata
@@ -115,6 +187,17 @@ module Kubes::Compiler::Dsl::Syntax
       [container, sidecar].compact
     end
 
+    def default_sidecar
+      {
+        name:  sidecar_name,
+        image: sidecar_image,
+      }
+    end
+
+    def default_sidecar_name
+      "sidecar" if sidecar_image # othewise will create invalid sidecar field w/o image
+    end
+
     def default_container
       {
         args: args,

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/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