kubes 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2481a18249c348869a45a16c59ab5718f7e0e0eabb0ad5d613720e162b0b6150
-  data.tar.gz: baab953af69e63ee3697dc995abdac3a49e734d825d4b60dbe253618c0adea69
+  metadata.gz: edae65d07f29eedd785441b4c1d125d26639fb6f19cf1b70df170bcd76c2cf15
+  data.tar.gz: 40ac1292d4b6913b650f418733f84506084ffb183841c69881103a882b7edf8a
 SHA512:
-  metadata.gz: db322cd2a2c7154f56f6980b2e76319d211ad84290d8d5fbf1ce11e502b65260a2f7b9202636cf59d9a03a25ed84d96024598e97117a465679383cd733679cce
-  data.tar.gz: 67e8ad348fd9bebc223c2b83c038c74999f7e1afc573fe94a989b161f7f1fde6cd35410b9fb120497dd93f565009f0793d6d8bc8208721f0aefd98324d4d6ed4
+  metadata.gz: d77eefb3b34963ff4b1441b274051f009123aca06295fbe31f42e755d06a601f86ebc335140714fd1b638e37181d3a4397e0164ec4fa8c3f6b8c89664a2d96e4
+  data.tar.gz: 674d50dd8e780b9aa751fc1fac16831a1bdb431e80a306ffd61552d075aa6e5bcbe644f868b2f8273f0df5a6a20ef91eb35f002384b0767dbf2b3c1024cc870c

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.3] - 2022-10-20
+- [#69](https://github.com/boltops-tools/kubes/pull/69) improve config map multiple files support
+
+## [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
 

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/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/shared/helpers/config_map_helper.rb

@@ -2,8 +2,13 @@ module Kubes::Compiler::Shared::Helpers
   module ConfigMapHelper
     def config_map_files(options={})
       indent = options[:indent] || 2
+      # /path/to/app/.kubes/resources/shared/config_map.yaml:7:in `__tilt_4660'
+      line = caller[0]
+      path = line.split(':').first
+      basename = File.basename(path).sub(/.erb$/,'').sub(/.yaml$/, '').sub(/.rb$/, '')
+      filename = options[:name] || basename
 
-      shared_config_map = "#{Kubes.root}/.kubes/resources/shared/config_map"
+      shared_config_map = "#{Kubes.root}/.kubes/resources/shared/#{filename}"
       layers = [
         [shared_config_map, "base.txt"],
         [shared_config_map, "#{Kubes.env}.txt"],

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.1"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2022-10-20 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