dapp 0.29.2 → 0.30.0

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.29.2"
+  VERSION = "0.30.0"
   BUILD_CACHE_VERSION = 30
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.29.2
+  version: 0.30.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2018-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -144,14 +144,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.27.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.27.0
 - !ruby/object:Gem::Dependency
   name: murmurhash3
   requirement: !ruby/object:Gem::Requirement
@@ -497,44 +497,6 @@ files:
 - lib/dapp/dapp/slug.rb
 - lib/dapp/dapp/ssh_agent.rb
 - lib/dapp/deployment.rb
-- lib/dapp/deployment/app.rb
-- lib/dapp/deployment/cli/cli.rb
-- lib/dapp/deployment/cli/command/base.rb
-- lib/dapp/deployment/cli/command/deployment.rb
-- lib/dapp/deployment/cli/command/deployment/apply.rb
-- lib/dapp/deployment/cli/command/deployment/mrproper.rb
-- lib/dapp/deployment/config/config.rb
-- lib/dapp/deployment/config/directive/app.rb
-- lib/dapp/deployment/config/directive/app/instance_methods.rb
-- lib/dapp/deployment/config/directive/base.rb
-- lib/dapp/deployment/config/directive/deployment.rb
-- lib/dapp/deployment/config/directive/expose.rb
-- lib/dapp/deployment/config/directive/group.rb
-- lib/dapp/deployment/config/directive/job.rb
-- lib/dapp/deployment/config/directive/mod/group.rb
-- lib/dapp/deployment/config/directive/mod/jobs.rb
-- lib/dapp/deployment/config/directive/namespace.rb
-- lib/dapp/deployment/config/directive/namespace/instance_methods.rb
-- lib/dapp/deployment/core_ext/hash.rb
-- lib/dapp/deployment/dapp/command/apply.rb
-- lib/dapp/deployment/dapp/command/common.rb
-- lib/dapp/deployment/dapp/command/mrproper.rb
-- lib/dapp/deployment/dapp/dapp.rb
-- lib/dapp/deployment/dapp/dappfile.rb
-- lib/dapp/deployment/deployment.rb
-- lib/dapp/deployment/error/app.rb
-- lib/dapp/deployment/error/default.rb
-- lib/dapp/deployment/error/deployment.rb
-- lib/dapp/deployment/error/kubernetes.rb
-- lib/dapp/deployment/kube_app.rb
-- lib/dapp/deployment/kube_base.rb
-- lib/dapp/deployment/kube_deployment.rb
-- lib/dapp/deployment/kubernetes.rb
-- lib/dapp/deployment/kubernetes/error.rb
-- lib/dapp/deployment/mod/jobs.rb
-- lib/dapp/deployment/mod/namespace.rb
-- lib/dapp/deployment/mod/system_environments.rb
-- lib/dapp/deployment/secret.rb
 - lib/dapp/dimg.rb
 - lib/dapp/dimg/artifact.rb
 - lib/dapp/dimg/build/stage/after_install_artifact.rb
@@ -731,7 +693,6 @@ files:
 - lib/dapp/kube/dapp/command/value_get.rb
 - lib/dapp/kube/dapp/dapp.rb
 - lib/dapp/kube/error/default.rb
-- lib/dapp/kube/error/kubernetes.rb
 - lib/dapp/kube/helm.rb
 - lib/dapp/kube/helm/release.rb
 - lib/dapp/kube/helm/values.rb
@@ -744,6 +705,7 @@ files:
 - lib/dapp/kube/kubernetes/client/resource/job.rb
 - lib/dapp/kube/kubernetes/client/resource/pod.rb
 - lib/dapp/kube/kubernetes/client/resource/replicaset.rb
+- lib/dapp/kube/kubernetes/config.rb
 - lib/dapp/kube/kubernetes/error.rb
 - lib/dapp/kube/kubernetes/manager/base.rb
 - lib/dapp/kube/kubernetes/manager/container.rb
@@ -773,7 +735,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell

data/lib/dapp/deployment/app.rb

@@ -1,120 +0,0 @@
-module Dapp
-  module Deployment
-    class App
-      include Mod::Namespace
-      include Mod::SystemEnvironments
-      include Mod::Jobs
-
-      attr_reader :deployment
-      attr_reader :app_config
-      alias config app_config
-
-      def initialize(app_config:, deployment:)
-        @app_config = app_config
-        @deployment = deployment
-      end
-
-      def name(*args)
-        deployment.name(app_config._name, *args)
-      end
-
-      def kube
-        @kube ||= KubeApp.new(self)
-      end
-
-      [:dimg, :expose, :bootstrap, :migrate].each do |directive|
-        define_method directive do
-          app_config.public_send("_#{directive}")
-        end
-      end
-
-      def to_kube_deployments(repo, image_version)
-        {}.tap do |hash|
-          hash[name] = {}.tap do |deployment|
-            deployment['metadata'] = {}.tap do |metadata|
-              metadata['name']   = name
-              metadata['labels'] = kube.labels
-            end
-            deployment['spec'] = {}.tap do |spec|
-              spec['replicas'] = scale
-              spec['template'] = {}
-              spec['template']['metadata'] = deployment['metadata']
-              spec['template']['spec'] = {}.tap do |template_spec|
-                template_spec['containers'] = [].tap do |containers|
-                  containers << {}.tap do |container|
-                    ports = expose._port.map do |port|
-                      {
-                        'containerPort' => port._number,
-                        'name' => ['app', port._number].join('-'),
-                        'protocol' => port._protocol
-                      }
-                    end
-                    volume_mounts = [{'mountPath' => '/.data', 'name' => "volume-#{self.name}"}]
-
-                    container['imagePullPolicy'] = 'Always'
-                    container['image']           = [repo, [dimg, image_version].compact.join('-')].join(':')
-                    container['name']            = dimg_name
-                    container['env']             = environments unless environments.empty?
-                    container['ports']           = ports unless expose._port.empty?
-                    container['volumeMounts']    = volume_mounts
-                  end
-                end
-
-                template_spec['volumes'] = [
-                  {
-                    'name' => "volume-#{name}",
-                    'hostPath' => {'path' => "/var/lib/dapp/deployment/volumes/#{self.deployment.name}/#{self.name}"}
-                  }
-                ]
-              end
-            end
-          end
-        end
-      end
-
-      def to_kube_services
-        return {} if expose._port.empty?
-
-        {}.tap do |hash|
-          hash[service_name] = {}.tap do |service|
-            service['metadata'] = {}.tap do |metadata|
-              metadata['name']   = service_name
-              metadata['labels'] = kube.labels
-            end
-            service['spec'] = {}.tap do |spec|
-              spec['selector'] = kube.labels
-              spec['ports']    = expose._port.map do |port|
-                {
-                  'port' => port._number,
-                  'name' => ['service', port._number].join('-'),
-                  'protocol' => port._protocol
-                }.tap do |h|
-                  h['targetPort'] = port._target unless port._target.nil?
-                end
-              end
-              spec['type'] = expose._type
-            end
-          end
-        end
-      end
-
-      protected
-
-      def dimg_name
-        name(dimg)
-      end
-
-      def service_name
-        name('service')
-      end
-
-      def namespace
-        deployment.namespace
-      end
-
-      def secret
-        deployment.dapp.secret
-      end
-    end
-  end
-end

data/lib/dapp/deployment/cli/cli.rb

@@ -1 +0,0 @@
-::Dapp::CLI.send(:include, ::Dapp::Deployment::CLI::Command)

data/lib/dapp/deployment/cli/command/base.rb

@@ -1,14 +0,0 @@
-module Dapp::Deployment::CLI
-  module Command
-    class Base < ::Dapp::CLI::Command::Base
-      def run(argv = ARGV)
-        self.class.parse_options(self, argv)
-        ::Dapp::Dapp.new(options: cli_options).public_send(run_method)
-      end
-
-      def run_method
-        :"deployment_#{class_to_lowercase}"
-      end
-    end
-  end
-end

data/lib/dapp/deployment/cli/command/deployment.rb

@@ -1,18 +0,0 @@
-module Dapp::Deployment::CLI
-  module Command
-    class Deployment < ::Dapp::CLI
-      SUBCOMMANDS = ['apply', 'mrproper'].freeze
-
-      banner <<BANNER.freeze
-Usage: dapp deployment subcommand [subcommand options]
-
-Available subcommands: (for details, dapp deployment SUB-COMMAND --help)
-
-  dapp deployment apply [options] [APP ...] REPO
-  dapp deployment mrproper [options]
-
-Options:
-BANNER
-    end
-  end
-end

data/lib/dapp/deployment/cli/command/deployment/apply.rb

@@ -1,26 +0,0 @@
-module Dapp::Deployment::CLI::Command
-  class Deployment < ::Dapp::CLI
-    class Apply < Base
-      banner <<BANNER.freeze
-Usage:
-
-  dapp deployment apply [options] [APP ...] REPO
-
-Options:
-BANNER
-
-      option :namespace,
-             long: '--namespace NAME'
-
-      option :image_version,
-             long: '--image-version IMAGE_VERSION',
-             default: 'latest'
-
-      def run(argv = ARGV)
-        self.class.parse_options(self, argv)
-        repo = self.class.required_argument(self, 'repo')
-        ::Dapp::Dapp.new(options: cli_options(apps_patterns: cli_arguments, repo: repo)).deployment_apply
-      end
-    end
-  end
-end

data/lib/dapp/deployment/cli/command/deployment/mrproper.rb

@@ -1,13 +0,0 @@
-module Dapp::Deployment::CLI::Command
-  class Deployment < ::Dapp::CLI
-    class Mrproper < Base
-      banner <<BANNER.freeze
-Usage:
-
-  dapp deployment mrproper [options]
-
-Options:
-BANNER
-    end
-  end
-end

data/lib/dapp/deployment/config/config.rb

@@ -1,46 +0,0 @@
-module Dapp
-  module Deployment
-    module Config
-      module Config
-        include Directive::Mod::Group
-
-        def deployment(&blk)
-          directive_eval(_deployment, &blk)
-        end
-
-        def _deployment
-          @_deployment ||= Directive::Deployment.new(dapp: dapp).tap { |group| @_group << group }
-        end
-
-        protected
-
-        def deployment_config_validate!
-          raise ::Dapp::Error::Config, code: :app_name_required if _app.any? { |app| app._name.nil? } && _app.size > 1
-          _app.each do |app|
-            raise ::Dapp::Error::Config, code: :app_dimg_not_defined, data: { app: app._name } if app._dimg.nil? && !_dimg.map(&:_name).compact.empty?
-            unless _dimg.map(&:_name).include?(app._dimg)
-              raise ::Dapp::Error::Config, code: :app_dimg_not_found, data: { app: app._name, dimg: app._dimg }
-            end
-          end
-
-          [:deployment, :app].each do |directive|
-            Array(public_send(:"_#{directive}")).each do |obj|
-              [:bootstrap, :before_apply_job].each do |job|
-                next if (job_config = obj.public_send("_#{job}")).empty?
-                job_dimg = job_config._dimg || obj._dimg
-                if job_dimg.nil? && !_dimg.map(&:_name).compact.empty?
-                  raise ::Dapp::Error::Config, code: :"#{directive}_#{job}_dimg_not_defined"
-                end
-                unless _dimg.map(&:_name).include?(job_dimg)
-                  raise ::Dapp::Error::Config, code: :"#{directive}_#{job}_dimg_not_found", data: { dimg: job_dimg }
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
-
-::Dapp::Config::Config.send(:include, ::Dapp::Deployment::Config::Config)

data/lib/dapp/deployment/config/directive/app.rb

@@ -1,28 +0,0 @@
-module Dapp
-  module Deployment
-    module Config
-      module Directive
-        class App < Base
-          include InstanceMethods
-          include Mod::Jobs
-
-          attr_reader :_name
-
-          def initialize(name, dapp:)
-            self._name = name
-            super(dapp: dapp)
-          end
-
-          def _name=(name)
-            sub_directive_eval do
-              return self if name.nil?
-              name = name.to_s
-              validate_compliance!(hostname_pattern, name, :app_name_incorrect)
-              @_name = name
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/dapp/deployment/config/directive/app/instance_methods.rb

@@ -1,51 +0,0 @@
-module Dapp
-  module Deployment
-    module Config
-      module Directive
-        class App < Base
-          module InstanceMethods
-            attr_reader :_dimg, :_namespace, :_expose, :_migrate
-
-            def self.included(base)
-              base.include(Namespace::InstanceMethods)
-            end
-
-            def dimg(name)
-              @_dimg = name
-            end
-
-            def namespace(name, &blk)
-              (_namespace[name] ||= begin
-                Namespace.new(name, dapp: dapp).tap do |namespace|
-                  _namespace[name] = namespace
-                end
-              end).tap do |namespace|
-                directive_eval(namespace, &blk)
-              end
-            end
-
-            def expose(&blk)
-              directive_eval(_expose, &blk)
-            end
-
-            def migrate(cmd)
-              sub_directive_eval { @_migrate = cmd }
-            end
-
-            protected
-
-            def app_init_variables!
-              @_migrate   = []
-              @_namespace = {}
-              @_expose    = Expose.new(dapp: dapp)
-            end
-
-            def passed_directives
-              [:@_dimg, :@_namespace, :@_expose, :@_migrate, :@_environment, :@_secret_environment, :@_scale]
-            end
-          end # InstanceMethods
-        end # App
-      end # Directive
-    end # Config
-  end # Deployment
-end # Dapp

data/lib/dapp/deployment/config/directive/base.rb

@@ -1,13 +0,0 @@
-module Dapp
-  module Deployment
-    module Config
-      module Directive
-        class Base < ::Dapp::Config::Directive::Base
-          def hostname_pattern
-            '^[a-z0-9_-]*[a-z0-9]$'
-          end
-        end
-      end
-    end
-  end
-end