kuby-core 0.11.14 → 0.13.0

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

@@ -47,38 +47,6 @@ module Kuby
           end
         end
 
-        def configure_deployment(deployment, docker_image)
-          spec = self
-
-          deployment.spec.template.spec do
-            init_container(:copy_assets) do
-              name "#{spec.selector_app}-copy-assets"
-              command %w(bundle exec rake kuby:rails_app:assets:copy)
-              image docker_image
-
-              volume_mount do
-                name 'assets'
-                mount_path RAILS_MOUNT_PATH
-              end
-            end
-
-            container(:web) do
-              volume_mount do
-                name 'assets'
-                mount_path NGINX_MOUNT_PATH
-              end
-            end
-
-            volume do
-              name 'assets'
-
-              persistent_volume_claim do
-                claim_name spec.volume_claim.metadata.name
-              end
-            end
-          end
-        end
-
         def copy_task
           @copy_task ||= AssetCopyTask.new(
             from: asset_path, to: RAILS_MOUNT_PATH
@@ -238,7 +206,7 @@ module Kuby
                   container(:nginx) do
                     name "#{kube_spec.selector_app}-#{kube_spec.role}"
                     image_pull_policy 'IfNotPresent'
-                    image NGINX_IMAGE
+                    image "#{kube_spec.image.image_url}:#{kube_spec.kubernetes.tag || Kuby::Docker::LATEST_TAG}-assets"
 
                     port do
                       container_port NGINX_PORT
@@ -252,11 +220,6 @@ module Kuby
                       sub_path 'nginx.conf'
                     end
 
-                    volume_mount do
-                      name 'assets'
-                      mount_path NGINX_MOUNT_PATH
-                    end
-
                     readiness_probe do
                       success_threshold 1
                       failure_threshold 2
@@ -272,6 +235,10 @@ module Kuby
                     end
                   end
 
+                  image_pull_secret do
+                    name kube_spec.environment.kubernetes.registry_secret.metadata.name
+                  end
+
                   volume do
                     name 'nginx-config'
 
@@ -280,14 +247,6 @@ module Kuby
                     end
                   end
 
-                  volume do
-                    name 'assets'
-
-                    persistent_volume_claim do
-                      claim_name kube_spec.volume_claim.metadata.name
-                    end
-                  end
-
                   restart_policy 'Always'
                   service_account_name kube_spec.service_account.metadata.name
                 end
@@ -299,38 +258,19 @@ module Kuby
           @deployment
         end
 
-        def volume_claim
-          spec = self
-
-          @volume_claim ||= KubeDSL.persistent_volume_claim do
-            metadata do
-              name "#{spec.selector_app}-#{spec.role}"
-              namespace spec.namespace.metadata.name
-            end
-
-            spec do
-              access_modes ['ReadWriteOnce']
-              storage_class_name spec.environment.kubernetes.provider.storage_class_name
-
-              resources do
-                requests do
-                  add :storage, '10Gi'
-                end
-              end
-            end
-          end
-        end
-
         def resources
           @resources ||= [
             service,
             service_account,
             nginx_config,
-            deployment,
-            volume_claim
+            deployment
           ]
         end
 
+        def docker_images
+          @docker_images ||= [docker_spec]
+        end
+
         def namespace
           environment.kubernetes.namespace
         end
@@ -342,6 +282,56 @@ module Kuby
         def role
           ROLE
         end
+
+        def docker
+          environment.docker
+        end
+
+        def kubernetes
+          environment.kubernetes
+        end
+
+        def docker_images
+          @docker_images ||= [image]
+        end
+
+        def image
+          @image ||= RailsApp::AssetsImage.new(docker.image, -> { dockerfile })
+        end
+
+        private
+
+        def dockerfile
+          Docker::Dockerfile.new.tap do |df|
+            base_image = docker.image.current_version
+            cur_tag = base_image.main_tag
+            app_name = environment.app_name.downcase
+
+            tags = begin
+              [base_image.previous_timestamp_tag(cur_tag).to_s, cur_tag]
+            rescue Kuby::Docker::MissingTagError
+              [cur_tag, nil]
+            end
+
+            # this can handle more than 2 tags by virtue of using each_cons :)
+            tags.each_cons(2) do |prev_tag, tag|
+              prev_image_name = "#{app_name}-#{prev_tag}"
+              df.from("#{base_image.image_url}:#{prev_tag}", as: prev_image_name)
+              df.run("mkdir -p #{RAILS_MOUNT_PATH}")
+              df.run("bundle exec rake kuby:rails_app:assets:copy")
+
+              if tag
+                image_name = "#{app_name}-#{tag}"
+                df.from("#{base_image.image_url}:#{tag}", as: image_name)
+                df.copy("--from=#{prev_image_name} #{RAILS_MOUNT_PATH}", RAILS_MOUNT_PATH)
+                df.run("bundle exec rake kuby:rails_app:assets:copy")
+              end
+            end
+
+            df.from(NGINX_IMAGE)
+            df.copy("--from=#{"#{app_name}-#{tags.compact.last}"} #{RAILS_MOUNT_PATH}", NGINX_MOUNT_PATH)
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,55 @@
+module Kuby
+  module Plugins
+    module RailsApp
+      class AssetsImage < ::Kuby::Docker::Image
+        attr_reader :base_image
+
+        def initialize(base_image, dockerfile, main_tag = nil, alias_tags = [])
+          super(dockerfile, base_image.image_url, base_image.credentials, main_tag, alias_tags)
+          @base_image = base_image
+        end
+
+        def new_version
+          # Asset images track the base image, so return the current version
+          # here. There can be no asset image without a base image.
+          current_version
+        end
+
+        def current_version
+          @current_version ||= duplicate_with_annotated_tags(
+            base_image.current_version
+          )
+        end
+
+        def previous_version
+          @previous_version ||= duplicate_with_annotated_tags(
+            base_image.previous_version
+          )
+        end
+
+        def build(build_args = {})
+          docker_cli.build(current_version, build_args: build_args)
+        end
+
+        def push(tag)
+          docker_cli.push(image_url, tag)
+        end
+
+        private
+
+        def duplicate_with_annotated_tags(image)
+          self.class.new(
+            base_image,
+            dockerfile,
+            annotate_tag(image.main_tag),
+            image.alias_tags.map { |at| annotate_tag(at) }
+          )
+        end
+
+        def annotate_tag(tag)
+          "#{tag}-assets"
+        end
+      end
+    end
+  end
+end

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

@@ -47,27 +47,23 @@ module Kuby
             environment.kubernetes.plugins[@database.plugin_name] = @database.plugin
             environment.kubernetes.add_plugin(:kube_db)
 
-            unless environment.development?
-              environment.docker do
-                insert :rewrite_db_config, RewriteDbConfig.new, after: :copy_phase
-              end
+            environment.docker do
+              insert :rewrite_db_config, RewriteDbConfig.new, after: :copy_phase
             end
           end
 
-          unless environment.development?
-            environment.kubernetes.add_plugin(:nginx_ingress)
-            environment.kubernetes.add_plugin(:rails_assets) do
-              asset_url context.asset_url
-              packs_url context.packs_url
-              asset_path context.asset_path
-            end
+          environment.kubernetes.add_plugin(:nginx_ingress)
+          environment.kubernetes.add_plugin(:rails_assets) do
+            asset_url context.asset_url
+            packs_url context.packs_url
+            asset_path context.asset_path
+          end
 
-            if @tls_enabled
-              context = self
+          if @tls_enabled
+            context = self
 
-              environment.kubernetes.add_plugin(:cert_manager) do
-                email context.environment.docker.credentials.email
-              end
+            environment.kubernetes.add_plugin(:cert_manager) do
+              email context.environment.docker.credentials.email
             end
           end
         end
@@ -79,14 +75,13 @@ module Kuby
         def before_deploy(manifest)
           # Make sure plugin has been configured. If not, do nothing.
           if cert_manager = environment.kubernetes.plugin(:cert_manager)
-            cert_manager.annotate_ingress(ingress)
+            cert_manager.annotate_ingress(ingress) if tls_enabled
           end
 
-          image_with_tag = "#{docker.metadata.image_url}:#{kubernetes.tag}"
+          image_with_tag = "#{docker.image.image_url}:#{kubernetes.tag || Kuby::Docker::LATEST_TAG}"
 
           if assets = environment.kubernetes.plugin(:rails_assets)
             assets.configure_ingress(ingress, hostname)
-            assets.configure_deployment(deployment, image_with_tag)
           end
 
           spec = self
@@ -99,14 +94,12 @@ module Kuby
                     image image_with_tag
                   end
 
-                  unless spec.environment.development?
-                    init_container(:create_db) do
-                      image image_with_tag
-                    end
+                  init_container(:create_db) do
+                    image image_with_tag
+                  end
 
-                    init_container(:migrate_db) do
-                      image image_with_tag
-                    end
+                  init_container(:migrate_db) do
+                    image image_with_tag
                   end
                 end
               end
@@ -248,7 +241,7 @@ module Kuby
               annotations do
                 add(
                   'getkuby.io/dockerfile-checksum',
-                  kube_spec.environment.docker.to_dockerfile.checksum
+                  kube_spec.environment.docker.image.dockerfile.checksum
                 )
               end
             end
@@ -303,93 +296,57 @@ module Kuby
                       end
                     end
 
-                    unless kube_spec.environment.development?
-                      readiness_probe do
-                        success_threshold 1
-                        failure_threshold 2
-                        initial_delay_seconds 15
-                        period_seconds 3
-                        timeout_seconds 1
-
-                        http_get do
-                          path '/healthz'
-                          port kube_spec.docker.webserver_phase.port
-                          scheme 'HTTP'
-                        end
-                      end
-                    end
-
-                    if kube_spec.environment.development?
-                      env do
-                        name 'BUNDLE_PATH'
-                        value '/bundle'
-                      end
-
-                      env do
-                        name 'GEM_HOME'
-                        value '/bundle'
-                      end
-
-                      env do
-                        name 'BOOTSNAP_CACHE_DIR'
-                        value '/usr/src/bootsnap'
-                      end
-
-                      volume_mount do
-                        name "#{kube_spec.selector_app}-code"
-                        mount_path '/usr/src/app'
-                      end
-
-                      volume_mount do
-                        name "#{kube_spec.selector_app}-bundle"
-                        mount_path '/bundle'
-                      end
-
-                      volume_mount do
-                        name "#{kube_spec.selector_app}-bootsnap"
-                        mount_path '/usr/src/bootsnap'
+                    readiness_probe do
+                      success_threshold 1
+                      failure_threshold 2
+                      initial_delay_seconds 15
+                      period_seconds 3
+                      timeout_seconds 1
+
+                      http_get do
+                        path '/healthz'
+                        port kube_spec.docker.webserver_phase.port
+                        scheme 'HTTP'
                       end
                     end
                   end
 
-                  if kube_spec.environment.development?
-                    volume do
-                      name "#{kube_spec.selector_app}-code"
+                  init_container(:create_db) do
+                    name "#{kube_spec.selector_app}-create-db"
+                    command %w(bundle exec rake kuby:rails_app:db:create_unless_exists)
 
-                      persistent_volume_claim do
-                        claim_name kube_spec.code_volume_claim.metadata.name
+                    env_from do
+                      config_map_ref do
+                        name kube_spec.config_map.metadata.name
                       end
                     end
 
-                    volume do
-                      name "#{kube_spec.selector_app}-bundle"
-
-                      persistent_volume_claim do
-                        claim_name kube_spec.bundle_volume_claim.metadata.name
+                    env_from do
+                      secret_ref do
+                        name kube_spec.app_secrets.metadata.name
                       end
                     end
+                  end
 
-                    volume do
-                      name "#{kube_spec.selector_app}-bootsnap"
+                  init_container(:migrate_db) do
+                    name "#{kube_spec.selector_app}-migrate-db"
+                    command %w(bundle exec rake db:migrate)
 
-                      persistent_volume_claim do
-                        claim_name kube_spec.bootsnap_volume_claim.metadata.name
+                    env_from do
+                      config_map_ref do
+                        name kube_spec.config_map.metadata.name
                       end
                     end
-                  else
-                    init_container(:create_db) do
-                      name "#{kube_spec.selector_app}-create-db"
-                      command %w(bundle exec rake kuby:rails_app:db:create_unless_exists)
-                    end
 
-                    init_container(:migrate_db) do
-                      name "#{kube_spec.selector_app}-migrate-db"
-                      command %w(bundle exec rake db:migrate)
+                    env_from do
+                      secret_ref do
+                        name kube_spec.app_secrets.metadata.name
+                      end
                     end
+                  end
 
-                    image_pull_secret do
-                      name kube_spec.environment.kubernetes.registry_secret.metadata.name
-                    end
+                  image_pull_secret do
+                    name kube_spec.environment.kubernetes.registry_secret.metadata.name
                   end
 
                   restart_policy 'Always'
@@ -446,118 +403,6 @@ module Kuby
           @ingress
         end
 
-        def code_volume(&block)
-          spec = self
-
-          if environment.development?
-            @code_volume ||= KubeDSL.persistent_volume do
-              metadata do
-                name "#{spec.selector_app}-code"
-              end
-
-              spec do
-                access_modes ['ReadWriteMany']
-
-                capacity do
-                  add :storage, '1Mi'
-                end
-
-                host_path do
-                  path File.expand_path(spec.root)
-                end
-
-                storage_class_name 'hostpath'
-              end
-            end
-
-            @code_volume.instance_eval(&block) if block
-            @code_volume
-          end
-        end
-
-        def code_volume_claim(&block)
-          spec = self
-
-          if environment.development?
-            @code_volume_claim ||= KubeDSL.persistent_volume_claim do
-              metadata do
-                name "#{spec.selector_app}-code"
-                namespace spec.namespace.metadata.name
-              end
-
-              spec do
-                access_modes ['ReadWriteMany']
-
-                resources do
-                  requests do
-                    add :storage, '1Mi'
-                  end
-                end
-
-                storage_class_name 'hostpath'
-                volume_name spec.code_volume.metadata.name
-              end
-            end
-
-            @code_volume_claim.instance_eval(&block) if block
-            @code_volume_claim
-          end
-        end
-
-        def bundle_volume_claim(&block)
-          spec = self
-
-          if environment.development?
-            @bundle_volume_claim ||= KubeDSL.persistent_volume_claim do
-              metadata do
-                name "#{spec.selector_app}-bundle"
-                namespace spec.namespace.metadata.name
-              end
-
-              spec do
-                access_modes ['ReadWriteMany']
-                storage_class_name 'hostpath'
-
-                resources do
-                  requests do
-                    add :storage, '2Gi'
-                  end
-                end
-              end
-            end
-
-            @bundle_volume_claim.instance_eval(&block) if block
-            @bundle_volume_claim
-          end
-        end
-
-        def bootsnap_volume_claim(&block)
-          spec = self
-
-          if environment.development?
-            @bootsnap_volume_claim ||= KubeDSL.persistent_volume_claim do
-              metadata do
-                name "#{spec.selector_app}-bootsnap"
-                namespace spec.namespace.metadata.name
-              end
-
-              spec do
-                access_modes ['ReadWriteMany']
-                storage_class_name 'hostpath'
-
-                resources do
-                  requests do
-                    add :storage, '2Gi'
-                  end
-                end
-              end
-            end
-
-            @bootsnap_volume_claim.instance_eval(&block) if block
-            @bootsnap_volume_claim
-          end
-        end
-
         def resources
           @resources ||= [
             service,
@@ -566,10 +411,6 @@ module Kuby
             app_secrets,
             deployment,
             ingress,
-            code_volume,
-            code_volume_claim,
-            bundle_volume_claim,
-            bootsnap_volume_claim,
             *database&.plugin&.resources
           ]
         end

data/lib/kuby/plugins/rails_app.rb

@@ -3,6 +3,7 @@ module Kuby
   module Plugins
     module RailsApp
       autoload :AssetCopyTask,   'kuby/plugins/rails_app/asset_copy_task'
+      autoload :AssetsImage,     'kuby/plugins/rails_app/assets_image'
       autoload :Assets,          'kuby/plugins/rails_app/assets'
       autoload :Database,        'kuby/plugins/rails_app/database'
       autoload :MySQL,           'kuby/plugins/rails_app/mysql'