uffizzi_core 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3850d2cd7d36ca24933339885fe25fb104362e70a23c0b5145ab4711d8ce7ac9
-  data.tar.gz: 4872ba53b94906dc638b2a34875cd59876b074a8d815754b662320bf3119b87a
+  metadata.gz: 81b82f01fa3b61eea7546716b1d7bd696ada00810ab5ce6ca72bc6c609bb7266
+  data.tar.gz: da50fab31a969b5169a8025034603fb9500dc40c220a17a8fb98667f4ed14f3e
 SHA512:
-  metadata.gz: d54a01d42754e16b6d351aff2eb87a7dbcccd65344c3e61b3ff21f4a299755604aa330cfdfa7029038747b465c35d8694523e3f85c5f93763860565df76f0b9e
-  data.tar.gz: ad6654bb2bf294fa609ef61de08130ffba6071fcf600faad72c274093df1048f7adb16e53a49e552cbc94c5b3cf0b70ee40bf46188a66eda4518e57d693bb1db
+  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/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/lib/uffizzi_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '2.3.1'
+  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.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-28 00:00:00.000000000 Z
+date: 2023-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm