kuby-core 0.2.0 → 0.6.1

data/lib/kuby/kubernetes/plugins/rails_app/tasks.rake

@@ -3,11 +3,16 @@ require 'rake'
 namespace :kuby do
   namespace :rails_app do
     namespace :db do
-      task rewrite_config: :environment do
-        config_file = Kuby.definition.app.root.join('config', 'database.yml')
+      task :rewrite_config do
+        Kuby.load!
+
+        config_file = File.join(Kuby.definition.kubernetes.plugin(:rails_app).root, 'config', 'database.yml')
         database = Kuby.definition.kubernetes.plugin(:rails_app).database
-        File.write(config_file, YAML.dump(database.rewritten_configs))
-        Kuby.logger.info("Wrote #{config_file}")
+
+        if database.respond_to?(:rewritten_configs)
+          File.write(config_file, YAML.dump(database.rewritten_configs))
+          Kuby.logger.info("Wrote #{config_file}")
+        end
       end
 
       task :create_unless_exists do

data/lib/kuby/kubernetes/spec.rb

@@ -5,7 +5,7 @@ module Kuby
     class Spec
       extend ::KubeDSL::ValueFields
 
-      attr_reader :definition, :plugins
+      attr_reader :definition, :plugins, :tag
 
       def initialize(definition)
         @definition = definition
@@ -56,6 +56,24 @@ module Kuby
         provider.after_configuration
       end
 
+      def before_deploy
+        @tag ||= docker.metadata.tag
+
+        provider.before_deploy(resources)
+        @plugins.each { |_, plg| plg.before_deploy(resources) }
+      ensure
+        @tag = nil
+      end
+
+      def after_deploy
+        @tag ||= docker.metadata.tag
+
+        @plugins.each { |_, plg| plg.after_deploy(resources) }
+        provider.after_deploy(resources)
+      ensure
+        @tag = nil
+      end
+
       def setup
         provider.before_setup
         provider.setup
@@ -68,26 +86,19 @@ module Kuby
       end
 
       def deploy(tag = nil)
-        tag ||= latest_tag
-
-        unless tag
-          raise Kuby::Docker::MissingTagError, 'could not find latest timestamped tag'
-        end
-
-        set_tag(tag)
-
-        provider.before_deploy(resources)
-        @plugins.each { |_, plg| plg.before_deploy(resources) }
+        @tag = tag
 
+        before_deploy
         provider.deploy
-
-        @plugins.each { |_, plg| plg.after_deploy(resources) }
-        provider.after_deploy(resources)
+        after_deploy
       end
 
       def rollback
+        # it sucks that we have to reach into the rails app for this...
         depl = provider.kubernetes_cli.get_object(
-          'deployment', namespace.metadata.name, deployment.metadata.name
+          'deployment',
+          namespace.metadata.name,
+          plugin(:rails_app).deployment.metadata.name
         )
 
         image_url = depl.dig('spec', 'template', 'spec', 'containers', 0, 'image')
@@ -96,16 +107,10 @@ module Kuby
           raise MissingDeploymentError, "couldn't find an existing deployment"
         end
 
-        deployed_tag = ::Kuby::Docker::TimestampTag.try_parse(image_url.split(':').last)
-        all_tags = docker.tags.all.timestamp_tags.sort
-        tag_idx = all_tags.index { |tag| tag.time == deployed_tag.time } || 0
+        deployed_tag = image_url.split(':').last
+        previous_tag = docker.metadata.previous_tag(deployed_tag)
 
-        if tag_idx == 0
-          raise Kuby::Docker::MissingTagError, 'could not find previous tag'
-        end
-
-        previous_tag = all_tags[tag_idx - 1]
-        deploy(previous_tag.to_s)
+        deploy(previous_tag)
       end
 
       def namespace(&block)
@@ -113,7 +118,7 @@ module Kuby
 
         @namespace ||= KubeDSL.namespace do
           metadata do
-            name "#{spec.selector_app}-#{spec.definition.environment}"
+            name "#{spec.selector_app}-#{spec.definition.environment.name}"
           end
         end
 
@@ -121,17 +126,35 @@ module Kuby
         @namespace
       end
 
+      def registry_secret(&block)
+        spec = self
+
+        @registry_secret ||= RegistrySecret.new do
+          metadata do
+            name "#{spec.selector_app}-registry-secret"
+            namespace spec.namespace.metadata.name
+          end
+
+          docker_config do
+            registry_host spec.docker.metadata.image_host
+            username spec.docker.credentials.username
+            password spec.docker.credentials.password
+            email spec.docker.credentials.email
+          end
+        end
+
+        @registry_secret.instance_eval(&block) if block
+        @registry_secret
+      end
+
       def resources
         @resources ||= Manifest.new([
           namespace,
+          registry_secret,
           *@plugins.flat_map { |_, plugin| plugin.resources }
         ])
       end
 
-      def set_tag(tag)
-        plugin(:rails_app).set_image("#{docker.metadata.image_url}:#{tag}")
-      end
-
       def selector_app
         @selector_app ||= definition.app_name.downcase
       end
@@ -139,14 +162,6 @@ module Kuby
       def docker
         definition.docker
       end
-
-      private
-
-      def latest_tag
-        @latest_tag ||= docker.tags.local.latest_tags.find do |tag|
-          tag != ::Kuby::Docker::Tags::LATEST
-        end
-      end
     end
   end
 end

data/lib/kuby/railtie.rb

@@ -7,10 +7,6 @@ module Kuby
       load File.expand_path(File.join('tasks', 'kuby.rake'), __dir__)
     end
 
-    initializer 'kuby.startup' do |_app|
-      Kuby.logger = Kuby::BasicLogger.new(STDERR)
-    end
-
     initializer 'kuby.health_check_middleware' do |app|
       app.middleware.use Kuby::Middleware::HealthCheck
     end

data/lib/kuby/tasks.rb

@@ -16,6 +16,10 @@ module Kuby
       puts formatter.format(tokens)
     end
 
+    def setup
+      definition.kubernetes.setup
+    end
+
     def build
       docker.cli.build(
         dockerfile: docker.to_dockerfile,
@@ -49,7 +53,17 @@ module Kuby
       end
     end
 
+    def deploy
+      definition.kubernetes.deploy
+    end
+
+    def rollback
+      definition.kubernetes.rollback
+    end
+
     def print_resources
+      kubernetes.before_deploy
+
       kubernetes.resources.each do |res|
         puts res.to_resource.serialize.to_yaml
       end
@@ -61,6 +75,10 @@ module Kuby
       puts File.read(path)
     end
 
+    def kubectl(*cmd)
+      kubernetes_cli.run_cmd(cmd)
+    end
+
     def remote_logs
       kubernetes_cli.logtail(namespace, match_labels.serialize)
     end

data/lib/kuby/tasks/kuby.rake

@@ -1,62 +1,69 @@
+require 'shellwords'
+
 namespace :kuby do
   def tasks
+    Kuby.load!
     @tasks ||= Kuby::Tasks.new(Kuby.definition)
   end
 
-  task dockerfile: :environment do
+  task :dockerfile do
     tasks.print_dockerfile
   end
 
-  task build: :environment do
+  task :build do
     tasks.build
   end
 
-  task run: :environment do
+  task :run do
     tasks.run
   end
 
-  task push: :environment do
+  task :push do
     tasks.push
   end
 
-  task resources: :environment do
+  task :resources do
     tasks.print_resources
   end
 
-  task deploy: :environment do
-    Kuby.definition.kubernetes.deploy
+  task :kubectl, [:cmd] do |_, args|
+    tasks.kubectl(Shellwords.shellsplit(args[:cmd]))
+  end
+
+  task :deploy do
+    tasks.deploy
   end
 
-  task rollback: :environment do
-    Kuby.definition.kubernetes.rollback
+  task :rollback do
+    tasks.rollback
   end
 
-  task kubeconfig: :environment do
+  task :kubeconfig do
     tasks.print_kubeconfig
   end
 
-  task setup: :environment do
-    Kuby.definition.kubernetes.setup
+  task :setup do
+    tasks.setup
   end
 
   namespace :remote do
-    task logs: :environment do
+    task :logs do
       tasks.remote_logs
     end
 
-    task status: :environment do
+    task :status do
       tasks.remote_status
     end
 
-    task shell: :environment do
+    task :shell do
       tasks.remote_shell
     end
 
-    task console: :environment do
+    task :console do
       tasks.remote_console
     end
 
-    task dbconsole: :environment do
+    task :dbconsole do
       tasks.remote_dbconsole
     end
   end

data/lib/kuby/version.rb

@@ -1,3 +1,3 @@
 module Kuby
-  VERSION = '0.2.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-core
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Cameron Dutro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -58,56 +58,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: kube-dsl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: kuby-kube-db
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: kubernetes-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +149,7 @@ files:
 - README.md
 - Rakefile
 - kuby-core.gemspec
+- lib/ext/krane/kubernetes_resource.rb
 - lib/kuby.rb
 - lib/kuby/basic_logger.rb
 - lib/kuby/cli_base.rb
@@ -163,6 +164,8 @@ files:
 - lib/kuby/docker/debian.rb
 - lib/kuby/docker/dockerfile.rb
 - lib/kuby/docker/errors.rb
+- lib/kuby/docker/inline_layer.rb
+- lib/kuby/docker/layer.rb
 - lib/kuby/docker/layer_stack.rb
 - lib/kuby/docker/local_tags.rb
 - lib/kuby/docker/metadata.rb
@@ -172,8 +175,8 @@ files:
 - lib/kuby/docker/packages/managed_package.rb
 - lib/kuby/docker/packages/nodejs.rb
 - lib/kuby/docker/packages/package.rb
+- lib/kuby/docker/packages/simple_managed_package.rb
 - lib/kuby/docker/packages/yarn.rb
-- lib/kuby/docker/phase.rb
 - lib/kuby/docker/remote_tags.rb
 - lib/kuby/docker/setup_phase.rb
 - lib/kuby/docker/spec.rb
@@ -181,7 +184,9 @@ files:
 - lib/kuby/docker/timestamp_tag.rb
 - lib/kuby/docker/webserver_phase.rb
 - lib/kuby/docker/yarn_phase.rb
+- lib/kuby/environment.rb
 - lib/kuby/kubernetes.rb
+- lib/kuby/kubernetes/deploy_task.rb
 - lib/kuby/kubernetes/deployer.rb
 - lib/kuby/kubernetes/docker_config.rb
 - lib/kuby/kubernetes/errors.rb
@@ -192,6 +197,7 @@ files:
 - lib/kuby/kubernetes/plugins/nginx_ingress.rb
 - lib/kuby/kubernetes/plugins/rails_app.rb
 - lib/kuby/kubernetes/plugins/rails_app/database.rb
+- lib/kuby/kubernetes/plugins/rails_app/generators/kuby.rb
 - lib/kuby/kubernetes/plugins/rails_app/mysql.rb
 - lib/kuby/kubernetes/plugins/rails_app/plugin.rb
 - lib/kuby/kubernetes/plugins/rails_app/postgres.rb
@@ -211,7 +217,7 @@ files:
 homepage: http://github.com/getkuby/kuby-core
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -226,8 +232,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Deploy your Rails app onto Kubernetes the easy way.
 test_files: []