uffizzi_core 2.2.24 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d8112c651358e76a331ea2e85d1562ecd15724adaf89eeebc10146958ef9550
-  data.tar.gz: fbc115075ccb252fbc6446b51fccd93c8571d3b106a83376b173b63c7de25fd7
+  metadata.gz: 065d0c7c4ecaca71f48ed176e3a433a379908220e7923be4604165d2d6760fe7
+  data.tar.gz: e79876e64df2b71896f0a34e40a7c1caf06b788914171a40e35b5feda33674d2
 SHA512:
-  metadata.gz: 55f7fb96c94e8dfca56310456bc3202764d1e16173fe57e96c027609748ae10bd758af06c355682c2c8ef2634b10402ce899778efb7467a99f16bd5aa4745a7f
-  data.tar.gz: 8d323b2dff07e8d9d03918e5642cd10093a9e2decc0f2cbf3a9e017b2ad99e8165bd447ea210a28a0497153b955244ebd68ce0d9d8db20424ed9cb05cfbf3273
+  metadata.gz: 1415234d2f29321aae904e5467a41108b44f5beb8291e6510a60dc58f72597a535e00a0a1a98d6208844717b7ca0b2c53fe6560a163983583a7ab60cc382d4dc
+  data.tar.gz: c1aea1bd41f011ad430ddd2c5af76d48518a2e4f099cb33615a4f81462a6cfee7777eeb80fef4607263cc403ed93580142db0166779002aa8272910da3d39f0d

data/app/clients/uffizzi_core/controller_client.rb

@@ -78,6 +78,14 @@ class UffizziCore::ControllerClient
     get("/namespaces/#{namespace}/cluster/#{name}")
   end
 
+  def patch_cluster(name:, namespace:, body:)
+    patch("/namespaces/#{namespace}/cluster/#{name}", body)
+  end
+
+  def ingresses(namespace:)
+    get("/namespaces/#{namespace}/ingresses")
+  end
+
   private
 
   def get(url, params = {})
@@ -88,6 +96,10 @@ class UffizziCore::ControllerClient
     make_request(:post, url, params)
   end
 
+  def patch(url, params = {})
+    make_request(:patch, url, params)
+  end
+
   def make_request(method, url, params)
     response = connection.send(method, url, params)
     body = response.body

data/app/contexts/uffizzi_core/project/cluster_context.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class UffizziCore::Project::ClusterContext
+  attr_reader :user, :user_access_module, :project, :cluster, :params
+
+  def initialize(user, project, user_access_module, cluster, params)
+    @user = user
+    @user_access_module = user_access_module
+    @project = project
+    @cluster = cluster
+    @params = params
+  end
+end

data/app/controllers/uffizzi_core/api/cli/v1/projects/clusters/application_controller.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::Projects::Clusters::ApplicationController < UffizziCore::Api::Cli::V1::Projects::ApplicationController
+  def resource_cluster
+    @resource_cluster ||= if request_by_admin? || valid_request_from_ci_workflow?
+      active_project_clusters.find_by!(name: params[:cluster_name])
+    else
+      active_project_clusters.deployed_by_user(current_user).find_by!(name: params[:cluster_name])
+    end
+  end
+
+  private
+
+  def active_project_clusters
+    @active_project_clusters ||= resource_project.clusters.enabled
+  end
+
+  def request_by_admin?
+    current_user.admin_access_to_project?(resource_project)
+  end
+
+  def valid_request_from_ci_workflow?
+    ci_module.valid_request_from_ci_workflow?(params)
+  end
+
+  def policy_context
+    UffizziCore::Project::ClusterContext.new(current_user, resource_project, user_access_module, resource_cluster, params)
+  end
+end

data/app/controllers/uffizzi_core/api/cli/v1/projects/clusters/ingresses_controller.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::Projects::Clusters::IngressesController <
+  UffizziCore::Api::Cli::V1::Projects::Clusters::ApplicationController
+  before_action :authorize_uffizzi_core_api_cli_v1_projects_clusters_ingresses
+
+  def index
+    hosts = UffizziCore::ControllerService.ingress_hosts(resource_cluster)
+    user_hosts = UffizziCore::ClusterService.filter_user_ingress_host(resource_cluster, hosts)
+
+    data = {
+      ingresses: user_hosts,
+    }
+
+    respond_with data
+  end
+end

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

@@ -30,6 +30,32 @@ class UffizziCore::Api::Cli::V1::Projects::ClustersController < UffizziCore::Api
     respond_with cluster_form
   end
 
+  def scale_down
+    if resource_cluster.deployed?
+      UffizziCore::ClusterService.scale_down!(resource_cluster)
+      return respond_with resource_cluster
+    end
+
+    return render_scale_error(I18n.t('cluster.already_asleep', name: resource_cluster.name)) if resource_cluster.scaled_down?
+
+    if resource_cluster.deploying_namespace? || resource_cluster.deploying?
+      render_scale_error(I18n.t('cluster.deploy_in_process', name: resource_cluster.name))
+    end
+  rescue AASM::InvalidTransition, UffizziCore::ClusterScaleError => e
+    render_scale_error(e.message)
+  end
+
+  def scale_up
+    if resource_cluster.scaled_down?
+      UffizziCore::ClusterService.scale_up!(resource_cluster)
+      return respond_with resource_cluster
+    end
+
+    return render_scale_error(I18n.t('cluster.already_awake', name: resource_cluster.name)) if resource_cluster.deployed?
+  rescue AASM::InvalidTransition, UffizziCore::ClusterScaleError => e
+    render_scale_error(e.message)
+  end
+
   def show
     respond_with resource_cluster
   end
@@ -63,6 +89,10 @@ class UffizziCore::Api::Cli::V1::Projects::ClustersController < UffizziCore::Api
     params.require(:cluster)
   end
 
+  def render_scale_error(message)
+    render json: { errors: { state: [message] } }, status: :unprocessable_entity
+  end
+
   def find_kubernetes_distribution(version)
     return UffizziCore::KubernetesDistribution.default if version.blank?
 

data/app/errors/uffizzi_core/cluster_scale_error.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class UffizziCore::ClusterScaleError < StandardError
+  def initialize(action)
+    message = I18n.t('cluster.scaling_failed', action: action)
+
+    super(message)
+  end
+end

data/app/jobs/uffizzi_core/cluster/manage_scaling_down_job.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class UffizziCore::Cluster::ManageScalingDownJob < UffizziCore::ApplicationJob
+  sidekiq_options queue: :clusters, retry: Settings.default_job_retry_count
+
+  def perform(id)
+    cluster = UffizziCore::Cluster.find(id)
+
+    UffizziCore::ClusterService.manage_scale_down(cluster)
+  end
+end

data/app/jobs/uffizzi_core/cluster/manage_scaling_up_job.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class UffizziCore::Cluster::ManageScalingUpJob < UffizziCore::ApplicationJob
+  sidekiq_options queue: :clusters, retry: Settings.default_job_retry_count
+
+  def perform(id, try = 1)
+    cluster = UffizziCore::Cluster.find(id)
+
+    UffizziCore::ClusterService.manage_scale_up(cluster, try)
+  end
+end

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

@@ -6,6 +6,7 @@ module UffizziCore::Concerns::Models::Cluster
 
   NAMESPACE_PREFIX = 'c'
 
+  # rubocop:disable Metrics/BlockLength
   included do
     include AASM
     extend Enumerize
@@ -27,6 +28,10 @@ module UffizziCore::Concerns::Models::Cluster
       state :failed_deploy_namespace
       state :deploying
       state :deployed
+      state :scaling_down
+      state :scaled_down
+      state :scaling_up
+      state :failed_scale_up
       state :failed
       state :disabled
 
@@ -42,12 +47,40 @@ module UffizziCore::Concerns::Models::Cluster
         transitions from: [:deploying], to: :deployed
       end
 
+      event :start_scaling_down do
+        transitions from: [:deployed], to: :scaling_down
+      end
+
+      event :scale_down do
+        transitions from: [:scaling_down], to: :scaled_down
+      end
+
+      event :start_scaling_up do
+        transitions from: [:scaled_down, :failed_scale_up], to: :scaling_up
+      end
+
+      event :scale_up do
+        transitions from: [:scaling_up], to: :deployed
+      end
+
+      event :fail_scale_up do
+        transitions from: [:scaling_up], to: :failed_scale_up
+      end
+
       event :fail do
         transitions from: [:deploying], to: :failed
       end
 
       event :disable, after: :after_disable do
-        transitions from: [:deploying_namespace, :failed_deploy_namespace, :deploying, :deployed, :failed], to: :disabled
+        transitions from: [
+          :deploying_namespace,
+          :failed_deploy_namespace,
+          :deploying,
+          :deployed,
+          :scaling_down,
+          :scaled_down,
+          :failed,
+        ], to: :disabled
       end
     end
 
@@ -59,4 +92,5 @@ module UffizziCore::Concerns::Models::Cluster
       [NAMESPACE_PREFIX, id].join
     end
   end
+  # rubocop:enable Metrics/BlockLength
 end

data/app/lib/uffizzi_core/rbac/user_access_service.rb

@@ -21,5 +21,9 @@ module UffizziCore::Rbac::UserAccessService
     def any_access_to_project?(_user, _project)
       true
     end
+
+    def admin_access_to_project?(_user, _project)
+      true
+    end
   end
 end

data/app/policies/uffizzi_core/api/cli/v1/projects/clusters/ingresses_policy.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::Projects::Clusters::IngressesPolicy < UffizziCore::ApplicationPolicy
+  def index?
+    return true if context.user_access_module.admin_access_to_project?(context.user, context.project)
+
+    context.cluster.deployed_by_id == context.user.id
+  end
+end

data/app/policies/uffizzi_core/api/cli/v1/projects/clusters_policy.rb

@@ -13,6 +13,14 @@ 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 scale_down?
+    context.user_access_module.admin_or_developer_access_to_project?(context.user, context.project)
+  end
+
+  def scale_up?
+    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/serializers/uffizzi_core/controller/update_cluster/cluster_serializer.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class UffizziCore::Controller::UpdateCluster::ClusterSerializer < UffizziCore::BaseSerializer
+  include UffizziCore::DependencyInjectionConcern
+  include_module_if_exists('UffizziCore::Controller::UpdateCluster::ClusterSerializerModule')
+
+  attributes :name, :manifest, :base_ingress_host
+
+  def base_ingress_host
+    managed_dns_zone = controller_settings_service.vcluster(object).managed_dns_zone
+
+    [object.namespace, managed_dns_zone].join('.')
+  end
+end

data/app/services/uffizzi_core/cluster_service.rb

@@ -24,6 +24,32 @@ class UffizziCore::ClusterService
       UffizziCore::Cluster::ManageDeployingJob.perform_in(5.seconds, cluster.id)
     end
 
+    def scale_up!(cluster)
+      cluster.start_scaling_up!
+      UffizziCore::ControllerService.patch_cluster(cluster, sleep: false)
+      UffizziCore::Cluster::ManageScalingUpJob.perform_in(5.seconds, cluster.id)
+    end
+
+    def manage_scale_up(cluster, try)
+      return cluster.fail_scale_up! if try > Settings.vcluster.max_scale_up_retry_count
+      return cluster.scale_up! if ready?(cluster)
+
+      UffizziCore::Cluster::ManageScalingUpJob.perform_in(5.seconds, cluster.id, ++try)
+    end
+
+    def scale_down!(cluster)
+      cluster.start_scaling_down!
+      UffizziCore::ControllerService.patch_cluster(cluster, sleep: true)
+
+      UffizziCore::Cluster::ManageScalingDownJob.perform_in(5.seconds, cluster.id)
+    end
+
+    def manage_scale_down(cluster)
+      return cluster.scale_down! unless awake?(cluster)
+
+      UffizziCore::Cluster::ManageScalingDownJob.perform_in(5.seconds, cluster.id)
+    end
+
     def manage_deploying(cluster, try)
       return if cluster.disabled?
       return cluster.fail! if try > Settings.vcluster.max_creation_retry_count
@@ -41,5 +67,23 @@ class UffizziCore::ClusterService
 
       UffizziCore::Cluster::ManageDeployingJob.perform_in(5.seconds, cluster.id, ++try)
     end
+
+    def filter_user_ingress_host(cluster, ingress_hosts)
+      ingress_hosts.reject { |h| h == cluster.host }
+    end
+
+    private
+
+    def awake?(cluster)
+      data = UffizziCore::ControllerService.show_cluster(cluster)
+
+      !data.status.sleep
+    end
+
+    def ready?(cluster)
+      data = UffizziCore::ControllerService.show_cluster(cluster)
+
+      data.status.ready
+    end
   end
 end

data/app/services/uffizzi_core/controller_service.rb

@@ -110,6 +110,23 @@ class UffizziCore::ControllerService
       controller_client(cluster).delete_cluster(namespace: cluster.namespace)
     end
 
+    def patch_cluster(cluster, sleep:)
+      body = UffizziCore::Controller::UpdateCluster::ClusterSerializer.new(cluster).as_json
+      body[:sleep] = sleep
+
+      controller_client(cluster).patch_cluster(name: cluster.name, namespace: cluster.namespace, body: body)
+    end
+
+    def ingress_hosts(cluster)
+      namespace = cluster.namespace
+
+      ingresses = controller_client(cluster).ingresses(namespace: namespace).result.items
+
+      ingresses.map do |ingress|
+        ingress.spec.rules.map(&:host)
+      end.flatten
+    end
+
     private
 
     def check_any_container_has_public_port(containers)

data/config/locales/en.yml

@@ -83,6 +83,12 @@ en:
   deployment:
     invalid_state: Preview with ID deployment-%{id} %{state}
     already_exists: An active deployment already exists
+  
+  cluster:
+    already_asleep: The cluster %{name} is already asleep.
+    already_awake: The cluster %{name} is already awake.
+    scaling_failed: Failed to %{action} cluster.
+    deploy_in_process: Please wait until the cluster %{name} is deployed.
 
   session:
     unsupported_login_type: This type of login is not supported

data/config/routes.rb

@@ -10,7 +10,15 @@ UffizziCore::Engine.routes.draw do
         resources :projects, only: ['index', 'show', 'destroy'], param: :slug do
           scope module: :projects do
             resource :compose_file, only: ['show', 'create', 'destroy']
-            resources :clusters, only: [:index, :create, :show, :destroy], param: :name
+            resources :clusters, only: [:index, :create, :show, :destroy], param: :name do
+              member do
+                put :scale_down
+                put :scale_up
+              end
+              scope module: :clusters do
+                resources :ingresses, only: ['index']
+              end
+            end
             resources :deployments, only: ['index', 'show', 'create', 'destroy', 'update'] do
               post :deploy_containers, on: :member
               scope module: :deployments do

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.2.24
+  version: 2.3.0
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-16 00:00:00.000000000 Z
+date: 2023-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -774,6 +774,7 @@ files:
 - app/clients/uffizzi_core/google_registry_client/request_result.rb
 - app/contexts/uffizzi_core/account_context.rb
 - app/contexts/uffizzi_core/base_context.rb
+- app/contexts/uffizzi_core/project/cluster_context.rb
 - app/contexts/uffizzi_core/project_context.rb
 - app/contexts/uffizzi_core/webhooks_context.rb
 - app/controller_modules/uffizzi_core/api/cli/v1/projects/clusters_controller_module.rb
@@ -791,6 +792,8 @@ files:
 - app/controllers/uffizzi_core/api/cli/v1/ci/application_controller.rb
 - app/controllers/uffizzi_core/api/cli/v1/ci/sessions_controller.rb
 - app/controllers/uffizzi_core/api/cli/v1/projects/application_controller.rb
+- app/controllers/uffizzi_core/api/cli/v1/projects/clusters/application_controller.rb
+- app/controllers/uffizzi_core/api/cli/v1/projects/clusters/ingresses_controller.rb
 - app/controllers/uffizzi_core/api/cli/v1/projects/clusters_controller.rb
 - app/controllers/uffizzi_core/api/cli/v1/projects/compose_files_controller.rb
 - app/controllers/uffizzi_core/api/cli/v1/projects/deployments/activity_items_controller.rb
@@ -804,6 +807,7 @@ files:
 - app/controllers/uffizzi_core/api/cli/v1/projects_controller.rb
 - app/controllers/uffizzi_core/api/cli/v1/sessions_controller.rb
 - app/controllers/uffizzi_core/application_controller.rb
+- app/errors/uffizzi_core/cluster_scale_error.rb
 - app/errors/uffizzi_core/compose_file/build_error.rb
 - app/errors/uffizzi_core/compose_file/credential_error.rb
 - app/errors/uffizzi_core/compose_file/parse_error.rb
@@ -841,6 +845,8 @@ files:
 - app/jobs/uffizzi_core/cluster/delete_job.rb
 - app/jobs/uffizzi_core/cluster/deploy_job.rb
 - app/jobs/uffizzi_core/cluster/manage_deploying_job.rb
+- app/jobs/uffizzi_core/cluster/manage_scaling_down_job.rb
+- app/jobs/uffizzi_core/cluster/manage_scaling_up_job.rb
 - app/jobs/uffizzi_core/config_file/apply_job.rb
 - app/jobs/uffizzi_core/deployment/create_credential_job.rb
 - app/jobs/uffizzi_core/deployment/create_credentials_job.rb
@@ -933,6 +939,7 @@ files:
 - app/policies/uffizzi_core/api/cli/v1/accounts/credentials_policy.rb
 - app/policies/uffizzi_core/api/cli/v1/accounts/projects_policy.rb
 - app/policies/uffizzi_core/api/cli/v1/accounts_policy.rb
+- app/policies/uffizzi_core/api/cli/v1/projects/clusters/ingresses_policy.rb
 - app/policies/uffizzi_core/api/cli/v1/projects/clusters_policy.rb
 - app/policies/uffizzi_core/api/cli/v1/projects/compose_files_policy.rb
 - app/policies/uffizzi_core/api/cli/v1/projects/deployments/activity_items_policy.rb
@@ -1000,6 +1007,7 @@ files:
 - app/serializers/uffizzi_core/controller/deploy_containers/container_serializer/container_host_volume_file_serializer.rb
 - app/serializers/uffizzi_core/controller/deploy_containers/credential_serializer.rb
 - app/serializers/uffizzi_core/controller/deploy_containers/host_volume_file_serializer.rb
+- app/serializers/uffizzi_core/controller/update_cluster/cluster_serializer.rb
 - app/services/uffizzi_core/account_service.rb
 - app/services/uffizzi_core/activity_item_service.rb
 - app/services/uffizzi_core/ci_service.rb