uffizzi_core 2.3.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 065d0c7c4ecaca71f48ed176e3a433a379908220e7923be4604165d2d6760fe7
-  data.tar.gz: e79876e64df2b71896f0a34e40a7c1caf06b788914171a40e35b5feda33674d2
+  metadata.gz: 81b82f01fa3b61eea7546716b1d7bd696ada00810ab5ce6ca72bc6c609bb7266
+  data.tar.gz: da50fab31a969b5169a8025034603fb9500dc40c220a17a8fb98667f4ed14f3e
 SHA512:
-  metadata.gz: 1415234d2f29321aae904e5467a41108b44f5beb8291e6510a60dc58f72597a535e00a0a1a98d6208844717b7ca0b2c53fe6560a163983583a7ab60cc382d4dc
-  data.tar.gz: c1aea1bd41f011ad430ddd2c5af76d48518a2e4f099cb33615a4f81462a6cfee7777eeb80fef4607263cc403ed93580142db0166779002aa8272910da3d39f0d
+  metadata.gz: e2116c59a1f5d6f49f76bc08506e55a67bf7a8ebd4d38d5288f0d6f7664d36182206e30d33c42d88909ac7b9510122df3aa2c38cd6fd3ad6137640e213fb6a5d
+  data.tar.gz: 3573e168fe9af86a4d49b38b0d416cf856434c1d6a2d04ff7d1634f1947e3b25d0a34fdd72366c1f7b0e173d6a4718ed453e5f1c744b9d52a2b2e1a19c4bb360

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

@@ -2,6 +2,7 @@
 
 module UffizziCore::Concerns::Models::Container
   extend ActiveSupport::Concern
+  REQUEST_MEMORY_RATIO = 4
 
   # rubocop:disable Metrics/BlockLength
   included do

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

@@ -9,6 +9,7 @@ module UffizziCore::Concerns::Models::Deployment
     include UffizziCore::StateMachineConcern
     include UffizziCore::DeploymentRepo
     extend Enumerize
+    include UffizziCore::DependencyInjectionConcern
 
     self.table_name = UffizziCore.table_names[:deployments]
 
@@ -71,7 +72,8 @@ module UffizziCore::Concerns::Models::Deployment
     end
 
     def preview_url
-      "#{subdomain}.#{Settings.app.managed_dns_zone}"
+      managed_dns_zone = controller_settings_service.deployment(self).managed_dns_zone
+      "#{subdomain}.#{managed_dns_zone}"
     end
 
     def namespace

data/app/services/uffizzi_core/compose_file/builders/container_builder_service.rb

@@ -29,6 +29,7 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
     is_ingress = ingress_container?(container_name, ingress_data)
     repo_attributes = repo_attributes(container_data, continuous_preview_global_data)
     additional_subdomains = is_ingress ? ingress_data.fetch(:additional_subdomains, []) : []
+    memory_limit = memory_limit(deploy_data)
 
     {
       tag: tag(image_data, repo_attributes),
@@ -40,8 +41,8 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
       command: command(container_data),
       variables: variables(environment, env_file_dependencies),
       secret_variables: secret_variables(secrets),
-      memory_limit: memory(deploy_data),
-      memory_request: memory(deploy_data),
+      memory_limit: memory_limit,
+      memory_request: memory_request(memory_limit),
       repo_attributes: repo_attributes,
       continuously_deploy: continuously_deploy(deploy_data),
       receive_incoming_requests: is_ingress,
@@ -161,7 +162,7 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
     command_data[:command_args].to_s
   end
 
-  def memory(deploy_data)
+  def memory_limit(deploy_data)
     memory = deploy_data[:memory]
     return Settings.compose.default_memory if memory.nil?
 
@@ -184,6 +185,10 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
     memory_value
   end
 
+  def memory_request(memory)
+    memory / UffizziCore::Container::REQUEST_MEMORY_RATIO
+  end
+
   def continuously_deploy(deploy_data)
     return :disabled if deploy_data[:auto] == false
 

data/app/services/uffizzi_core/controller_service.rb

@@ -145,7 +145,7 @@ class UffizziCore::ControllerService
     def controller_client(deployable)
       settings = case deployable
                  when UffizziCore::Deployment
-                   Settings.controller
+                   controller_settings_service.deployment(deployable)
                  when UffizziCore::Cluster
                    controller_settings_service.vcluster(deployable)
                  else

data/app/services/uffizzi_core/controller_settings_service.rb

@@ -5,5 +5,11 @@ class UffizziCore::ControllerSettingsService
     def vcluster(_cluster)
       Settings.vcluster_controller
     end
+
+    def deployment(_cluster)
+      Settings.controller.deep_dup.tap do |s|
+        s.managed_dns_zone = Settings.app.managed_dns_zone
+      end
+    end
   end
 end

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.2
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-30 00:00:00.000000000 Z
+date: 2023-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm