uffizzi_core 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9a737645810c1744fe73cfbfb2e0d249d0895d75105065dcec75e7f4dea0844
-  data.tar.gz: a303130b01e8538a78dd5d891c2d8b9a51224c50d25b0ef5cdb830a7de55de2d
+  metadata.gz: 6a34bc3da603108f8c6b1638f14d4e5025f3cc255062fff2f32fb849a6eb7206
+  data.tar.gz: 510bc658ead7b29c8bfe04e980fd47f6b4a5c5121d33048d7042a49a41d9d70f
 SHA512:
-  metadata.gz: '043837408678dd986b192992cd149f9ca67c1490b7cc07a49cbbc464302fb717ca27ddbcd1819093e92ea7cc7c095930e349caed34bed2593dac4fc01e00c41f'
-  data.tar.gz: 62e606f4b9e4ef2ccbcdb0f7f73a6acf91970e1697a00f87a03675ce63fc18f84c835e165e45ab47a7b5797db9b278e83654de02e381631832d37e98c6d6de37
+  metadata.gz: 5a17109e4ace94f959f562d6b60be739faf9b07ef9b7712ac6f09bb005f060b0a1fc9e9acc37dec369540ae394c2aa53a934ab6084fcf1474349cc0ab02226d3
+  data.tar.gz: 83882b00eadefad47f00ef89aab8e07be1e15e8e4193b06b1608c0b92c7e0562677c0b2ca7ef8c5fb5fee76bd770465f7353fed35bb044cdb5f2e7620fbd5a4f

data/app/controllers/concerns/uffizzi_core/dependency_injection_concern.rb

@@ -55,6 +55,24 @@ module UffizziCore::DependencyInjectionConcern
     module_class(:domain_module)
   end
 
+  def deployment_memory_module
+    return unless module_exists?(:deployment_memory_module)
+
+    module_class(:deployment_memory_module)
+  end
+
+  def template_memory_module
+    return unless module_exists?(:template_memory_module)
+
+    module_class(:template_memory_module)
+  end
+
+  def controller_settings_service
+    return unless module_exists?(:controller_settings)
+
+    module_class(:controller_settings)
+  end
+
   private
 
   def module_exists?(module_name)

data/app/forms/uffizzi_core/api/cli/v1/deployment/create_form.rb

@@ -55,8 +55,6 @@ class UffizziCore::Api::Cli::V1::Deployment::CreateForm < UffizziCore::Deploymen
 
   validate :check_all_containers_have_unique_ports
   validate :check_exists_ingress_container
-  validate :check_max_memory_limit
-  validate :check_max_memory_request
   validate :check_secrets_exist_in_database
 
   def assign_dependences!(project, user)
@@ -87,18 +85,6 @@ class UffizziCore::Api::Cli::V1::Deployment::CreateForm < UffizziCore::Deploymen
     errors.add(:containers, :incorrect_ingress_container) unless UffizziCore::DeploymentService.ingress_container?(active_containers)
   end
 
-  def check_max_memory_limit
-    return if UffizziCore::DeploymentService.valid_containers_memory_limit?(self)
-
-    errors.add(:containers, :max_memory_limit_error, max: project.account.container_memory_limit)
-  end
-
-  def check_max_memory_request
-    return if UffizziCore::DeploymentService.valid_containers_memory_request?(self)
-
-    errors.add(:containers, :max_memory_request_error, max: project.account.container_memory_limit)
-  end
-
   def check_secrets_exist_in_database
     return if compose_file.nil?
 

data/app/forms/uffizzi_core/api/cli/v1/deployment/update_form.rb

@@ -54,8 +54,6 @@ class UffizziCore::Api::Cli::V1::Deployment::UpdateForm < UffizziCore::Deploymen
 
   validate :check_all_containers_have_unique_ports
   validate :check_exists_ingress_container
-  validate :check_max_memory_limit
-  validate :check_max_memory_request
 
   def assign_dependences!(project, user)
     self.project = project
@@ -84,16 +82,4 @@ class UffizziCore::Api::Cli::V1::Deployment::UpdateForm < UffizziCore::Deploymen
 
     errors.add(:containers, :incorrect_ingress_container) unless UffizziCore::DeploymentService.ingress_container?(active_containers)
   end
-
-  def check_max_memory_limit
-    return if UffizziCore::DeploymentService.valid_containers_memory_limit?(self)
-
-    errors.add(:containers, :max_memory_limit_error, max: project.account.container_memory_limit)
-  end
-
-  def check_max_memory_request
-    return if UffizziCore::DeploymentService.valid_containers_memory_request?(self)
-
-    errors.add(:containers, :max_memory_request_error, max: project.account.container_memory_limit)
-  end
 end

data/app/forms/uffizzi_core/api/cli/v1/template/create_form.rb

@@ -1,20 +1,4 @@
 # frozen_string_literal: true
 
 class UffizziCore::Api::Cli::V1::Template::CreateForm < UffizziCore::Template
-  validate :check_max_memory_limit
-  validate :check_max_memory_request
-
-  private
-
-  def check_max_memory_limit
-    return if valid_containers_memory_limit?
-
-    errors.add(:payload, :max_memory_limit_error, max: project.account.container_memory_limit)
-  end
-
-  def check_max_memory_request
-    return if valid_containers_memory_request?
-
-    errors.add(:payload, :max_memory_request_error, max: project.account.container_memory_limit)
-  end
 end

data/app/lib/uffizzi_core/concerns/models/cluster.rb

@@ -41,7 +41,7 @@ module UffizziCore::Concerns::Models::Cluster
       end
 
       event :disable, after: :after_disable do
-        transitions from: [:failed_deploy_namespace, :deploying, :deployed, :failed], to: :disabled
+        transitions from: [:deploying_namespace, :failed_deploy_namespace, :deploying, :deployed, :failed], to: :disabled
       end
     end
 

data/app/lib/uffizzi_core/concerns/models/template.rb

@@ -18,21 +18,5 @@ module UffizziCore::Concerns::Models::Template
     enumerize :creation_source, in: [:manual, :compose_file, :system], predicates: true, scope: true
 
     validates :name, presence: true
-
-    def valid_containers_memory_limit?
-      containers_attributes = payload['containers_attributes']
-      container_memory_limit = project.account.container_memory_limit
-      return true if container_memory_limit.nil?
-
-      containers_attributes.all? { |container| container['memory_limit'].to_i <= container_memory_limit }
-    end
-
-    def valid_containers_memory_request?
-      containers_attributes = payload['containers_attributes']
-      container_memory_limit = project.account.container_memory_limit
-      return true if container_memory_limit.nil?
-
-      containers_attributes.all? { |container| container['memory_request'].to_i <= container_memory_limit }
-    end
   end
 end

data/app/models/uffizzi_core/deployment.rb

@@ -21,4 +21,14 @@
 
 class UffizziCore::Deployment < UffizziCore::ApplicationRecord
   include UffizziCore::Concerns::Models::Deployment
+  include UffizziCore::DependencyInjectionConcern
+
+  validate :check_max_memory_limit
+
+  def check_max_memory_limit
+    return if deployment_memory_module.valid_memory_limit?(self)
+
+    deployment_memory_module.memory_limit_error_message(self)
+    errors.add(:containers, message)
+  end
 end

data/app/models/uffizzi_core/template.rb

@@ -2,4 +2,14 @@
 
 class UffizziCore::Template < UffizziCore::ApplicationRecord
   include UffizziCore::Concerns::Models::Template
+  include UffizziCore::DependencyInjectionConcern
+
+  validate :check_max_memory_limit
+
+  def check_max_memory_limit
+    return if template_memory_module.valid_memory_limit?(self)
+
+    message = template_memory_module.memory_limit_error_message(self)
+    errors.add(:payload, message)
+  end
 end

data/app/serializers/uffizzi_core/api/cli/v1/projects/cluster_serializer.rb

@@ -3,5 +3,5 @@
 class UffizziCore::Api::Cli::V1::Projects::ClusterSerializer < UffizziCore::BaseSerializer
   type :cluster
 
-  attributes :name, :state, :kubeconfig
+  attributes :name, :state, :kubeconfig, :created_at, :host
 end

data/app/services/uffizzi_core/cluster_service.rb

@@ -33,6 +33,7 @@ class UffizziCore::ClusterService
       if deployed_cluster.status.ready && deployed_cluster.status.kube_config.present?
         cluster.finish_deploy
         cluster.kubeconfig = deployed_cluster.status.kube_config
+        cluster.host = deployed_cluster.status.host
         cluster.save!
 
         return

data/app/services/uffizzi_core/container_service.rb

@@ -23,22 +23,6 @@ class UffizziCore::ContainerService
       container.aasm(:continuously_deploy).current_state == UffizziCore::Container::STATE_CD_ENABLED
     end
 
-    def valid_memory_limit?(container)
-      max_memory_limit = container.deployment.project.account.container_memory_limit
-      container_memory_limit = container.memory_limit
-      return true if max_memory_limit.nil? || container_memory_limit.nil?
-
-      container_memory_limit <= max_memory_limit
-    end
-
-    def valid_memory_request?(container)
-      max_memory_limit = container.deployment.project.account.container_memory_limit
-      container_memory_request = container.memory_request
-      return true if max_memory_limit.nil? || container_memory_request.nil?
-
-      container_memory_request <= max_memory_limit
-    end
-
     def last_state(container)
       pods = pods_by_container(container)
       container_status = container_status(container, pods)

data/app/services/uffizzi_core/controller_service.rb

@@ -109,7 +109,7 @@ class UffizziCore::ControllerService
                  when UffizziCore::Deployment
                    Settings.controller
                  when UffizziCore::Cluster
-                   Settings.vcluster_controller
+                   controller_settings_service.vcluster(deployable)
                  else
                    raise StandardError, "Deployable #{deployable.class.name} undefined"
       end

data/app/services/uffizzi_core/controller_settings_service.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class UffizziCore::ControllerSettingsService
+  class << self
+    def vcluster(_cluster)
+      Settings.vcluster_controller
+    end
+  end
+end

data/app/services/uffizzi_core/deployment/memory_service.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class UffizziCore::Deployment::MemoryService
+  class << self
+    def valid_memory_limit?(_deployment)
+      true
+    end
+
+    def memory_limit_error_message(_deployment); end
+  end
+end

data/app/services/uffizzi_core/deployment_service.rb

@@ -101,22 +101,6 @@ class UffizziCore::DeploymentService
       containers.empty? || ports.size == ports.uniq.size
     end
 
-    def valid_containers_memory_limit?(deployment)
-      containers = deployment.containers
-      container_memory_limit = deployment.project.account.container_memory_limit
-      return true if container_memory_limit.nil?
-
-      containers.all? { |container| container.memory_limit <= container_memory_limit }
-    end
-
-    def valid_containers_memory_request?(deployment)
-      containers = deployment.containers
-      container_memory_limit = deployment.project.account.container_memory_limit
-      return true if container_memory_limit.nil?
-
-      containers.all? { |container| container.memory_request <= container_memory_limit }
-    end
-
     def ingress_container?(containers)
       containers.empty? || containers.map(&:receive_incoming_requests).count(true) == 1
     end

data/app/services/uffizzi_core/template/memory_service.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class UffizziCore::Template::MemoryService
+  class << self
+    def valid_memory_limit?(_template)
+      true
+    end
+
+    def memory_limit_error_message(_template); end
+  end
+end

data/config/locales/en.activerecord.yml

@@ -19,8 +19,7 @@ en:
         uffizzi_core/deployment:
           attributes:
             containers:
-              max_memory_limit_error: "Memory limit of containers must be less than %{max}"
-              max_memory_request_error: "Memory request of containers must be less than %{max}"
+              max_memory_limit_error: "Total memory limit of containers must be less than %{max}"
         uffizzi_core/user:
           attributes:
             email:

data/db/migrate/20230711101901_add_host_to_clusters.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddHostToClusters < ActiveRecord::Migration[6.1]
+  def change
+    add_column(:uffizzi_core_clusters, :host, :string)
+  end
+end

data/lib/uffizzi_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '2.2.4'
+  VERSION = '2.2.5'
 end

data/lib/uffizzi_core.rb

@@ -30,6 +30,9 @@ require 'faraday/follow_redirects'
 module UffizziCore
   mattr_accessor :dependencies, default: {
     rbac: 'UffizziCore::Rbac::UserAccessService',
+    deployment_memory_module: 'UffizziCore::Deployment::MemoryService',
+    template_memory_module: 'UffizziCore::Template::MemoryService',
+    controller_settings: 'UffizziCore::ControllerSettingsService',
   }
   mattr_accessor :table_names, default: {
     accounts: :uffizzi_core_accounts,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-17 00:00:00.000000000 Z
+date: 2023-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -1023,13 +1023,16 @@ files:
 - app/services/uffizzi_core/container_registry_service.rb
 - app/services/uffizzi_core/container_service.rb
 - app/services/uffizzi_core/controller_service.rb
+- app/services/uffizzi_core/controller_settings_service.rb
 - app/services/uffizzi_core/deployment/domain_service.rb
+- app/services/uffizzi_core/deployment/memory_service.rb
 - app/services/uffizzi_core/deployment_service.rb
 - app/services/uffizzi_core/logs_service.rb
 - app/services/uffizzi_core/manage_activity_items_service.rb
 - app/services/uffizzi_core/project_service.rb
 - app/services/uffizzi_core/repo_service.rb
 - app/services/uffizzi_core/response_service.rb
+- app/services/uffizzi_core/template/memory_service.rb
 - app/services/uffizzi_core/token_service.rb
 - app/services/uffizzi_core/user_access_service.rb
 - app/services/uffizzi_core/user_generator_service.rb
@@ -1063,6 +1066,7 @@ files:
 - db/migrate/20230406154451_add_full_image_name_to_container.rb
 - db/migrate/20230531135739_create_deployment_events.rb
 - db/migrate/20230613101901_create_clusters.rb
+- db/migrate/20230711101901_add_host_to_clusters.rb
 - db/seeds.rb
 - lib/tasks/uffizzi_core_tasks.rake
 - lib/uffizzi_core.rb