uffizzi_core 2.3.1 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3850d2cd7d36ca24933339885fe25fb104362e70a23c0b5145ab4711d8ce7ac9
-  data.tar.gz: 4872ba53b94906dc638b2a34875cd59876b074a8d815754b662320bf3119b87a
+  metadata.gz: 2132ab2650112542b20ad1d7710dd70927e4e5b2847ecfc22b095776a7839cfd
+  data.tar.gz: 139b01b159ccf2a464109277a2bedefac4b95cbd7d3dd8f5ccbe6a8192a12bd7
 SHA512:
-  metadata.gz: d54a01d42754e16b6d351aff2eb87a7dbcccd65344c3e61b3ff21f4a299755604aa330cfdfa7029038747b465c35d8694523e3f85c5f93763860565df76f0b9e
-  data.tar.gz: ad6654bb2bf294fa609ef61de08130ffba6071fcf600faad72c274093df1048f7adb16e53a49e552cbc94c5b3cf0b70ee40bf46188a66eda4518e57d693bb1db
+  metadata.gz: b0757185b908b94ac4c64288367810c58b0684f2d8cabc982d05182819d15608f40932cae3982e617887c0b34ee56193e45ca35a44edf7c83c7ce6c3cd6545ac
+  data.tar.gz: c419911fce7cc72693f13d4b98b7c429a99c81bb163ff3f4034b4ee2cb7877acec6efa1e29cc667c5ac6bd4844fdeef70b4087635505388bf960fd25c0a6da76

data/app/controllers/uffizzi_core/api/cli/v1/projects/clusters_controller.rb

@@ -60,6 +60,14 @@ class UffizziCore::Api::Cli::V1::Projects::ClustersController < UffizziCore::Api
     respond_with resource_cluster
   end
 
+  def sync
+    cluster_form = resource_cluster.becomes(UffizziCore::Api::Cli::V1::Cluster::SyncForm)
+    cluster_form.sync_status
+    cluster_form.save
+
+    respond_with cluster_form
+  end
+
   def destroy
     resource_cluster.disable!
 

data/app/forms/uffizzi_core/api/cli/v1/cluster/sync_form.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::Cluster::SyncForm < UffizziCore::Cluster
+  include UffizziCore::ApplicationForm
+
+  permit :state
+
+  def sync_status
+    cluster_data = UffizziCore::ControllerService.show_cluster(self)
+
+    asleep_in_cluster = cluster_data.status.sleep
+    return unless deployed? || scaled_down?
+    return if actual_status?(asleep_in_cluster)
+
+    self.state = asleep_in_cluster ? UffizziCore::Cluster::STATE_SCALED_DOWN : UffizziCore::Cluster::STATE_DEPLOYED
+
+    self
+  end
+
+  private
+
+  def actual_status?(asleep_in_cluster)
+    (asleep_in_cluster && scaled_down?) || (!asleep_in_cluster && deployed?)
+  end
+end

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/policies/uffizzi_core/api/cli/v1/projects/clusters_policy.rb

@@ -21,6 +21,10 @@ class UffizziCore::Api::Cli::V1::Projects::ClustersPolicy < UffizziCore::Applica
     context.user_access_module.admin_or_developer_access_to_project?(context.user, context.project)
   end
 
+  def sync?
+    context.user_access_module.admin_or_developer_access_to_project?(context.user, context.project)
+  end
+
   def destroy?
     context.user_access_module.admin_or_developer_access_to_project?(context.user, context.project)
   end

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/config/routes.rb

@@ -14,6 +14,7 @@ UffizziCore::Engine.routes.draw do
               member do
                 put :scale_down
                 put :scale_up
+                put :sync
               end
               scope module: :clusters do
                 resources :ingresses, only: ['index']

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.1
 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-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -821,6 +821,7 @@ files:
 - app/forms/uffizzi_core/api/cli/v1/account/credential/create_form.rb
 - app/forms/uffizzi_core/api/cli/v1/account/credential/update_form.rb
 - app/forms/uffizzi_core/api/cli/v1/cluster/create_form.rb
+- app/forms/uffizzi_core/api/cli/v1/cluster/sync_form.rb
 - app/forms/uffizzi_core/api/cli/v1/compose_file/check_credentials_form.rb
 - app/forms/uffizzi_core/api/cli/v1/compose_file/cli_form.rb
 - app/forms/uffizzi_core/api/cli/v1/compose_file/create_form.rb