kuby-core 0.11.10 → 0.11.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0828619de266c13d61f0eafc6ce902d1500e07af158337439eba6f45415594c3'
-  data.tar.gz: e296dc5858fe83e8eb9626d674a8c79a0e033559b168ee414d6afbf2f37f5b9e
+  metadata.gz: '03278595cc2f5eb23fcfb47a15fd8fea9aaf06546e3c9d92a71080953c3d10db'
+  data.tar.gz: 893a184f166b3bb453f96ef3529fbf65f8fef171f54a7268661645aa30834e99
 SHA512:
-  metadata.gz: d215cfb16bdd4e784500c1c22364bdd086cf059c38a9696626ffc774158e803b9f72337de4eda09719b26d505c83e1bba533e8e49acc1dddd1304b27f3558d2b
-  data.tar.gz: 6002bd6ee7a7cdd4d2568658fb8bdf8a9d8f42a19fa51ec846ceef5f35b458e9550d80e38aad168e2ce35e15bc91256570df160f1fec6d9cf763de362528ac04
+  metadata.gz: 0d0868b638c06e13db7b4353af14c6fa1d82bc143239cac4322ba3be4f723eca1a3a70c8e271ec5091afea24d088acd2b744e6b7af3347ceeddfff63eabbb285
+  data.tar.gz: f1a859ddf32f023f9c593345a50f9d11e998287ff05030117cf599920ed2c5b53ed8b54804080f7271be7b47ef9d7cfee8cfee168bf972226ec3e889e35dde60

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 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)
+
+## 0.11.13
+* Include port in image host.
+
+## 0.11.12
+* Revamp Docker URL parsing
+  - Docker URLs shouldn't have a scheme.
+
+## 0.11.11
+* Add support for a Docker registry running on localhost.
+  - Correctly parse and handle URLs with specific ports.
+  - Only perform a Docker login if a username is provided.
+
 ## 0.11.10
 * Fix spelling in error message.
 

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|
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.add_dependency 'colorize', '~> 0.8'
-  s.add_dependency 'docker-remote', '~> 0.1'
+  s.add_dependency 'docker-remote', '~> 0.5'
   s.add_dependency 'gli', '~> 2.0'
   s.add_dependency 'helm-cli', '~> 0.3'
   # See: https://github.com/Shopify/krane/pull/720

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.rb

@@ -14,6 +14,7 @@ module Kuby
     autoload :DevSpec,        'kuby/docker/dev_spec'
     autoload :Distro,         'kuby/docker/distro'
     autoload :Dockerfile,     'kuby/docker/dockerfile'
+    autoload :DockerURI,      'kuby/docker/docker_uri'
     autoload :InlineLayer,    'kuby/docker/inline_layer'
     autoload :Layer,          'kuby/docker/layer'
     autoload :LayerStack,     'kuby/docker/layer_stack'

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/docker_uri.rb

@@ -0,0 +1,34 @@
+# typed: false
+
+module Kuby
+  module Docker
+    class DockerURI
+      DEFAULT_REGISTRY_HOST = 'index.docker.io'.freeze
+      DEFAULT_REGISTRY_PORT = 443
+
+      def self.parse(url)
+        if idx = url.index('://')
+          url = url[(idx + 3)..-1] || ''
+        end
+
+        host_port, *path = url.split('/')
+        host, port, *path = if host_port =~ /[.:]/
+          hst, prt = host_port.split(':')
+          [hst, prt || DEFAULT_REGISTRY_PORT, *path]
+        else
+          [DEFAULT_REGISTRY_HOST, DEFAULT_REGISTRY_PORT, host_port, *path]
+        end
+
+        new(host, port.to_i, path.join('/'))
+      end
+
+      attr_reader :host, :port, :path
+
+      def initialize(host, port, path)
+        @host = host
+        @port = port
+        @path = path
+      end
+    end
+  end
+end

data/lib/kuby/docker/metadata.rb

@@ -8,8 +8,6 @@ module Kuby
       extend T::Sig
 
       DEFAULT_DISTRO = :debian
-      DEFAULT_REGISTRY_HOST = T.let('https://index.docker.io'.freeze, String)
-      DEFAULT_REGISTRY_SCHEME = T.let('https', String)
       LATEST_TAG = T.let('latest'.freeze, String)
 
       sig { params(image_url: String).void }
@@ -28,7 +26,7 @@ module Kuby
         @image_hostname = T.let(@image_hostname, T.nilable(String))
         @image_repo = T.let(@image_repo, T.nilable(String))
         @distro = T.let(@distro, T.nilable(Symbol))
-        @full_image_uri = T.let(@full_image_uri, T.nilable(URI::Generic))
+        @full_image_uri = T.let(@full_image_uri, T.nilable(DockerURI))
         @default_image_url = T.let(@default_image_url, T.nilable(String))
         @default_tags = T.let(@default_tags, T.nilable(T::Array[String]))
       end
@@ -40,17 +38,17 @@ module Kuby
 
       sig { returns(String) }
       def image_host
-        @image_host ||= "#{full_image_uri.scheme}://#{full_image_uri.host}"
+        @image_host ||= "#{full_image_uri.host}:#{full_image_uri.port}"
       end
 
       sig { returns(String) }
       def image_hostname
-        @image_hostname ||= T.must(URI(image_host).host)
+        @image_hostname ||= full_image_uri.host
       end
 
       sig { returns(String) }
       def image_repo
-        @image_repo ||= T.must(full_image_uri.path).sub(/\A[\/]+/, '')
+        @image_repo ||= full_image_uri.path
       end
 
       sig { returns(T::Array[String]) }
@@ -70,15 +68,9 @@ module Kuby
 
       private
 
-      sig { returns(URI::Generic) }
+      sig { returns(DockerURI) }
       def full_image_uri
-        @full_image_uri ||= if image_url.include?('://')
-          URI.parse(image_url)
-        elsif image_url =~ /\A[^.]+\.[^\/]+\//
-          URI.parse("#{DEFAULT_REGISTRY_SCHEME}://#{image_url}")
-        else
-          URI.parse("#{DEFAULT_REGISTRY_HOST}/#{image_url.sub(/\A[\/]+/, '')}")
-        end
+        @full_image_uri ||= DockerURI.parse(image_url)
       end
 
       sig { returns(String) }
@@ -93,15 +85,6 @@ module Kuby
           TimestampTag.new(Time.now).to_s, LATEST_TAG
         ]
       end
-
-      sig { params(url: String).returns(URI::Generic) }
-      def parse_url(url)
-        uri = URI.parse(url)
-        return uri if uri.scheme
-
-        # force a scheme because URI.parse won't work properly without one
-        URI.parse("#{DEFAULT_REGISTRY_SCHEME}://#{url}")
-      end
     end
   end
 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/kubernetes/spec.rb

@@ -152,7 +152,7 @@ module Kuby
             end
 
             docker_config do
-              registry_host spec.docker.metadata.image_host
+              registry_host spec.docker.metadata.image_hostname
               username spec.docker.credentials.username
               password spec.docker.credentials.password
               email spec.docker.credentials.email

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/tasks.rb

@@ -41,10 +41,10 @@ module Kuby
         fail 'Cannot push Docker images built for the development environment'
       end
 
-      hostname = docker.metadata.image_hostname
+      host = docker.metadata.image_host
 
-      unless docker.cli.auths.include?(hostname)
-        Kuby.logger.info("Attempting to log in to registry at #{hostname}")
+      if docker.credentials.username && !docker.cli.auths.include?(host)
+        Kuby.logger.info("Attempting to log in to registry at #{host}")
 
         begin
           docker.cli.login(
@@ -53,7 +53,7 @@ module Kuby
             password: docker.credentials.password
           )
         rescue Kuby::Docker::LoginError => e
-          Kuby.logger.fatal("Couldn't log in to the registry at #{hostname}")
+          Kuby.logger.fatal("Couldn't log in to the registry at #{host}")
           Kuby.logger.fatal(e.message)
           return
         end

data/lib/kuby/version.rb

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

data/spec/docker/metadata_spec.rb

@@ -19,18 +19,18 @@ describe Kuby::Docker::Metadata do
   describe '#image_host' do
     subject { metadata.image_host }
 
-    it { is_expected.to eq(described_class::DEFAULT_REGISTRY_HOST) }
+    it { is_expected.to eq("#{Kuby::Docker::DockerURI::DEFAULT_REGISTRY_HOST}:443") }
 
     context 'when the image URL contains an explicit host' do
       let(:docker_image_url) { 'registry.foo.com/foo/testapp' }
 
-      it { is_expected.to eq('https://registry.foo.com') }
+      it { is_expected.to eq('registry.foo.com:443') }
     end
 
-    context 'when the image URL contains an explicit host with scheme' do
+    context 'when the image URL contains an explicit host' do
       let(:docker_image_url) { 'http://registry.foo.com/foo/testapp' }
 
-      it { is_expected.to eq('http://registry.foo.com') }
+      it { is_expected.to eq('registry.foo.com:443') }
     end
   end
 
@@ -46,18 +46,6 @@ describe Kuby::Docker::Metadata do
     end
   end
 
-  describe '#image_hostname' do
-    subject { metadata.image_hostname }
-
-    it { is_expected.to eq('index.docker.io') }
-
-    context 'when the image URL contains an explicit host' do
-      let(:docker_image_url) { 'registry.foo.com/foo/testapp' }
-
-      it { is_expected.to eq('registry.foo.com') }
-    end
-  end
-
   describe '#tags' do
     subject { metadata.tags }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-core
 version: !ruby/object:Gem::Version
-  version: 0.11.10
+  version: 0.11.15
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-01 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +230,7 @@ files:
 - lib/kuby/docker/debian.rb
 - lib/kuby/docker/dev_spec.rb
 - lib/kuby/docker/distro.rb
+- lib/kuby/docker/docker_uri.rb
 - lib/kuby/docker/dockerfile.rb
 - lib/kuby/docker/errors.rb
 - lib/kuby/docker/inline_layer.rb
@@ -254,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