kubes 0.7.10 → 0.8.3

data/lib/kubes/booter.rb

@@ -0,0 +1,26 @@
+module Kubes
+  module Booter
+    def boot
+      run_hooks
+    end
+
+    # Special boot hooks run super early, even before plugins are loaded.
+    # Useful for setting env vars and other early things.
+    #
+    #    config/boot.rb
+    #    config/boot/dev.rb
+    #
+    def run_hooks
+      run_hook
+      run_hook(Kubes.env)
+    end
+
+    def run_hook(env=nil)
+      name = env ? "boot/#{env}" : "boot"
+      path = "#{Kubes.root}/.kubes/#{name}.rb"
+      require path if File.exist?(path)
+    end
+
+    extend self
+  end
+end

data/lib/kubes/cli/init.rb

@@ -85,7 +85,6 @@ class Kubes::CLI
     def adjust_gitignore
       ignores = %w[
         .kubes/output
-        .kubes/state
         .kubes/tmp
       ].map {|l| "#{l}\n"} # the readlines will have lines with \n so keep consistent for processing
       if File.exist?(".gitignore")

data/lib/kubes/command.rb

@@ -58,7 +58,7 @@ module Kubes
 
       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)
+        return if %w[-h -v --version completion completion_script help init new version].include?(command_name)
         Kubes.check_project!
       end
 

data/lib/kubes/compiler/layering.rb

@@ -31,6 +31,15 @@ class Kubes::Compiler
         "base",
         Kubes.env.to_s
       ]
+
+      if Kubes.app
+        layers += [
+          Kubes.app,
+          "#{Kubes.app}/base",
+          "#{Kubes.app}/#{Kubes.env}",
+        ]
+      end
+
       layers = add_exts(layers)
       layers.map! do |layer|
         "#{kind_path}/#{layer}"

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

@@ -0,0 +1,35 @@
+module Kubes::Compiler::Shared::Helpers
+  module ConfigMapHelper
+    def config_map_files(options={})
+      indent = options[:indent] || 2
+
+      shared_config_map = "#{Kubes.root}/.kubes/resources/shared/config_map"
+      layers = [
+        [shared_config_map, "base.txt"],
+        [shared_config_map, "#{Kubes.env}.txt"],
+      ]
+      if Kubes.app
+        layers += [
+          [shared_config_map, Kubes.app, "base.txt"],
+          [shared_config_map, Kubes.app, "#{Kubes.env}.txt"],
+        ]
+      end
+      layers.map! { |layer| layer.compact.join('/') }
+      data = {}
+      layers.each do |path|
+        next unless File.exist?(path)
+        lines = IO.readlines(path)
+        lines.each do |line|
+          key, value = line.split('=').map(&:strip)
+          data[key] = value
+        end
+      end
+
+      spacing = " " * indent
+      lines = data.map do |key,value|
+        "#{spacing}#{key}: #{value}"
+      end
+      lines.join("\n")
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+module Kubes::Compiler::Shared::Helpers
+  module DockerHelper
+    def docker_image
+      return @options[:image] if @options[:image] # override
+      return Kubes.config.image if Kubes.config.image
+      built_image_helper
+    end
+
+    def built_image
+      Deprecated.new.built_image
+      built_image_helper
+    end
+
+    def built_image_helper
+      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
+      data = JSON.load(IO.read(path))
+      data['image']
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module Kubes::Compiler::Shared::Helpers
+  module ExtraHelper
+    def with_extra(value)
+      [value, extra].compact.join('-')
+    end
+
+    def extra
+      extra = ENV['KUBES_EXTRA']
+      extra&.strip&.empty? ? nil : extra # if blank string then also return nil
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module Kubes::Compiler::Shared::Helpers
+  module SecretHelper
+    # Meant to be used by plugins. IE:
+    # google_secret_data and aws_secret_data
+    def generic_secret_data(plugin_secret_method, name, options={})
+      indent = options[:indent] || 2
+      base64 = options[:base64].nil? ? true : options[:base64]
+
+      full_data = send(plugin_secret_method, name, base64: false)
+      spacing = " " * indent
+      lines = full_data.split("\n")
+      new_lines = lines.map do |line|
+        key, value = line.split('=')
+        value = encode64(value) if base64
+        "#{spacing}#{key}: #{value}"
+      end
+      new_lines.join("\n")
+    end
+
+    def encode64(v)
+      Base64.strict_encode64(v.to_s).strip
+    end
+    alias_method :base64, :encode64
+
+    def decode64(v)
+      Base64.strict_decode64(v)
+    end
+  end
+end

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

@@ -6,42 +6,9 @@ module Kubes::Compiler::Shared
     extend Kubes::Compiler::Dsl::Core::Fields
     fields "name"
 
-    def docker_image
-      return @options[:image] if @options[:image] # override
-      return Kubes.config.image if Kubes.config.image
-      built_image_helper
-    end
-
-    def built_image
-      Deprecated.new.built_image
-      built_image_helper
-    end
-
-    def built_image_helper
-      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
-      data = JSON.load(IO.read(path))
-      data['image']
-    end
-
-    def with_extra(value)
-      [value, extra].compact.join('-')
-    end
-
-    def extra
-      extra = ENV['KUBES_EXTRA']
-      extra&.strip&.empty? ? nil : extra # if blank string then also return nil
-    end
-
-    def encode64(v)
-      Base64.strict_encode64(v.to_s).strip
-    end
-    alias_method :base64, :encode64
-
-    def decode64(v)
-      Base64.strict_decode64(v)
-    end
+    include ConfigMapHelper
+    include DockerHelper
+    include ExtraHelper
+    include SecretHelper
   end
 end

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

@@ -68,6 +68,13 @@ module Kubes::Compiler::Shared
         "#{role}/#{kind}/base.rb",
         "#{role}/#{kind}/#{Kubes.env}.rb",
       ]
+      if Kubes.app
+        app_layers = ["#{Kubes.app}.rb"]
+        app_layers += layers.map do |path|
+          "#{Kubes.app}/#{path}"
+        end
+        layers += app_layers
+      end
 
       layers.each do |layer|
         path = "#{Kubes.root}/.kubes/variables/#{layer}"

data/lib/kubes/compiler/strategy/erb/comment.rb

@@ -0,0 +1,46 @@
+# Processes the ERB files and looks for comments like
+#
+#     #ERB if @testvar
+#     - "some yaml"
+#     #ERB end
+#
+class Kubes::Compiler::Strategy::Erb
+  class Comment
+    extend Memoist
+
+    def initialize(path)
+      @path = path
+    end
+
+    def lines
+      IO.readlines(@path)
+    end
+    memoize :lines
+
+    def process?
+      !!lines.detect { |l| l.include?('#ERB') }
+    end
+
+    def process
+      new_lines = lines.map do |line|
+        md = line.match(/(.*)#ERB(.*)/)
+        if md
+          "#{md[1]}<%#{md[2]} %>\n"
+        else
+          line
+        end
+      end
+      content = new_lines.join('')
+      IO.write(erb_path, content)
+      erb_path
+    end
+
+    def clean
+      FileUtils.rm_f(erb_path) unless ENV['KUBES_KEEP_ERB']
+    end
+
+    def erb_path
+      "#{@path}.erb"
+    end
+  end
+end

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

@@ -17,7 +17,11 @@ class Kubes::Compiler::Strategy
     def render_result(path)
       return unless File.exist?(path)
 
+      comment = Comment.new(path)
+      path = comment.process if comment.process?
       yaml = RenderMePretty.result(path, context: self)
+      comment.clean if comment.process?
+
       result = yaml_load(path, yaml)
       # in case of blank yaml doc a Boolean false is returned. else Hash or Array is returned
       %w[Array Hash].include?(result.class.to_s) ? result : {}

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

@@ -21,8 +21,20 @@ class Kubes::Compiler::Strategy
     end
 
     def content
-      result = @data.size == 1 ? @data.first : @data
+      data = filter_skip(@data)
+      return if data.empty?
+      result = data.size == 1 ? data.first : data
       yaml_dump(result)
     end
+
+    def skip?
+      content.nil?
+    end
+
+    def filter_skip(data)
+      data.reject do |item|
+        item.dig('kubes', 'skip')
+      end
+    end
   end
 end

data/lib/kubes/compiler.rb

@@ -38,6 +38,8 @@ module Kubes
     end
 
     def write(result)
+      return if config_skip?(result.filename)
+      return if result.skip?
       result.decorate!(:post)
       filename, content = result.filename, result.content
       dest = "#{Kubes.root}/.kubes/output/#{filename}"

data/lib/kubes/config.rb

@@ -18,7 +18,7 @@ module Kubes
       # Auto-switching options
       config.kubectl = ActiveSupport::OrderedOptions.new
       config.kubectl.context = nil
-      config.kubectl.context_keep = true # after switching context keep it
+      config.kubectl.context_keep = false # after switching context keep it
 
       # whether or not continue if the kubectl command fails
       config.kubectl.exit_on_fail = ActiveSupport::OrderedOptions.new
@@ -39,7 +39,7 @@ module Kubes
       config.skip = []
 
       config.state = ActiveSupport::OrderedOptions.new
-      config.state.path = "#{Kubes.root}/.kubes/state/#{Kubes.env}/data.json"
+      config.state.path = ["#{Kubes.root}/.kubes/tmp/state", Kubes.app, "#{Kubes.env}/data.json"].compact.join('/')
 
       config.suffix_hash = true # append suffix hash to ConfigMap and Secret
 
@@ -95,6 +95,10 @@ module Kubes
     def load_configs
       evaluate_file(".kubes/config.rb")
       evaluate_file(".kubes/config/env/#{Kubes.env}.rb")
+      if Kubes.app
+        evaluate_file(".kubes/config/env/#{Kubes.app}.rb")
+        evaluate_file(".kubes/config/env/#{Kubes.app}/#{Kubes.env}.rb")
+      end
       Kubes::Plugin.plugins.each do |klass|
         # klass: IE: KubesAws, KubesGoogle
         name = klass.to_s.underscore.sub('kubes_','') # kubes_google => google

data/lib/kubes/core.rb

@@ -2,6 +2,10 @@ module Kubes
   module Core
     extend Memoist
 
+    def app
+      ENV['KUBES_APP']
+    end
+
     def env
       ENV['KUBES_ENV'] || "dev"
     end

data/lib/kubes/kubectl/ordering.rb

@@ -13,20 +13,23 @@ class Kubes::Kubectl
         "#{role_i}/#{kind_i}"
       end
 
-      sorted = filter_files(sorted)
+      sorted = filter_skip(sorted)
 
       @name == "delete" ? sorted.reverse : sorted
     end
 
-    def filter_files(sorted)
-      skip = Kubes.config.skip
-      skip += ENV['KUBES_SKIP'].split(' ') if ENV['KUBES_SKIP']
-      return sorted if skip.empty?
+    def filter_skip(sorted)
       sorted.reject do |file|
-        skip.detect { |text| file.include?(text) }
+        config_skip?(file)
       end
     end
 
+    def config_skip?(file)
+      skip = Kubes.config.skip
+      skip += ENV['KUBES_SKIP'].split(' ') if ENV['KUBES_SKIP']
+      !!skip.detect { |pattern| file.include?(pattern) }
+    end
+
     # type: kinds or roles
     # value: Examples: kind: deployment, role: web
     def index_for(type, value)

data/lib/kubes/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.7.10"
+  VERSION = "0.8.3"
 end

data/lib/kubes.rb

@@ -31,3 +31,5 @@ module Kubes
   class MissingDockerImage < Error; end
   extend Core
 end
+
+Kubes::Booter.boot

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.8.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-18 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -154,30 +154,30 @@ dependencies:
   name: kubes_aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: kubes_google
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -287,9 +287,11 @@ files:
 - docs/_config.yml
 - docs/_docs/ci/cloudbuild.md
 - docs/_docs/config.md
+- docs/_docs/config/app-overrides.md
 - docs/_docs/config/args.md
 - docs/_docs/config/args/docker.md
 - docs/_docs/config/args/kubectl.md
+- docs/_docs/config/boot.md
 - docs/_docs/config/builder.md
 - docs/_docs/config/docker.md
 - docs/_docs/config/env.md
@@ -332,20 +334,34 @@ files:
 - docs/_docs/helpers/aws/advanced/secrets.md
 - docs/_docs/helpers/aws/advanced/ssm.md
 - docs/_docs/helpers/aws/iam-role.md
+- docs/_docs/helpers/aws/secret_data.md
 - docs/_docs/helpers/aws/secrets.md
 - docs/_docs/helpers/aws/ssm.md
+- docs/_docs/helpers/builtin.md
+- docs/_docs/helpers/builtin/config-map-files.md
 - docs/_docs/helpers/custom.md
 - docs/_docs/helpers/google.md
 - docs/_docs/helpers/google/advanced.md
 - docs/_docs/helpers/google/advanced/secrets.md
 - docs/_docs/helpers/google/gke.md
+- docs/_docs/helpers/google/secret_data.md
 - docs/_docs/helpers/google/secrets.md
 - docs/_docs/helpers/google/service-account.md
+- docs/_docs/install.md
+- docs/_docs/install/dependencies.md
+- docs/_docs/install/gem.md
+- docs/_docs/install/gem/custom-version.md
+- docs/_docs/install/standalone.md
+- docs/_docs/install/standalone/centos.md
+- docs/_docs/install/standalone/details.md
+- docs/_docs/install/standalone/details/permissions.md
+- docs/_docs/install/standalone/details/uninstall.md
+- docs/_docs/install/standalone/macosx.md
+- docs/_docs/install/standalone/ubuntu.md
 - docs/_docs/intro.md
 - docs/_docs/intro/concepts.md
 - docs/_docs/intro/docker-image.md
 - docs/_docs/intro/how-kubes-works.md
-- docs/_docs/intro/install.md
 - docs/_docs/intro/ordering.md
 - docs/_docs/intro/ordering/custom.md
 - docs/_docs/intro/structure.md
@@ -380,6 +396,7 @@ files:
 - docs/_docs/misc/separate-steps.md
 - docs/_docs/next-steps.md
 - docs/_docs/patterns.md
+- docs/_docs/patterns/central-deployer.md
 - docs/_docs/patterns/clock-web-worker.md
 - docs/_docs/patterns/migrations.md
 - docs/_docs/patterns/multiple-envs.md
@@ -399,11 +416,13 @@ files:
 - docs/_docs/vs/helm.md
 - docs/_docs/vs/kustomize.md
 - docs/_docs/yaml.md
+- docs/_docs/yaml/erb-comment.md
 - docs/_docs/yaml/multiple-files.md
 - docs/_docs/yaml/multiple-resources.md
 - docs/_includes/banner/foot.html
 - docs/_includes/banner/head.html
 - docs/_includes/commands.html
+- docs/_includes/config/app-overrides-cheatsheet.md
 - docs/_includes/config/hooks/generator.md
 - docs/_includes/config/hooks/options.md
 - docs/_includes/content.html
@@ -416,8 +435,9 @@ files:
 - docs/_includes/header.html
 - docs/_includes/helpers/base64.md
 - docs/_includes/helpers/generator.md
+- docs/_includes/install/gem.md
+- docs/_includes/install/wrapper.md
 - docs/_includes/intro/features.md
-- docs/_includes/intro/install.md
 - docs/_includes/js.html
 - docs/_includes/kubes-steps.md
 - docs/_includes/layering/layers.md
@@ -431,6 +451,9 @@ files:
 - docs/_includes/reference.md
 - docs/_includes/sidebar.html
 - docs/_includes/variables/generator.md
+- docs/_includes/videos/learn.md
+- docs/_includes/videos/learn/vs.md
+- docs/_includes/videos/youtube.md
 - docs/_includes/vs/article.md
 - docs/_includes/vs/kubes/layering.md
 - docs/_includes/vs/kubes/structure.md
@@ -487,6 +510,7 @@ files:
 - docs/img/logos/kubes-white.png
 - docs/index.html
 - docs/js/app.js
+- docs/js/scripts.js
 - docs/opal/app.rb
 - docs/opal/pager.rb
 - docs/opal/sidebar.rb
@@ -579,6 +603,7 @@ files:
 - lib/kubes/auth/gcr.rb
 - lib/kubes/autoloader.rb
 - lib/kubes/aws_services.rb
+- lib/kubes/booter.rb
 - lib/kubes/cli.rb
 - lib/kubes/cli/apply.rb
 - lib/kubes/cli/base.rb
@@ -644,12 +669,17 @@ files:
 - lib/kubes/compiler/dsl/syntax/service_account.rb
 - lib/kubes/compiler/layering.rb
 - lib/kubes/compiler/shared/helpers.rb
+- lib/kubes/compiler/shared/helpers/config_map_helper.rb
 - lib/kubes/compiler/shared/helpers/deprecated.rb
+- lib/kubes/compiler/shared/helpers/docker_helper.rb
+- lib/kubes/compiler/shared/helpers/extra_helper.rb
+- lib/kubes/compiler/shared/helpers/secret_helper.rb
 - lib/kubes/compiler/shared/runtime_helpers.rb
 - lib/kubes/compiler/strategy.rb
 - lib/kubes/compiler/strategy/base.rb
 - lib/kubes/compiler/strategy/dispatcher.rb
 - lib/kubes/compiler/strategy/erb.rb
+- lib/kubes/compiler/strategy/erb/comment.rb
 - lib/kubes/compiler/strategy/erb/yaml_error.rb
 - lib/kubes/compiler/strategy/pass.rb
 - lib/kubes/compiler/strategy/result.rb

data/docs/_docs/intro/install.md

@@ -1,6 +0,0 @@
----
-title: Installation
----
-
-{% include intro/install.md %}
-