kubes 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 717e82d009d9109cbd891aa3881a0ab645fca4388a0268b979bd80b6c65b4b5a
-  data.tar.gz: bf0fa4160bcc4592e8ec04e4aa408f36797c0486fe2265ee9aee2406b152502a
+  metadata.gz: acd8b3dbc7ee3cbefbfe9f649c00ec37c7eaefb3ea281f056b3cf720e85f68cf
+  data.tar.gz: 1f9c1ba6f9a6626343239ac267a8f8ccd3c385a09f49f48e471821db084a5ade
 SHA512:
-  metadata.gz: 459680ca83a280070c044ada5ff57a12c960e92d6c5d4a4c27f1fed9aca27047e6eb31fef3d24697be9f5f30cb745fac450062d7e0d5cdafbb37997c41f7b91f
-  data.tar.gz: 8530622fe5dd61e41c20213b11b296964c14dd5ef7a7510a5df5e6bbe51d4dc3be6dae763bac4faa3784fea1530f4680d2fb24806ed8fc08e283595b315be553
+  metadata.gz: 9b5bc20d0bd43ee19f204a4dc692b9e4c71c69a3b490575eb397583187ff2e4a401456a943ceae2c3523a8ba42f2f9456809ed538b65dd0d319c0d48fa4318db
+  data.tar.gz: 1a3b59c9a047f75acbf79be98a104c3109f6da3a6c57bed29511fe77ba537e2ceb044f3fcae800e29bbdaed171ae8653c0c0554c2b90039135d1bc93f021d94e

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 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.3]
+- #22 logs -c option. fix kubes logs for pods with multiple containers
+
 ## [0.3.2]
 - #21 add namespace to logs command
 

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/_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/lib/kubes/cli.rb

@@ -12,6 +12,9 @@ module Kubes
     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)
@@ -67,7 +70,7 @@ module Kubes
     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"
+    container_option.call
     def exec(*cmd)
       Exec.new(options.merge(cmd: cmd)).run
     end
@@ -86,6 +89,7 @@ module Kubes
     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

data/lib/kubes/cli/logs.rb

@@ -4,12 +4,34 @@ class Kubes::CLI
 
     def run
       compile
-      metadata = Kubes::Kubectl::Fetch::Deployment.new(@options).metadata
+      deployment = Kubes::Kubectl::Fetch::Deployment.new(@options)
+      metadata = deployment.metadata
       name = metadata['name']
       ns = metadata['namespace']
 
       follow = " -f" if @options[:follow]
-      sh("kubectl logs deployment/#{name}#{follow} -n #{ns}")
+      c = container(deployment)
+      sh("kubectl logs deployment/#{name}#{follow} -n #{ns} -c #{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/kubectl/fetch/deployment.rb

@@ -1,6 +1,16 @@
 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" }
@@ -20,8 +30,9 @@ module Kubes::Kubectl::Fetch
         logger.error "ERROR: No deployment found".color(:red)
         exit 1
       end
-      deployment['metadata']
+      deployment
     end
+    memoize :deployment
 
     def find_deployment(deployments)
       if @options[:name]

data/lib/kubes/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport