kuby-core 0.11.14 → 0.11.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfd902325b0bf78437ea91ba6021ee0cc27f83c67d60a703508a8b0c5a84bc86
-  data.tar.gz: 9598df94486a386235a3566c4c0422f824c30870551251ce3f4836fc94677b39
+  metadata.gz: '03278595cc2f5eb23fcfb47a15fd8fea9aaf06546e3c9d92a71080953c3d10db'
+  data.tar.gz: 893a184f166b3bb453f96ef3529fbf65f8fef171f54a7268661645aa30834e99
 SHA512:
-  metadata.gz: 2ba1c29f18311795a39c8038940c6bc53ae6868523d520af81a52543ee6726282696f07af78b2cd8d6736ce5d0e7bc98ffd14f61693cf0b7421b7cccbbe6ea70
-  data.tar.gz: 801f401ba743d5375e59c33e1be57b6ae7767d5580e37bef0186dd2e299e7293f1a9e2e277a10b43b94977e0f982be8908e57153fb14d136a9e54aea92031fdf
+  metadata.gz: 0d0868b638c06e13db7b4353af14c6fa1d82bc143239cac4322ba3be4f723eca1a3a70c8e271ec5091afea24d088acd2b744e6b7af3347ceeddfff63eabbb285
+  data.tar.gz: f1a859ddf32f023f9c593345a50f9d11e998287ff05030117cf599920ed2c5b53ed8b54804080f7271be7b47ef9d7cfee8cfee168bf972226ec3e889e35dde60

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.11.15
+* Copy over .npmrc and .yarnrc before running yarn install.
+
 ## 0.11.14
 * Don't include port in image host for registry secrets (no idea why)
 

data/Gemfile

@@ -5,7 +5,8 @@ gemspec
 group :development, :test do
   gem 'pry-byebug'
   gem 'rake'
-  gem 'sorbet', '~> 0.5'
+  # lock to a specific version to prevent breaking CI when new versions come out
+  gem 'sorbet', '= 0.5.6397'
 end
 
 group :test do

data/bin/kuby

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
 
+$stdout.sync = true
+
 require 'kuby'
 exit Kuby::Commands.run(ARGV)

data/kuby-core.gemspec

@@ -1,4 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), 'lib')
+$:.unshift File.expand_path('lib', __dir__)
 require 'kuby/version'
 
 Gem::Specification.new do |s|

data/lib/kuby.rb

@@ -153,6 +153,7 @@ end
 
 # providers
 Kuby.register_provider(:docker_desktop, Kuby::Kubernetes::DockerDesktopProvider)
+Kuby.register_provider(:bare_metal, Kuby::Kubernetes::BareMetalProvider)
 
 # plugins
 Kuby.register_plugin(:rails_app, Kuby::Plugins::RailsApp::Plugin)

data/lib/kuby/basic_logger.rb

@@ -52,7 +52,7 @@ module Kuby
         block: T.nilable(T.proc.returns(T.untyped))
       ).void
     }
-    def fatal(progname_or_msg, &block)
+    def fatal(progname_or_msg = nil, &block)
       if block
         super(progname_or_msg) { ColorizedString[block.call].red }
       else

data/lib/kuby/cli_base.rb

@@ -7,21 +7,26 @@ module Kuby
   class CLIBase
     extend T::Sig
 
+    BeforeCallback = T.type_alias { T.proc.params(cmd: T::Array[String]).void }
+    AfterCallback = T.type_alias do
+      T.proc.params(cmd: T::Array[String], last_status: T.nilable(Process::Status)).void
+    end
+
     sig { returns(T.nilable(Process::Status)) }
     def last_status
       Thread.current[status_key]
     end
 
-    sig { params(block: T.proc.params(cmd: String).void).void }
+    sig { params(block: BeforeCallback).void }
     def before_execute(&block)
-      @before_execute = T.let(@before_execute, T.nilable(T::Array[T.proc.params(cmd: String).void]))
+      @before_execute = T.let(@before_execute, T.nilable(T::Array[BeforeCallback]))
       @before_execute ||= []
       @before_execute << block
     end
 
-    sig { params(block: T.proc.params(cmd: String).void).void }
+    sig { params(block: AfterCallback).void }
     def after_execute(&block)
-      @after_execute = T.let(@after_execute, T.nilable(T::Array[T.proc.params(cmd: String).void]))
+      @after_execute = T.let(@after_execute, T.nilable(T::Array[AfterCallback]))
       @after_execute ||= []
       @after_execute << block
     end

data/lib/kuby/docker/bundler_phase.rb

@@ -51,10 +51,6 @@ module Kuby
         dockerfile.copy(gf, '.')
         dockerfile.copy(lf, '.')
 
-        # set bundle path so docker will cache the bundle
-        dockerfile.run('mkdir', './bundle')
-        dockerfile.env('BUNDLE_PATH=./bundle')
-
         unless wo.empty?
           dockerfile.env("BUNDLE_WITHOUT='#{wo.join(' ')}'")
         end

data/lib/kuby/docker/yarn_phase.rb

@@ -8,7 +8,10 @@ module Kuby
       sig { params(dockerfile: Dockerfile).void }
       def apply_to(dockerfile)
         dockerfile.copy('package.json', '.')
-        dockerfile.copy('yarn.lock*', '.')
+        # use character classes as a hack to only copy the files if they exist
+        dockerfile.copy('yarn.loc[k]', '.')
+        dockerfile.copy('.npmr[c]', '.')
+        dockerfile.copy('.yarnr[c]', '.')
         dockerfile.run('yarn', 'install')
       end
     end

data/lib/kuby/kubernetes.rb

@@ -3,6 +3,7 @@ require 'kuby/kubernetes/errors'
 
 module Kuby
   module Kubernetes
+    autoload :BareMetalProvider,     'kuby/kubernetes/bare_metal_provider'
     autoload :Deployer,              'kuby/kubernetes/deployer'
     autoload :DeployTask,            'kuby/kubernetes/deploy_task'
     autoload :DockerConfig,          'kuby/kubernetes/docker_config'

data/lib/kuby/kubernetes/bare_metal_provider.rb

@@ -0,0 +1,41 @@
+# typed: false
+require 'kube-dsl'
+
+module Kuby
+  module Kubernetes
+    class BareMetalProvider < Provider
+      STORAGE_CLASS_NAME = 'hostpath'.freeze
+
+      class Config
+        extend ::KubeDSL::ValueFields
+
+        value_fields :kubeconfig
+      end
+
+      attr_reader :config
+
+      def configure(&block)
+        config.instance_eval(&block) if block
+      end
+
+      def kubeconfig_path
+        config.kubeconfig
+      end
+
+      def storage_class_name
+        STORAGE_CLASS_NAME
+      end
+
+      private
+
+      def after_initialize
+        @config = Config.new
+
+        configure do
+          # default kubeconfig path
+          kubeconfig File.join(ENV['HOME'], '.kube', 'config')
+        end
+      end
+    end
+  end
+end

data/lib/kuby/kubernetes/deployer.rb

@@ -2,6 +2,7 @@
 
 require 'fileutils'
 require 'securerandom'
+require 'tmpdir'
 require 'yaml'
 
 module Kuby

data/lib/kuby/plugins/rails_app/plugin.rb

@@ -380,11 +380,35 @@ module Kuby
                     init_container(:create_db) do
                       name "#{kube_spec.selector_app}-create-db"
                       command %w(bundle exec rake kuby:rails_app:db:create_unless_exists)
+
+                      env_from do
+                        config_map_ref do
+                          name kube_spec.config_map.metadata.name
+                        end
+                      end
+
+                      env_from do
+                        secret_ref do
+                          name kube_spec.app_secrets.metadata.name
+                        end
+                      end
                     end
 
                     init_container(:migrate_db) do
                       name "#{kube_spec.selector_app}-migrate-db"
                       command %w(bundle exec rake db:migrate)
+
+                      env_from do
+                        config_map_ref do
+                          name kube_spec.config_map.metadata.name
+                        end
+                      end
+
+                      env_from do
+                        secret_ref do
+                          name kube_spec.app_secrets.metadata.name
+                        end
+                      end
                     end
 
                     image_pull_secret do

data/lib/kuby/version.rb

@@ -1,5 +1,5 @@
 # typed: true
 
 module Kuby
-  VERSION = '0.11.14'.freeze
+  VERSION = '0.11.15'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-core
 version: !ruby/object:Gem::Version
-  version: 0.11.14
+  version: 0.11.15
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -255,6 +255,7 @@ files:
 - lib/kuby/docker/yarn_phase.rb
 - lib/kuby/environment.rb
 - lib/kuby/kubernetes.rb
+- lib/kuby/kubernetes/bare_metal_provider.rb
 - lib/kuby/kubernetes/deploy_task.rb
 - lib/kuby/kubernetes/deployer.rb
 - lib/kuby/kubernetes/docker_config.rb