kubes 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5e5ce606ff32f7d8083b1c8d6bdff1745700ec971ce7bc0a13a72b5ab370e2a
-  data.tar.gz: 2ff9e9cee9c77e227157ffd701504baf4831b2ed66678db7a7b5248303bc02cb
+  metadata.gz: 3a5b3cde73260cb3fdcb98eb32357de95112ebb253ec38c82ee14828253cf704
+  data.tar.gz: 7251020f3a8c71c09f0cbcb6ed05fa801201a133064a6522df7f6ad439cfef24
 SHA512:
-  metadata.gz: 5af79490b1ce56d61a08fcbd2d4c05d442d0b965a030c9ef3a95b74b8276a368065b9d3d340344920e2b5a38e77161be904b11755c55a17e351ce04b891f7725
-  data.tar.gz: cd83c382860483bbbb9c3a4d462def4e8551dc80a8453d171918190bcd82f9cdd4bef351cbaa1a8222cd1dd3ad6e53d128d279a23cee03636142104b6b923192
+  metadata.gz: f9ee9fbfcae307f81105f48cdd69a8a86f120d464d5ec7c1b8d02fc54ebac0e9a033fc3da8ecf46d72f1b96f2b0b86da39046392de533321ae385c20e5eb49ae
+  data.tar.gz: 67434cdf1ea6a0babb94da14369f332950a55394f46b89616fa41e6dc10c8a99fe6562ad25e01b069f31e99411e5e1581fd29fd5021b1a394289670956c5ed15

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 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.7.2] - 2020-12-04
+- [#43](https://github.com/boltops-tools/kubes/pull/43) store docker image name in env based folder
+- fix kubes help
+
 ## [0.7.1] - 2020-11-16
 - [#42](https://github.com/boltops-tools/kubes/pull/42) load helpers for dsl properly
 - fix merge layer

data/docs/_docs/config/reference.md

@@ -18,5 +18,5 @@ logger.level | Logger level. Can also be set with `KUBES_LOG_LEVEL` env var | in
 repo | The Docker repo to use. Required to be set. | nil
 repo_auto_auth | Whether or not to try to auth authorize docker repo registry if not yet logged in. Can also be set with env var `KUBES_REPO_AUTO_AUTO` | true
 skip | List of resources to skip. Can also be set with the `KUBES_SKIP` env var. `KUBES_SKIP` should be a list of strings separated by spaces. It adds onto the `config.skip` option. | []
-state.docker_image_path | Where to store the state file with the last build Docker image. | .kubes/state/docker_image.txt
+state.path | Where to store the state file with the last build Docker image. | .kubes/state/KUBES_env/data.json
 suffix_hash | Whether or not to append suffix hash to ConfigMap and Secret | true

data/docs/_docs/intro/docker-image.md

@@ -16,7 +16,7 @@ Kubes uses the image from the `--image` option if specified. It's a quick way to
 
     kubes deploy --image repo/image:tag
 
-When the `--image` option is set, Kubes skips the Docker build phase.
+When the `--image` option is set, Kubes skips the Docker build phase. You can also set `config.image = false` to simply disable image building.
 
 ## 2. Kubes Config
 
@@ -30,7 +30,7 @@ Kubes.configure do |config|
 end
 ```
 
-When `config.image` is set, Kubes skips the Docker build phase.
+When `config.image` is set, Kubes skips the Docker build phase. You can also set `config.image = false` to simply disable image building.
 
 ## 3. Built Docker Image
 

data/docs/_docs/patterns/multiple-envs.md

@@ -1,14 +1,14 @@
 ---
-title: Multiple Enviroments with Layering
-nav_text: Multiple Enviroments
+title: Multiple Environments with Layering
+nav_text: Multiple Environments
 categories: patterns
 ---
 
-You can use Kubes to easily create multiple enviroments with the same YAML configs.  This is thanks to [Kubes Layering]({% link _docs/layering.md %}). We'll walk through an example to help understand how it works.
+You can use Kubes to easily create multiple environments with the same YAML configs.  This is thanks to [Kubes Layering]({% link _docs/layering.md %}). We'll walk through an example to help understand how it works.
 
-## Creating Multiple Enviroments
+## Creating Multiple Environments
 
-To create multiple enviroments like dev and prod just change KUBES_ENV. Example:
+To create multiple environments like dev and prod just change KUBES_ENV. Example:
 
     KUBES_ENV=dev  kubes deploy
     KUBES_ENV=prod kubes deploy
@@ -17,7 +17,7 @@ Different env files will be layered and merged to produce YAML files specific to
 
 ## Project Structure
 
-Here's an example structure, so we can understand how layering works to create multiple enviroments.
+Here's an example structure, so we can understand how layering works to create multiple environments.
 
     .kubes/resources/
     ├── base

data/docs/_docs/yaml/multiple-resources.md

@@ -78,12 +78,12 @@ Multiple resources layering structure.
 
     .kubes/resources/
     ├── base
-    │   ├── all.rb         # SINGULAR
-    │   └── deployment.rb  # SINGULAR
+    │   ├── all.yaml         # SINGULAR
+    │   └── deployment.yaml  # SINGULAR
     └── web
-        ├── deployments    # PLURAL
-        │   ├── dev.rb     # SINGULAR
-        │   └── prod.rb    # SINGULAR
-        └── deployments.rb # PLURAL
+        ├── deployments      # PLURAL
+        │   ├── dev.yaml     # SINGULAR
+        │   └── prod.yaml    # SINGULAR
+        └── deployments.yaml # PLURAL
 
 The main difference is the pluralized filenames.

data/lib/kubes/cli/compile.rb

@@ -16,7 +16,7 @@ class Kubes::CLI
 
     # auto build docker image and push image if kubes docker build not yet called
     def build_docker_image
-      return if File.exist?("#{Kubes.root}/.kubes/state/docker_image.txt")
+      return if File.exist?(Kubes.config.state.path)
       Build.new(@options).run
     end
   end

data/lib/kubes/command.rb

@@ -57,6 +57,7 @@ module Kubes
       end
 
       def check_project!(command_name)
+        return if command_name.nil?
         return if %w[-h -v completion completion_script help init new version].include?(command_name)
         Kubes.check_project!
       end

data/lib/kubes/compiler/shared/helpers.rb

@@ -1,4 +1,5 @@
 require "base64"
+require "json"
 
 module Kubes::Compiler::Shared
   module Helpers
@@ -17,11 +18,12 @@ module Kubes::Compiler::Shared
     end
 
     def built_image_helper
-      path = Kubes.config.state.docker_image_path
+      path = Kubes.config.state.path
       unless File.exist?(path)
         raise Kubes::MissingDockerImage.new("Missing file with docker image built by kubes: #{path}. Try first running: kubes docker build")
       end
-      IO.read(path)
+      data = JSON.load(IO.read(path))
+      data['image']
     end
 
     def with_extra(value)

data/lib/kubes/config.rb

@@ -39,7 +39,7 @@ module Kubes
       config.skip = []
 
       config.state = ActiveSupport::OrderedOptions.new
-      config.state.docker_image_path = "#{Kubes.root}/.kubes/state/docker_image.txt"
+      config.state.path = "#{Kubes.root}/.kubes/state/#{Kubes.env}/data.json"
 
       config.suffix_hash = true # append suffix hash to ConfigMap and Secret
 

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

@@ -1,3 +1,5 @@
+require "json"
+
 module Kubes::Docker::Strategy
   module ImageName
     extend Memoist
@@ -13,12 +15,13 @@ module Kubes::Docker::Strategy
     # Only when a new docker build command gets run will the image name state be updated.
     def store_image_name
       FileUtils.mkdir_p(File.dirname(image_state_path))
-      IO.write(image_state_path, @@image_name)
+      text = JSON.pretty_generate(image: @@image_name)
+      IO.write(image_state_path, text)
     end
 
     # output can get entirely wiped so dont use that folder
     def image_state_path
-      Kubes.config.state.docker_image_path
+      Kubes.config.state.path
     end
 
     # full_image - Includes the tag. Examples:
@@ -33,7 +36,8 @@ module Kubes::Docker::Strategy
         logger.error "ERROR: Unable to find #{image_state_path} which contains the last docker image name built with kubes build.  Please run `kubes docker build` first."
         exit 1
       end
-      IO.read(image_state_path).strip
+      data = JSON.load(IO.read(image_state_path))
+      data['image']
     end
 
     @@timestamp = Time.now.strftime('%Y-%m-%dT%H-%M-%S')

data/lib/kubes/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

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