kubes 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db6959c3513133da9d5340dc8c332e15f86be47e5f72d47188243fafb21b3bd0
-  data.tar.gz: 94762322cb38b47c1d4167060545012dd6416515628801efdd969fc8dd189b91
+  metadata.gz: 895d21705a31fe0ae39b31e41f8896067315d73ddd85f560b6432ff995b8046e
+  data.tar.gz: f15fa3e3aae9a06b92be81e99ff7c5f3db3b885979df789339ffb0b5b6beb45e
 SHA512:
-  metadata.gz: 9a506b81df303fd915146596f792fcbd6b0ede5b93c81d6bcd75f0fa3123a47129086969decef3d44b273e6740d518facf91053c8f10e61ad3de6698c673a0e9
-  data.tar.gz: f2ddb1238b542b0279069a5b7417d4ed458384729cdd3859511b55222161c6443131ade97534f91fe19df9f20fae3074943a40120a3470bbf91142cd8d419a89
+  metadata.gz: be41b9ed48ede64f2574952be9e3b31fa8817a475780c27bda5159ea7e6ff3e01d8705d6bd3cb6cf98fb10d29a50dde470416a9da70bc5583c3f23f1f0614786
+  data.tar.gz: a5c9c3800ad8860779ed1e6eaefb37ea530e279ba20b0358cb5290c3a8513ecb2753dd4db4b622d832d98a7f7169fc5de49a3d06130d76341094d4c9b959a412

data/CHANGELOG.md

@@ -3,6 +3,13 @@
 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.9.2] - 2022-10-10
+- [#68](https://github.com/boltops-tools/kubes/pull/68) kubes docker name
+- KUBES_IMAGE_TAG env var override ability
+
+## [0.9.1] - 2022-08-24
+- [#67](https://github.com/boltops-tools/kubes/pull/67) small improvement to show layering: show compiled output path
+
 ## [0.9.0] - 2022-08-24
 - [#66](https://github.com/boltops-tools/kubes/pull/66) show layering improvements: show resource layers also
 - only show error if exit_on_fail

data/docs/_docs/config/reference.md

@@ -7,6 +7,7 @@ Name | Description | Default
 auto_prune | Prune and delete old hashed resources like Secret and ConfigMap. | true
 builder | What docker build command to use. Can use `docker` or `gcloud` to build the Docker image. | docker
 image | Set a prebuilt Docker image to use. This is optional. Usually, you want to build an image from the Dockerfile.  Setting this will change the `docker_image` helper to use a predefined image. See: [Docker Image]({% link _docs/intro/docker-image.md %}) | nil
+image_tag | Normally, kubes will generate an image tag name. You can explicitly set it instead. IE: `latest` | nil
 kubectl.context | What kubectl context to auto-switch to. | nil
 kubectl.context_keep | Whether or not to keep the context switched | false
 kubectl.exit_on_fail.apply  | Whether or not continue if the `kubectl apply` fails. Note, can use `KUBES_EXIT_ON_FAIL=0` env var to set to false. | true

data/docs/_docs/layering/debug.md

@@ -8,7 +8,11 @@ Kube's Layering abilities are so powerful that they can be difficult to debug wh
 
 ## Enable Logging
 
-You can debug layers by turning a config to show the **found** layers. Currently, only variables layering is shown.
+You can debug layers by setting `KUBES_LAYERING_SHOW=1`.
+
+    export KUBES_LAYERING_SHOW=1
+
+You can also turn on show layering with a config.
 
 .kubes/config.rb
 
@@ -21,13 +25,13 @@ end
 This will show the **found** layers.
 
     $ kubes compile
-    Compiling .kubes/resources/shared/namespace.yaml
-        .kubes/variables/base.rb
-        .kubes/variables/dev.rb
     Compiling .kubes/resources/web/deployment.yaml
-        .kubes/variables/base.rb
-        .kubes/variables/dev.rb
-    Compiling .kubes/resources/web/service.yaml
+        Resource layers:
+        .kubes/resources/base/all.yaml
+        .kubes/resources/base/deployment.yaml
+        .kubes/resources/web/deployment.yaml
+        .kubes/resources/web/deployment/dev.yaml
+        Variables layers:
         .kubes/variables/base.rb
         .kubes/variables/dev.rb
 
@@ -37,18 +41,12 @@ If you want to also see all the considered layers use `KUBES_LAYERING_SHOW_ALL=1
 
     $ export KUBES_LAYERING_SHOW_ALL=1
     Compiling .kubes/resources/web/deployment.yaml
-    Rendering .kubes/resources/web/deployment.yaml
-        .kubes/variables/base.rb
-        .kubes/variables/dev.rb
-        .kubes/variables/base/all.rb
-        .kubes/variables/base/all/dev.rb
-        .kubes/variables/base/deployment.rb
-        .kubes/variables/base/deployment/base.rb
-        .kubes/variables/base/deployment/dev.rb
-        .kubes/variables/web/deployment.rb
-        .kubes/variables/web/deployment/base.rb
-        .kubes/variables/web/deployment/dev.rb
-    Rendering .kubes/resources/base/all.yaml
+        Resource layers:
+        .kubes/resources/base/all.yaml
+        .kubes/resources/base/deployment.yaml
+        .kubes/resources/web/deployment.yaml
+        .kubes/resources/web/deployment/dev.yaml
+        Variables layers:
         .kubes/variables/base.rb
         .kubes/variables/dev.rb
         .kubes/variables/base/all.rb

data/lib/kubes/cli/docker.rb

@@ -9,7 +9,25 @@ class Kubes::CLI
       push if options[:push]
     end
 
-    desc "push IMAGE", "Push the docker image."
+    desc "name", "Print the full docker image with tag that was last generated."
+    long_desc Help.text("docker:name")
+    option :name, type: :boolean, default: false
+    def name
+      builder = Kubes::Docker.new(options, "build")
+      name = builder.read_image_name
+      if name
+        puts name
+      else
+        $stderr.puts(<<~EOL)
+          WARN: docker image has not yet been built. Please first run:
+
+              kubes docker build
+
+        EOL
+      end
+    end
+
+    desc "push", "Push the docker image."
     long_desc Help.text("docker:push")
     option :push, type: :boolean, default: false
     def push

data/lib/kubes/compiler/strategy/dispatcher.rb

@@ -8,6 +8,7 @@ class Kubes::Compiler::Strategy
         hash = Kubes.deep_merge!(pre_layer, main)
         Kubes.deep_merge!(hash, post_layer)
       end
+      logger.info "Compiled .kubes/output/#{@save_file}" if Kubes.config.layering.show
       Result.new(@save_file, data)
     end
 

data/lib/kubes/compiler.rb

@@ -24,7 +24,7 @@ module Kubes
 
       write_full
 
-      logger.info "Compiled  .kubes/resources files to .kubes/output" if show_compiled_message?
+      logger.info "Compiled .kubes/resources files to .kubes/output" if show_compiled_message?
     end
 
     def resources
@@ -51,7 +51,7 @@ module Kubes
         IO.write(dest, content)
       end
 
-      logger.debug "Compiled  #{pretty(dest)}"
+      logger.debug "Written  #{pretty(dest)}"
     end
 
     def write_full
@@ -62,7 +62,7 @@ module Kubes
       path = "#{Kubes.root}/.kubes/tmp/full.yaml" # write to tmp instead of output so it doesnt interfere with kubes get
       FileUtils.mkdir_p(File.dirname(path))
       IO.write(path, content)
-      logger.debug "Compiled  #{pretty(path)}"
+      logger.debug "Written  #{pretty(path)}"
     end
 
     def show_compiled_message?

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

@@ -19,6 +19,12 @@ module Kubes::Docker::Strategy
       IO.write(image_state_path, text)
     end
 
+    def read_image_name
+      return unless File.exist?(image_state_path)
+      data = IO.read(image_state_path).strip
+      JSON.load(data)['image']
+    end
+
     # output can get entirely wiped so dont use that folder
     def image_state_path
       Kubes.config.state.path
@@ -43,7 +49,8 @@ module Kubes::Docker::Strategy
     @@timestamp = Time.now.strftime('%Y-%m-%dT%H-%M-%S')
     def generate_name
       # IE: tongueroo/demo:kubes-
-      ["#{repo}:kubes-#{@@timestamp}", git_sha].compact.join('-')
+      tag = ENV['KUBES_IMAGE_TAG'] || Kubes.config.image_tag || ["kubes-#{@@timestamp}", git_sha].compact.join('-')
+      "#{repo}:#{tag}"
     end
 
     def repo

data/lib/kubes/docker.rb

@@ -15,5 +15,8 @@ module Kubes
       klass_name = "Kubes::Docker::Strategy::#{@name.camelize}::#{strategy}"
       klass_name.constantize
     end
+
+    # For `kubes docker image` and read_image_name method
+    include Kubes::Docker::Strategy::ImageName
   end
 end

data/lib/kubes/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.9.0"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2022-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -855,7 +855,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.12
+rubygems_version: 3.3.21
 signing_key: 
 specification_version: 4
 summary: 'Kubernetes Deployment Tool: build docker image, compile Kubernetes YAML