kuby-core 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfe201dc901e8ae1b43121cb2652343f8db33893a6da69d783715cc7f320e2d2
-  data.tar.gz: 452b7119e76ee461f93729aa70999d51a5b1f77bc7b3af5c4935ebd863f2e526
+  metadata.gz: ac73b245f1fb75244ed166e23a6441cc56dabaec66f532f67517b4dd8d412091
+  data.tar.gz: 6418a3fbca89fdc195e277aeb8309caa2b519e1d3df0fccd53f3ae8b2e9f166f
 SHA512:
-  metadata.gz: 2944a9ea28ee31b4763d2cbbe2db04cc9009526919ef8a25b8513fbf2fdfbf72e5356ee94969b4623fc208e3b7bc527d1423e68d39447e500c0a2bd8b93867ca
-  data.tar.gz: 6259dd452e62337c01d1d301a0adc0fedb394c6a667e7f51a5cece1cf5464654708ba9ca56783aed610067e6b6a86131f8d7cb9371de51202e0f867610d66f15
+  metadata.gz: 6f7bc8616cfdf23805bf9177198f62888b17372ae67b4fb4a77c4d325adbbcf6d734385edb0614094be95bb443d84b28f6d79fe70a8acaecdfb44b547bcf86b0
+  data.tar.gz: 815fd1ae302c35fdd0fb31f43bb1d607073a9cfb1f24d3c849578b0b8a5271bca5cbe49f2747bdf7bb22d1a4b98d1fa455c3a917e7d27f059f5a4778da215f87

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 0.8.0
+* Upgrade to Krane >= 1.1.4, < 2.0.
+* Remove Krane monkeypatch in ext/.
+* Implement a Rails static asset server.
+* Move plugins from `Kuby::Kubernetes` namespace to `Kuby` namespace.
+  - This is to eventually enable plugins to modify the Dockerfile and introduce additional Dockerfiles (i.e. to enable a development mode, etc).
+* Pass `Environment` instead of `Definition` instances around.
+  - Providers, plugins, etc all take `Definition` instances. `Definition#kubernetes`, for example, returns the Kubernetes spec for the `Environment` specified by `KUBY_ENV` (or the first env defined if `KUBY_ENV` is not set). This is a problem for Kuby configs that specify multiple environments, and causes plugins to make changes to the default environment instead of the one they've been specifically added to. For example, if the `:production` env is defined first, the `:development` env still gets a cluster issuer from cert-manager even though `enable_tls` is set to `false`.
+
+## 0.7.2
+* Fix issue causing `Kuby.environment(...)` to raise an `UndefinedEnvironmentError` for existing environments.
+
+## 0.7.1
+* Fix timestamp tag parsing regression caused by adding anchor tags to the regex.
+  - Instead, let's rely on `strptime` and return `nil` if it throws an `ArgumentError`.
+
+## 0.7.0
+* Automatically perform `docker login` if not already logged into the Docker registry.
+* Fix timestamp tag parsing issue causing deploy to fail with no available tags.
+  - Issue turned out to be ignoring the month of October in the validation regex.
+
+## 0.6.1
+* Fix issue causing database.yml to not be rewritten to point at correct database host.
+
 ## 0.6.0
 * Don't load the Rails environment when running Kuby's rake tasks.
   - Kuby's gems are still part of the bundle, but config has been moved out of the initializer and into kuby.rb in the Rails root directory.

data/kuby-core.gemspec

@@ -14,14 +14,18 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'colorize', '~> 0.8'
   s.add_dependency 'docker-remote', '~> 0.1'
-  s.add_dependency 'krane', '~> 1.0'
-  s.add_dependency 'kuby-cert-manager', '~> 0.2'
+  # See: https://github.com/Shopify/krane/pull/720
+  # See: https://github.com/Shopify/krane/blob/master/CHANGELOG.md#114
+  s.add_dependency 'krane', '>= 1.1.4', '< 2.0'
+  s.add_dependency 'kuby-cert-manager', '>= 0.3'
   s.add_dependency 'kube-dsl', '~> 0.3'
-  s.add_dependency 'kuby-kube-db', '~> 0.4'
+  s.add_dependency 'kuby-kube-db', '>= 0.5'
   s.add_dependency 'kubernetes-cli', '~> 0.2'
   s.add_dependency 'railties', '>= 5.1'
   s.add_dependency 'rouge', '~> 3.0'
 
+  s.add_development_dependency 'rspec'
+
   s.require_path = 'lib'
 
   s.files = Dir['{lib,spec}/**/*', 'Gemfile', 'LICENSE', 'CHANGELOG.md', 'README.md', 'Rakefile', 'kuby-core.gemspec']

data/lib/kuby.rb

@@ -1,7 +1,7 @@
 require 'kuby/railtie'
 
 begin
-  require 'kuby/kubernetes/plugins/rails_app/generators/kuby'
+  require 'kuby/plugins/rails_app/generators/kuby'
 rescue NameError
 end
 
@@ -13,6 +13,8 @@ module Kuby
   autoload :Environment,  'kuby/environment'
   autoload :Kubernetes,   'kuby/kubernetes'
   autoload :Middleware,   'kuby/middleware'
+  autoload :Plugin,       'kuby/plugin'
+  autoload :Plugins,      'kuby/plugins'
   autoload :Tasks,        'kuby/tasks'
   autoload :TrailingHash, 'kuby/trailing_hash'
 
@@ -38,10 +40,10 @@ module Kuby
     end
 
     def environment(name = env)
-      definition.environment(name.to_s) do
-        raise UndefinedEnvironmentError, "couldn't find a Kuby environment named "\
-          "'#{environment}'"
-      end
+      definition.environment(name.to_s) || raise(
+        UndefinedEnvironmentError, "couldn't find a Kuby environment named "\
+        "'#{name}'"
+      )
     end
 
     def register_provider(provider_name, provider_klass)
@@ -107,8 +109,8 @@ end
 Kuby.register_provider(:minikube, Kuby::Kubernetes::MinikubeProvider)
 
 # plugins
-Kuby.register_plugin(:rails_app, Kuby::Kubernetes::Plugins::RailsApp::Plugin)
-Kuby.register_plugin(:nginx_ingress, Kuby::Kubernetes::Plugins::NginxIngress)
+Kuby.register_plugin(:rails_app, Kuby::Plugins::RailsApp::Plugin)
+Kuby.register_plugin(:nginx_ingress, Kuby::Plugins::NginxIngress)
 
 # distros
 Kuby.register_distro(:debian, Kuby::Docker::Debian)

data/lib/kuby/definition.rb

@@ -20,14 +20,6 @@ module Kuby
       environments[name]
     end
 
-    def docker
-      environment.docker
-    end
-
-    def kubernetes
-      environment.kubernetes
-    end
-
     def environments
       @environments ||= {}
     end

data/lib/kuby/docker/cli.rb

@@ -10,6 +10,38 @@ module Kuby
         @executable = executable || `which docker`.strip
       end
 
+      def config_file
+        if File.exist?(default_config_file)
+          default_config_file
+        end
+      end
+
+      def default_config_file
+        File.join(Dir.home, '.docker', 'config.json')
+      end
+
+      def login(url:, username:, password:)
+        cmd = [
+          executable, 'login', url, '--username', username, '--password-stdin'
+        ]
+
+        open3_w({}, cmd) do |stdin, _wait_threads|
+          stdin.puts(password)
+        end
+
+        unless last_status.success?
+          raise LoginError, 'build failed: docker command exited with '\
+            "status code #{last_status.exitstatus}"
+        end
+      end
+
+      def auths
+        return [] unless config_file
+
+        config = JSON.parse(File.read(config_file))
+        config.fetch('auths', {}).keys
+      end
+
       def build(dockerfile:, image_url:, tags:)
         cmd = [
           executable, 'build',

data/lib/kuby/docker/errors.rb

@@ -2,6 +2,7 @@ module Kuby
   module Docker
     class BuildError < StandardError; end
     class PushError < StandardError; end
+    class LoginError < StandardError; end
 
     class MissingTagError < StandardError
       attr_reader :tag

data/lib/kuby/docker/layer.rb

@@ -1,10 +1,10 @@
 module Kuby
   module Docker
     class Layer
-      attr_reader :definition
+      attr_reader :environment
 
-      def initialize(definition)
-        @definition = definition
+      def initialize(environment)
+        @environment = environment
       end
 
       def apply_to(dockerfile)
@@ -15,7 +15,7 @@ module Kuby
       private
 
       def metadata
-        definition.docker.metadata
+        environment.docker.metadata
       end
     end
   end

data/lib/kuby/docker/metadata.rb

@@ -4,14 +4,14 @@ module Kuby
   module Docker
     class Metadata
       DEFAULT_DISTRO = :debian
-      DEFAULT_REGISTRY_HOST = 'https://docker.io'.freeze
+      DEFAULT_REGISTRY_HOST = 'https://www.docker.com'.freeze
       LATEST_TAG = 'latest'
 
       attr_accessor :image_url
-      attr_reader :definition
+      attr_reader :environment
 
-      def initialize(definition)
-        @definition = definition
+      def initialize(environment)
+        @environment = environment
         @tags = []
       end
 
@@ -28,6 +28,10 @@ module Kuby
         end
       end
 
+      def image_hostname
+        @image_hostname ||= URI(image_host).host
+      end
+
       def image_repo
         @image_repo ||= if image_url.include?('/')
           parse_url(image_url).path.sub(/\A\//, '')
@@ -42,7 +46,7 @@ module Kuby
 
       def tag
         t = ENV.fetch('KUBY_DOCKER_TAG') do
-          definition.docker.tags.latest_timestamp_tag
+          environment.docker.tags.latest_timestamp_tag
         end
 
         unless t
@@ -53,7 +57,7 @@ module Kuby
       end
 
       def previous_tag(current_tag)
-        t = definition.docker.tags.previous_timestamp_tag(current_tag)
+        t = environment.docker.tags.previous_timestamp_tag(current_tag)
 
         unless t
           raise MissingTagError, 'could not find previous timestamped tag'
@@ -74,7 +78,7 @@ module Kuby
 
       def default_image_url
         # assuming dockerhub by not specifying full url
-        @default_image_url ||= definition.app_name.downcase
+        @default_image_url ||= environment.app_name.downcase
       end
 
       def default_tags

data/lib/kuby/docker/package_phase.rb

@@ -40,7 +40,7 @@ module Kuby
       private
 
       def distro_spec
-        definition.docker.distro_spec
+        environment.docker.distro_spec
       end
 
       def get_package(package_name, version)
@@ -52,7 +52,7 @@ module Kuby
       end
 
       def metadata
-        definition.docker.metadata
+        environment.docker.metadata
       end
     end
   end

data/lib/kuby/docker/spec.rb

@@ -3,10 +3,10 @@ require 'docker/remote'
 module Kuby
   module Docker
     class Spec
-      attr_reader :definition
+      attr_reader :environment
 
-      def initialize(definition)
-        @definition = definition
+      def initialize(environment)
+        @environment = environment
       end
 
       def base_image(image_url)
@@ -75,35 +75,35 @@ module Kuby
       end
 
       def setup_phase
-        @setup_phase ||= SetupPhase.new(definition)
+        @setup_phase ||= SetupPhase.new(environment)
       end
 
       def package_phase
-        @package_phase ||= PackagePhase.new(definition)
+        @package_phase ||= PackagePhase.new(environment)
       end
 
       def bundler_phase
-        @bundler_phase ||= BundlerPhase.new(definition)
+        @bundler_phase ||= BundlerPhase.new(environment)
       end
 
       def yarn_phase
-        @yarn_phase ||= YarnPhase.new(definition)
+        @yarn_phase ||= YarnPhase.new(environment)
       end
 
       def copy_phase
-        @copy_phase ||= CopyPhase.new(definition)
+        @copy_phase ||= CopyPhase.new(environment)
       end
 
       def assets_phase
-        @assets_phase ||= AssetsPhase.new(definition)
+        @assets_phase ||= AssetsPhase.new(environment)
       end
 
       def webserver_phase
-        @webserver_phase ||= WebserverPhase.new(definition)
+        @webserver_phase ||= WebserverPhase.new(environment)
       end
 
       def metadata
-        @metadata ||= Metadata.new(definition)
+        @metadata ||= Metadata.new(environment)
       end
 
       def tags

data/lib/kuby/docker/timestamp_tag.rb

@@ -1,13 +1,16 @@
 module Kuby
   module Docker
     class TimestampTag
-      RE = /20[\d]{2}(?:0[1-9]|11|12)(?:0[1-9]|1[1-9]|2[1-9]|3[01])/.freeze
       FORMAT = '%Y%m%d%H%M%S'.freeze
 
       def self.try_parse(str)
-        if str =~ RE
-          new(Time.strptime(str, FORMAT))
+        time = begin
+          Time.strptime(str, FORMAT)
+        rescue ArgumentError
+          return nil
         end
+
+        new(time)
       end
 
       attr_reader :time

data/lib/kuby/environment.rb

@@ -8,15 +8,19 @@ module Kuby
     end
 
     def docker(&block)
-      @docker ||= Docker::Spec.new(definition)
+      @docker ||= Docker::Spec.new(self)
       @docker.instance_eval(&block) if block
       @docker
     end
 
     def kubernetes(&block)
-      @kubernetes ||= Kubernetes::Spec.new(definition)
+      @kubernetes ||= Kubernetes::Spec.new(self)
       @kubernetes.instance_eval(&block) if block
       @kubernetes
     end
+
+    def app_name
+      definition.app_name
+    end
   end
 end

data/lib/kuby/kubernetes.rb

@@ -7,8 +7,6 @@ module Kuby
     autoload :DeployTask,       'kuby/kubernetes/deploy_task'
     autoload :DockerConfig,     'kuby/kubernetes/docker_config'
     autoload :Manifest,         'kuby/kubernetes/manifest'
-    autoload :Monitors,         'kuby/kubernetes/monitors'
-    autoload :Plugin,           'kuby/kubernetes/plugin'
     autoload :Plugins,          'kuby/kubernetes/plugins'
     autoload :Provider,         'kuby/kubernetes/provider'
     autoload :RegistrySecret,   'kuby/kubernetes/registry_secret'

data/lib/kuby/kubernetes/deploy_task.rb

@@ -1,5 +1,4 @@
 require 'krane'
-require 'ext/krane/kubernetes_resource'
 require 'kubectl-rb'
 
 module Kuby

data/lib/kuby/kubernetes/deployer.rb

@@ -5,10 +5,10 @@ require 'yaml'
 module Kuby
   module Kubernetes
     class Deployer
-      attr_reader :definition
+      attr_reader :environment
 
-      def initialize(definition)
-        @definition = definition
+      def initialize(environment)
+        @environment = environment
       end
 
       def deploy
@@ -42,7 +42,7 @@ module Kuby
 
           cli.apply(res)
         end
-      rescue InvalidResourceError => e
+      rescue KubernetesCLI::InvalidResourceError => e
         Kuby.logger.fatal(e.message)
         Kuby.logger.fatal(e.resource.to_resource.to_yaml)
       end
@@ -74,15 +74,15 @@ module Kuby
       end
 
       def provider
-        definition.kubernetes.provider
+        environment.kubernetes.provider
       end
 
       def namespace
-        definition.kubernetes.namespace
+        environment.kubernetes.namespace
       end
 
       def all_resources
-        definition.kubernetes.resources
+        environment.kubernetes.resources
       end
 
       def cli

data/lib/kuby/kubernetes/minikube_provider.rb

@@ -26,6 +26,10 @@ module Kuby
           rails_app.resources.delete(rails_app.ingress)
           rails_app.service.spec { type 'LoadBalancer' }
         end
+
+        if assets = spec.plugin(:rails_assets)
+          assets.service.spec { type 'LoadBalancer' }
+        end
       end
 
       def kubeconfig_path

data/lib/kuby/kubernetes/provider.rb

@@ -3,10 +3,10 @@ require 'kubernetes-cli'
 module Kuby
   module Kubernetes
     class Provider
-      attr_reader :definition
+      attr_reader :environment
 
-      def initialize(definition)
-        @definition = definition
+      def initialize(environment)
+        @environment = environment
         after_initialize
       end
 
@@ -66,11 +66,11 @@ module Kuby
       end
 
       def deployer
-        @deployer ||= Kuby::Kubernetes::Deployer.new(definition)
+        @deployer ||= Kuby::Kubernetes::Deployer.new(environment)
       end
 
       def spec
-        definition.kubernetes
+        environment.kubernetes
       end
     end
   end