kuby-core 0.17.0 → 0.18.0

data/lib/kuby/docker.rb

@@ -4,10 +4,11 @@ require 'kuby/docker/errors'
 
 module Kuby
   module Docker
-    LATEST_TAG = T.let('latest'.freeze, String)
+    LATEST_TAG = 'latest'.freeze
 
     autoload :Alpine,           'kuby/docker/alpine'
     autoload :AppImage,         'kuby/docker/app_image'
+    autoload :AppPhase,         'kuby/docker/app_phase'
     autoload :AssetsPhase,      'kuby/docker/assets_phase'
     autoload :BundlerPhase,     'kuby/docker/bundler_phase'
     autoload :CLI,              'kuby/docker/cli'

data/lib/kuby/kubernetes/bare_metal_provider.rb

@@ -5,9 +5,9 @@ require 'kube-dsl'
 module Kuby
   module Kubernetes
     class BareMetalProvider < Provider
-      extend T::Sig
+      # extend T::Sig
 
-      DEFAULT_STORAGE_CLASS = T.let('hostpath'.freeze, String)
+      DEFAULT_STORAGE_CLASS = 'hostpath'.freeze
 
       class Config
         extend ::KubeDSL::ValueFields
@@ -16,33 +16,33 @@ module Kuby
         value_fields :storage_class
       end
 
-      sig { returns(Config) }
+      # T::Sig::WithoutRuntime.sig { returns(Config) }
       attr_reader :config
 
-      sig { params(environment: Environment).void }
+      # T::Sig::WithoutRuntime.sig { params(environment: Environment).void }
       def initialize(environment)
-        @config = T.let(Config.new, Config)
+        @config = Config.new
         super
       end
 
-      sig { params(block: T.proc.void).void }
+      # T::Sig::WithoutRuntime.sig { params(block: T.proc.void).void }
       def configure(&block)
         config.instance_eval(&block) if block
       end
 
-      sig { returns(String) }
+      # T::Sig::WithoutRuntime.sig { returns(String) }
       def kubeconfig_path
         config.kubeconfig
       end
 
-      sig { returns(String) }
+      # T::Sig::WithoutRuntime.sig { returns(String) }
       def storage_class_name
         config.storage_class
       end
 
       private
 
-      sig { void }
+      # T::Sig::WithoutRuntime.sig { void }
       def after_initialize
         configure do
           # default kubeconfig path

data/lib/kuby/kubernetes/deployer.rb

@@ -8,10 +8,8 @@ require 'yaml'
 module Kuby
   module Kubernetes
     class Deployer
-      extend T::Sig
-
       attr_reader :environment
-      attr_accessor :logdev
+      attr_writer :logdev
 
       def initialize(environment)
         @environment = environment
@@ -19,7 +17,7 @@ module Kuby
 
       def deploy
         restart_rails_deployment_if_necessary do
-          namespaced, global = all_resources.partition do |resource|
+          resource_groups = all_resources.group_by do |resource|
             # Unfortunately we can't use respond_to here because all KubeDSL
             # objects use ObjectMeta, which has a namespace field. Not sure
             # why, since it makes no sense for a namespace to have a namespace.
@@ -27,8 +25,21 @@ module Kuby
             resource.metadata.namespace
           end
 
-          deploy_global_resources(global)
-          deploy_namespaced_resources(namespaced)
+          deploy_global_resources(resource_groups[nil])
+
+          resource_groups.each_pair do |ns, resources|
+            next if !ns
+
+            begin
+              deploy_namespaced_resources(resources, ns)
+            rescue => e
+              puts e.message
+
+              if bt = e.backtrace
+                puts bt.join("\n")
+              end
+            end
+          end
         end
       end
 
@@ -69,10 +80,11 @@ module Kuby
         end
       rescue KubernetesCLI::InvalidResourceError => e
         Kuby.logger.fatal(e.message)
-        Kuby.logger.fatal(e.resource.to_resource.to_yaml)
+        resource = e.resource&.to_resource
+        Kuby.logger.fatal(resource) if resource
       end
 
-      def deploy_namespaced_resources(resources)
+      def deploy_namespaced_resources(resources, ns)
         old_kubeconfig = ENV['KUBECONFIG']
         ENV['KUBECONFIG'] = provider.kubeconfig_path
 
@@ -87,7 +99,7 @@ module Kuby
         end
 
         task = ::Kuby::Kubernetes::DeployTask.new(
-          namespace: namespace.metadata.name,
+          namespace: ns,
           context: cli.current_context,
           filenames: [tmpdir]
         )
@@ -97,7 +109,7 @@ module Kuby
         task.run!(verify_result: true, prune: false)
       ensure
         ENV['KUBECONFIG'] = old_kubeconfig
-        FileUtils.rm_rf(T.must(tmpdir))
+        FileUtils.rm_rf(tmpdir)
       end
 
       def restart_rails_deployment_if_necessary

data/lib/kuby/kubernetes/docker_config.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'base64'
 require 'kube-dsl'
 

data/lib/kuby/kubernetes/provider.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'kubernetes-cli'
 
 module Kuby

data/lib/kuby/kubernetes/spec.rb

@@ -1,5 +1,7 @@
 # typed: false
+
 require 'kube-dsl'
+require 'rake'
 
 module Kuby
   module Kubernetes
@@ -13,6 +15,7 @@ module Kuby
         @plugins = TrailingHash.new
 
         # default plugins
+        add_plugin(:system)
         add_plugin(:rails_app)
       end
 
@@ -69,17 +72,59 @@ module Kuby
       def after_configuration
         @plugins.each { |_, plg| plg.after_configuration }
         provider.after_configuration
+        environment.docker.after_configuration
+
+        spec = self
+
+        # this must be done _after_ docker has been configured
+        registry_secret do
+          docker_config do
+            registry_host spec.docker.image.image_hostname
+            username spec.docker.image.credentials.username
+            password spec.docker.image.credentials.password
+            email spec.docker.image.credentials.email
+          end
+        end
       end
 
       def before_deploy
         @tag ||= docker.image.current_version.main_tag
 
+        check_dependencies!
+
         provider.before_deploy(resources)
         @plugins.each { |_, plg| plg.before_deploy(resources) }
       ensure
         @tag = nil
       end
 
+      def check_dependencies!(plugins = @plugins)
+        error_messages = []
+
+        plugins.each do |plg_name, plg|
+          plg.class.dependencies.each do |dependency|
+            dependable = Kuby.dependables[dependency.name]
+
+            unless dependable
+              error_messages << "The #{plg_name} plugin depends on #{dependency.name}, "\
+                "but that dependency has not been registered."
+
+              next
+            end
+
+            unless dependency.satisfied_by?(dependable)
+              error_messages << "The #{plg_name} plugin depends on #{dependency.name} "\
+                "#{dependency.constraints}, but the available version is #{dependable.version}."
+            end
+          end
+        end
+
+        unless error_messages.empty?
+          error_messages.each { |msg| Kuby.logger.fatal(msg) }
+          exit 1
+        end
+      end
+
       def after_deploy
         @tag ||= docker.image.current_version.main_tag
 
@@ -98,6 +143,8 @@ module Kuby
           end
         end
 
+        check_dependencies!(plugins)
+
         if only.empty?
           provider.before_setup
           provider.setup
@@ -159,13 +206,6 @@ module Kuby
             name "#{spec.selector_app}-registry-secret"
             namespace spec.namespace.metadata.name
           end
-
-          docker_config do
-            registry_host spec.docker.image.image_hostname
-            username spec.docker.image.credentials.username
-            password spec.docker.image.credentials.password
-            email spec.docker.image.credentials.email
-          end
         end
 
         @registry_secret.instance_eval(&block) if block

data/lib/kuby/plugin.rb

@@ -1,4 +1,5 @@
-# typed: true
+# typed: false
+
 module Kuby
   class Plugin
     attr_reader :environment
@@ -8,6 +9,21 @@ module Kuby
       after_initialize
     end
 
+    class << self
+      # returns an array of directories containing .rake files
+      def task_dirs
+        []
+      end
+
+      def depends_on(dependable_name, *constraints)
+        dependencies << Kuby::Dependency.new(dependable_name, *constraints)
+      end
+
+      def dependencies
+        @dependencies ||= []
+      end
+    end
+
     def configure(&block)
       # do nothing by default
     end
@@ -17,6 +33,11 @@ module Kuby
       # do nothing by default
     end
 
+    # remove all global resources installed by #setup
+    def remove
+      # do nothing by default
+    end
+
     # additional kubernetes resources that should be deployed
     def resources
       []

data/lib/kuby/plugins/nginx_ingress.rb

@@ -1,23 +1,25 @@
 # typed: true
+
 require 'kube-dsl'
 
 module Kuby
   module Plugins
     class NginxIngress < ::Kuby::Plugin
+      depends_on :kubernetes, '>= 1.20'
+
       class Config
         extend ::KubeDSL::ValueFields
 
         value_fields :provider
       end
 
-      VERSION = '0.27.1'.freeze
-      DEFAULT_PROVIDER = 'cloud-generic'.freeze
+      VERSION = '1.1.1'.freeze
+      DEFAULT_PROVIDER = 'cloud'.freeze
       NAMESPACE = 'ingress-nginx'.freeze
-      SERVICE_NAME = 'ingress-nginx'.freeze
+      SERVICE_NAME = 'ingress-nginx-controller'.freeze
 
       SETUP_RESOURCES = [
-        "https://raw.githubusercontent.com/kubernetes/ingress-nginx/nginx-#{VERSION}/deploy/static/mandatory.yaml",
-        "https://raw.githubusercontent.com/kubernetes/ingress-nginx/nginx-#{VERSION}/deploy/static/provider/%{provider}.yaml"
+        "https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v#{VERSION}/deploy/static/provider/%{provider}/deploy.yaml"
       ].freeze
 
       def configure(&block)
@@ -54,7 +56,7 @@ module Kuby
       private
 
       def already_deployed?
-        kubernetes_cli.get_object('Service', 'ingress-nginx', 'ingress-nginx')
+        kubernetes_cli.get_object('Service', NAMESPACE, SERVICE_NAME)
         true
       rescue KubernetesCLI::GetResourceError
         return false

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

@@ -28,19 +28,31 @@ module Kuby
             http do
               path do
                 path spec.asset_url
+                path_type 'Prefix'
 
                 backend do
-                  service_name spec.service.metadata.name
-                  service_port spec.service.spec.ports.first.port
+                  service do
+                    name spec.service.metadata.name
+
+                    port do
+                      name spec.service.spec.ports.first.name
+                    end
+                  end
                 end
               end
 
               path do
                 path spec.packs_url
+                path_type 'Prefix'
 
                 backend do
-                  service_name spec.service.metadata.name
-                  service_port spec.service.spec.ports.first.port
+                  service do
+                    name spec.service.metadata.name
+
+                    port do
+                      name spec.service.spec.ports.first.name
+                    end
+                  end
                 end
               end
             end

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

@@ -11,33 +11,42 @@ module Kuby
         end
 
         def new_version
-          # Asset images track the base image, so return the new version
-          # here. There can be no asset image without a base image.
-          @new_version ||= duplicate_with_annotated_tags(
-            base_image.new_version
+          # asset images track the app image
+          duplicate_with_annotated_tags(
+            base_image.new_version.exists? ? base_image.new_version : base_image.current_version
           )
         end
 
         def current_version
-          @current_version ||= duplicate_with_annotated_tags(
+          duplicate_with_annotated_tags(
             base_image.current_version
           )
         end
 
         def previous_version
-          @previous_version ||= duplicate_with_annotated_tags(
+          duplicate_with_annotated_tags(
             base_image.previous_version
           )
         end
 
-        def build(build_args = {}, docker_args = [], context: nil)
-          docker_cli.build(new_version, build_args: build_args, docker_args: docker_args, context: context)
+        def build(build_args = {}, docker_args = [], context: nil, cache_from: nil)
+          docker_cli.build(
+            self,
+            build_args: build_args,
+            docker_args: docker_args,
+            context: context,
+            cache_from: cache_from
+          )
         end
 
         def push(tag)
           docker_cli.push(image_url, tag)
         end
 
+        def pull(tag)
+          docker_cli.pull(image_url, tag)
+        end
+
         private
 
         def duplicate_with_annotated_tags(image)