kubes 0.2.6 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38315c41de75e3132ebd72d88227c7b2dfd5051e62beaebba937081bd04bf87a
-  data.tar.gz: 1e5ad418c423fee55f4b735a446b20835fc2256699d00ed58b162390526e1610
+  metadata.gz: c14d045b8c029e76e1c001f26a0b77c97ecdabc45ddc964660372f2170f95690
+  data.tar.gz: 36a0b622a75cc18e74d78537a2a3f421e15de150cb89978434a58d31c37b799b
 SHA512:
-  metadata.gz: 74e34ea429c1acfa0b642c99b83ea6f7d5889f0539fb905c329380d9f31f116241401ec5af16445694b6507d205b5c3f17d6e099086b9208a68afc835396c01e
-  data.tar.gz: 200b3bec023fec1caf42d418449533035b1f05ecf069770800a90538c93ca344e755701ef35883956512383710fcb1668893ecf9ea2f2e5e148ba0c4fd9fff13
+  metadata.gz: cd0f40a09c2909be4820c0575d6a8ef850b1977e21cd5d040cb82cb11411500a136608035635f743cb1a967116913856fc5e7997f3fef511b5c07d94d5fe4458
+  data.tar.gz: 9f29e9bf7a4615bb2a9864b9acdc9aa83b70583b5743decd5e8c6bac1b85b49bfc90a724403765afe2a86fa1cd1819cccedc53b7b91d6e858a20ececf2630f6a

data/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.3.4]
+- #24 fix namespace newline and logs for single container
+- #23 init namespace option
+
+## [0.3.3]
+- #22 logs -c option. fix kubes logs for pods with multiple containers
+
+## [0.3.2]
+- #21 add namespace to logs command
+
+## [0.3.1]
+- #20 improve sidecar support. kubes exec -c option also
+
+## [0.3.0]
+- #19 new commands: exec, logs
+- delete preview
+- show pods as part of get
+
 ## [0.2.6]
 - #18 gcloud builder. change to config.builder
 

data/docs/_config.yml

@@ -9,7 +9,7 @@ meta_author: Tung Nguyen
 
 # Google webmaster tools
 google_verify:
-google_analytics: "TODO: google_analytics"
+google_analytics: "UA-98684555-14"
 
 # https://ssl.bing.com/webmaster/configure/verify/ownership Option 2 content= goes here
 bing_verify:

data/docs/_docs/auto-context.md

@@ -22,7 +22,7 @@ You can override configs on a per-env basis with `config/env` files. Examples:
 ```ruby
 Kubes.configure do |config|
   config.repo = "222222222222.dkr.ecr.us-west-2.amazonaws.com/demo"
-  config.kubectl.context = "dev-services"
+  config.kubectl.context = "dev-cluster"
 end
 ```
 
@@ -31,7 +31,7 @@ end
 ```ruby
 Kubes.configure do |config|
   config.repo = "333333333333.dkr.ecr.us-west-2.amazonaws.com/demo"
-  config.kubectl.context = "prod-services"
+  config.kubectl.context = "prod-cluster"
 end
 ```
 
@@ -39,8 +39,8 @@ end
 
 With this setup, when you deploy with kubes, it will automatically switch the kubectl context based on `KUBES_ENV`.  Example:
 
-    KUBES_ENV=dev  kubes deploy # to dev-services context
-    KUBES_ENV=prod kubes deploy # to prod-services context
+    KUBES_ENV=dev  kubes deploy # to dev-cluster context
+    KUBES_ENV=prod kubes deploy # to prod-cluster context
 
 ## context_keep Option
 

data/docs/_docs/config/env.md

@@ -11,7 +11,7 @@ Kubes.configure do |config|
   config.repo = "111111111111.dkr.ecr.us-west-2.amazonaws.com/demo"
   config.logger.level = "info"
   # auto-switching
-  # config.kubectl.context = "dev-services"
+  # config.kubectl.context = "dev-cluster"
   # config.kubectl.context_keep = false
 end
 ```
@@ -25,7 +25,7 @@ You can override configs on a per-env basis with `config/env` files. Examples:
 ```ruby
 Kubes.configure do |config|
   config.repo = "222222222222.dkr.ecr.us-west-2.amazonaws.com/demo"
-  config.kubectl.context = "dev-services"
+  config.kubectl.context = "dev-cluster"
 end
 ```
 
@@ -34,7 +34,7 @@ end
 ```ruby
 Kubes.configure do |config|
   config.repo = "333333333333.dkr.ecr.us-west-2.amazonaws.com/demo"
-  config.kubectl.context = "prod-services"
+  config.kubectl.context = "prod-cluster"
 end
 ```
 

data/docs/_docs/dsl/resources/service.md

@@ -46,15 +46,31 @@ spec:
 
 ## DSL Methods
 
-Here's a list of more common methods:
+Here's a list of some of the methods:
+
+kubectl explain service.spec
+
+* clusterIP
+* externalIPs
+* externalName
+* externalTrafficPolicy
+* healthCheckNodePort
+* ipFamily
+* loadBalancerIP
+* loadBalancerSourceRanges
+* ports
+* publishNotReadyAddresses
+* selector
+* sessionAffinity
+* sessionAffinityConfig
+* type
+
+kubectl explain service.spec.ports
 
 * nodePort
 * port
-* portName: Note this field doesn't match the original field name. It's more qualified.
-* ports
+* portName: : Note this field doesn't match the original field name. It's more qualified.
 * protocol
-* selector
 * targetPort
-* type
 
 {% include dsl/methods.md name="service" %}

data/docs/_docs/learn/dsl/deploy.md

@@ -22,6 +22,8 @@ You'll see output like this:
     deployment.apps/demo-web created
     $
 
+Note: Showing an AWS ECR repo, but it may be different if you're using another repo like Google GCR.
+
 What did Kubes do?
 
 {% include kubes-steps.md %}

data/docs/_docs/learn/dsl/new-project.md

@@ -7,11 +7,10 @@ If you already a project with an existing Dockerfile, you can use that. If you d
     mkdir demo
     cd demo
 
-For this tutorial, we'll use an ECR repo, though any repo will work.
+{% include learn/repos.md %}
 
 Let's generate a starter project:
 
-    $ REPO=$(aws ecr describe-repositories --repository-name demo | jq -r '.repositories[].repositoryUri')
     $ kubes init --app demo --repo $REPO --type dsl
           create  .kubes/config.rb
           create  .kubes/config/env/dev.rb

data/docs/_docs/learn/yaml/deploy.md

@@ -22,6 +22,8 @@ You'll see output like this:
     deployment.apps/demo-web created
     $
 
+Note: Showing an AWS ECR repo, but it may be different if you're using another repo like Google GCR.
+
 What did Kubes do?
 
 {% include kubes-steps.md %}

data/docs/_docs/learn/yaml/new-project.md

@@ -7,11 +7,10 @@ If you already a project with an existing Dockerfile, you can use that. If you d
     mkdir demo
     cd demo
 
-For this tutorial, we'll use an ECR repo, though any repo will work.
+{% include learn/repos.md %}
 
 Let's generate a starter project:
 
-    $ REPO=$(aws ecr describe-repositories --repository-name demo | jq -r '.repositories[].repositoryUri')
     $ kubes init --app demo --repo $REPO
           create  Dockerfile
           create  .kubes/config.rb

data/docs/_includes/commands.html

@@ -20,6 +20,8 @@ kubes compile
 kubes deploy
 kubes apply
 kubes get
+kubes exec
+kubes logs
 kubes delete -y
 {% endhighlight %}
               </div>

data/docs/_includes/intro/install.md

@@ -4,7 +4,7 @@ Install kubes via RubyGems.
 
     gem install kubes
 
-Ruby 2.7 and patch variants of it is recommended.
+Ruby 2.7 and above is recommended.
 
 ## kubectl
 
@@ -13,3 +13,7 @@ Kubes calls kubectl. Kubes has been tested with kubectl v1.15+. Generally, it sh
 ## docker
 
 Kubes calls docker. Kubes has been tested with docker 18.x-ce+. Generally, it should work with most versions of docker.
+
+## gcloud
+
+If you are using the [gcloud builder](% link _docs/config/builder.md %), set up and configure the [gcloud cli](https://cloud.google.com/sdk/install).

data/docs/_includes/learn/cluster.md

@@ -1,12 +1,12 @@
-You'll need a Kubernetes cluster and a Docker repo to be able to push to. Setting up a Kubernetes cluster is a little bit out scope for this tutorial. We'll provide the docs and links though. We'll also use an AWS EKS cluster and ECR.
+You'll need a Kubernetes cluster and a Docker repo to be able to push to. Setting up a Kubernetes cluster is a little bit out scope for this tutorial. We'll provide the docs and links though. We'll provide instructions for AWS and Google.
 
-## Create an EKS cluster
+## AWS: Create an EKS cluster
 
 Here are the AWS docs to create an EKS cluster:
 
 * [Creating an Amazon EKS cluster](https://docs.aws.amazon.com/eks/latest/userguide/create-cluster.html)
 
-## Create an ECR Repo
+## AWS: Create an ECR Repo
 
 Here are the AWS docs to create a repo:
 
@@ -19,4 +19,21 @@ Here are also the commands to create an ECR repo:
 
 We'll be using the `$REPO` variable for the rest of the tutorial.
 
-Note: Though we're using AWS here, Kubes works with any Cloud Provider. Please adjust your commands and the `$REPO` variable for your cloud provider.
+## Google: Create GKE Cluster
+
+Here are the Google docs to create an GKE cluster:
+
+* [Creating an Google GKE cluster](https://cloud.google.com/kubernetes-engine/docs/how-to/creating-a-regional-cluster)
+
+## Google: GCR Repo
+
+For google, you do not have to create a repo. You simply push to the right repo url.  Example:
+
+    export GOOGLE_PROJECT=project-123
+    REPO=gcr.io/$GOOGLE_PROJECT/demo
+
+## Repo Variable
+
+We'll be using the `$REPO` variable for the rest of the tutorial.
+
+Note: Though we're using AWS and Google here, Kubes works with any Cloud Provider. Please adjust your commands and the `$REPO` variable for your cloud provider.

data/docs/_includes/learn/repos.md

@@ -0,0 +1,10 @@
+For this tutorial, here are examples of AWS ECR and Google GCR repos, though any repo will work.
+
+AWS:
+
+    REPO=$(aws ecr describe-repositories --repository-name demo | jq -r '.repositories[].repositoryUri')
+
+Google:
+
+    export GOOGLE_PROJECT=project-123
+    REPO=gcr.io/$GOOGLE_PROJECT/demo

data/docs/_includes/learn/review.md

@@ -4,10 +4,10 @@ The `config.rb` is where you can configure Kubes settings.
 
 ```ruby
 Kubes.configure do |config|
-  config.repo = "112233445566.dkr.ecr.us-west-2.amazonaws.com/demo"
+  config.repo = "112233445566.dkr.ecr.us-west-2.amazonaws.com/demo" # may be gcr.io/project-123/demo
   config.logger.level = "info"
   # auto-switching
-  # config.kubectl.context = "dev-services"
+  # config.kubectl.context = "dev-cluster"
 end
 ```
 

data/docs/_reference/kubes-apply.md

@@ -5,11 +5,11 @@ reference: true
 
 ## Usage
 
-    kubes apply [APP] [RESOURCE]
+    kubes apply [ROLE] [RESOURCE]
 
 ## Description
 
-Apply the Kubernetes YAML files without changing them
+Apply the Kubernetes YAML files without building docker image
 
 
 ## Options

data/docs/_reference/kubes-delete.md

@@ -5,7 +5,7 @@ reference: true
 
 ## Usage
 
-    kubes delete [APP] [RESOURCE]
+    kubes delete [ROLE] [RESOURCE]
 
 ## Description
 

data/docs/_reference/kubes-deploy.md

@@ -5,7 +5,7 @@ reference: true
 
 ## Usage
 
-    kubes deploy [APP] [RESOURCE]
+    kubes deploy [ROLE] [RESOURCE]
 
 ## Description
 

data/docs/_reference/kubes-describe.md

@@ -0,0 +1,24 @@
+---
+title: kubes describe
+reference: true
+---
+
+## Usage
+
+    kubes describe [ROLE] [RESOURCE]
+
+## Description
+
+Describe Kubernetes resource using the compiled YAML files
+
+
+## Options
+
+```
+[--image=IMAGE]              # override image
+[--compile], [--no-compile]  # whether or not to compile the .kube/resources
+                             # Default: true
+[--verbose], [--no-verbose]  
+[--noop], [--no-noop]        
+```
+

data/docs/_reference/kubes-exec.md

@@ -0,0 +1,42 @@
+---
+title: kubes exec
+reference: true
+---
+
+## Usage
+
+    kubes exec
+
+## Description
+
+Exec into the latest container from the deployment
+
+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` option.  Examples:
+
+    kubes exec --name demo-web
+    kubes exec --name demo-clock
+    kubes exec --name demo-worker
+    kubes exec --name demo-web sh
+    kubes exec --name demo-web ls -l
+
+
+## Options
+
+```
+    [--compile], [--no-compile]  # whether or not to compile the .kube/resources
+                                 # Default: true
+n, [--name=NAME]                 # deployment name to use. IE: demo-web
+    [--verbose], [--no-verbose]  
+    [--noop], [--no-noop]        
+```
+

data/docs/_reference/kubes-get.md

@@ -0,0 +1,27 @@
+---
+title: kubes get
+reference: true
+---
+
+## Usage
+
+    kubes get [ROLE] [RESOURCE]
+
+## Description
+
+Get Kubernetes resource using the compiled YAML files
+
+
+## Options
+
+```
+    [--image=IMAGE]                  # override image
+    [--compile], [--no-compile]      # whether or not to compile the .kube/resources
+                                     # Default: true
+o, [--output=OUTPUT]                 # Output format: json|yaml|wide|name
+    [--show-pods], [--no-show-pods]  # Also show pods from deployments
+                                     # Default: true
+    [--verbose], [--no-verbose]      
+    [--noop], [--no-noop]            
+```
+

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,12 @@ 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"
+    }
+    container_option = Proc.new {
+      option :container, aliases: %w[c], desc: "Container name. If omitted, the first container in the pod will be chosen"
+    }
 
     desc "docker SUBCOMMAND", "Docker subcommands"
     long_desc Help.text(:docker)
@@ -60,15 +66,35 @@ 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
+    container_option.call
+    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
+    container_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/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/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/init.rb

@@ -6,6 +6,7 @@ class Kubes::CLI
         [:force, type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
         [:type, aliases: ["t"], default: "yaml", desc: "Type: dsl or yaml"],
         [:repo, required: true, desc: "Docker repo name. Example: user/repo. Configures .kubes/config.rb"],
+        [:namespace, aliases: ["n"], desc: "Namespace to use, defaults to the app option"],
       ]
     end
 
@@ -17,6 +18,37 @@ class Kubes::CLI
       @options[:app]
     end
 
+    def namespace
+      @options[:namespace] || @options[:app]
+    end
+
+    def excludes
+      if namespace == "default"
+        case options[:type]
+        when "dsl"
+          %w[
+            namespace.rb.tt
+          ]
+        else
+          %w[
+            all.yaml.tt
+            namespace.yaml.tt
+          ]
+        end
+      else
+        []
+      end
+    end
+
+    def directory_options
+      if excludes.empty?
+        {}
+      else
+        pattern = Regexp.new(excludes.join('|'))
+        {exclude_pattern: pattern }
+      end
+    end
+
   public
     def create_dockefile
       return if File.exist?("Dockerfile")
@@ -32,13 +64,13 @@ class Kubes::CLI
     def create_dsl_files
       return unless @options[:type] == "dsl"
       set_source("dsl")
-      directory ".", "."
+      directory ".", ".", directory_options
     end
 
     def create_yaml_files
       return if @options[:type] == "dsl"
       set_source("yaml")
-      directory ".", "."
+      directory ".", ".", directory_options
     end
 
     def message

data/lib/kubes/cli/logs.rb

@@ -0,0 +1,38 @@
+class Kubes::CLI
+  class Logs < Base
+    include Kubes::Util::Sh
+
+    def run
+      compile
+      deployment = Kubes::Kubectl::Fetch::Deployment.new(@options)
+      metadata = deployment.metadata
+      name = metadata['name']
+      ns = metadata['namespace']
+
+      follow = " -f" if @options[:follow]
+      container = container(deployment)
+      c = " -c #{container}" if container
+      sh("kubectl logs deployment/#{name}#{follow} -n #{ns}#{c}")
+    end
+
+  private
+    def container(deployment)
+      container = @options[:container]
+      return container if container
+
+      spec = deployment.spec
+      containers = spec['template']['spec']['containers']
+      names = containers.map { |c| c['name'] }
+      if containers.size > 1
+        logger.info <<~EOL
+          INFO: More than one container found.
+          Container names: #{names.join(', ')}
+          Using #{names.first}
+          Note: You can specify the container to use with --container or -c
+        EOL
+
+        names.first
+      end
+    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/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,45 @@
+module Kubes::Kubectl::Fetch
+  class Deployment < Base
+    extend Memoist
+
+    def metadata
+      deployment['metadata']
+    end
+
+    def spec
+      deployment['spec']
+    end
+
+    def deployment
+      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 or -n
+        EOL
+      end
+
+      deployment = find_deployment(deployments)
+      unless deployment
+        logger.error "ERROR: No deployment found".color(:red)
+        exit 1
+      end
+      deployment
+    end
+    memoize :deployment
+
+    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.6"
+  VERSION = "0.3.4"
 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

@@ -7,4 +7,5 @@ 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/deployment/
+# More docs: kubes.guru/docs/dsl/resources/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/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 %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.4
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -317,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
@@ -329,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
@@ -360,6 +366,7 @@ files:
 - docs/img/logos/filler-logo.png
 - docs/img/logos/kubes-black.png
 - docs/img/logos/kubes-sign.png
+- docs/img/logos/kubes-white.png
 - docs/index.html
 - docs/js/app.js
 - docs/opal/app.rb
@@ -457,12 +464,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
@@ -533,6 +543,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