uffizzi_core 2.2.22 → 2.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a8b7a41bf7500c5bd99fcfade94c9f256eecb8a3531c4afb048902be526fc60
-  data.tar.gz: 1a5c2e46220213fc439161c1b65d1535f9673b3885ca3b4559f049b0b7e19c86
+  metadata.gz: 2d8112c651358e76a331ea2e85d1562ecd15724adaf89eeebc10146958ef9550
+  data.tar.gz: fbc115075ccb252fbc6446b51fccd93c8571d3b106a83376b173b63c7de25fd7
 SHA512:
-  metadata.gz: 24b7a0c6c99809788c6606c1b21561ce0a7f14d639ebd321d66de8e7949285f61561b41cd3f060fe885b3c4ca943d0c1b2a7d0c626f33244071836cb27d7beb7
-  data.tar.gz: 86ec582667bd5dd7b02e2f348f6f14aa781ce5a18f4c5c0f907656af6fcf54041db4a26c14256c82a78b0e85b158082de688f6a23bb860f61280ffdc66a311c7
+  metadata.gz: 55f7fb96c94e8dfca56310456bc3202764d1e16173fe57e96c027609748ae10bd758af06c355682c2c8ef2634b10402ce899778efb7467a99f16bd5aa4745a7f
+  data.tar.gz: 8d323b2dff07e8d9d03918e5642cd10093a9e2decc0f2cbf3a9e017b2ad99e8165bd447ea210a28a0497153b955244ebd68ce0d9d8db20424ed9cb05cfbf3273

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

@@ -11,13 +11,18 @@ class UffizziCore::Api::Cli::V1::Projects::ClustersController < UffizziCore::Api
     clusters = resource_project.clusters.enabled
     return respond_with clusters if request_by_admin? || valid_request_from_ci_workflow?
 
-    respond_with clusters.deployed_by_user(current_user)
+    respond_with clusters.deployed_by_user(current_user), each_serializer: UffizziCore::Api::Cli::V1::Projects::ShortClusterSerializer
   end
 
   def create
+    version = cluster_params[:k8s_version]
+    kubernetes_distribution = find_kubernetes_distribution(version)
+    return render_distribution_version_error(version) if kubernetes_distribution.blank?
+
     cluster_form = UffizziCore::Api::Cli::V1::Cluster::CreateForm.new(cluster_params)
     cluster_form.project = resource_project
     cluster_form.deployed_by = current_user
+    cluster_form.kubernetes_distribution = kubernetes_distribution
     return respond_with cluster_form unless cluster_form.save
 
     UffizziCore::ClusterService.start_deploy(cluster_form)
@@ -57,4 +62,16 @@ class UffizziCore::Api::Cli::V1::Projects::ClustersController < UffizziCore::Api
   def cluster_params
     params.require(:cluster)
   end
+
+  def find_kubernetes_distribution(version)
+    return UffizziCore::KubernetesDistribution.default if version.blank?
+
+    UffizziCore::KubernetesDistribution.find_by(version: version)
+  end
+
+  def render_distribution_version_error(version)
+    available_versions = UffizziCore::KubernetesDistribution.pluck(:version).join(', ')
+    message = I18n.t('kubernetes_distribution.not_available', version: version, available_versions: available_versions)
+    render json: { errors: { kubernetes_distribution: [message] } }, status: :unprocessable_entity
+  end
 end

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

@@ -20,6 +20,7 @@ module UffizziCore::Concerns::Models::Cluster
     enumerize :creation_source, in: UffizziCore.cluster_creation_sources, scope: true, predicates: true
     attribute :creation_source, :string, default: :manual
     validates :creation_source, presence: true
+    belongs_to :kubernetes_distribution, optional: true
 
     aasm(:state) do
       state :deploying_namespace, initial: true

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module UffizziCore::Concerns::Models::KubernetesDistribution
+  extend ActiveSupport::Concern
+
+  included do
+    self.table_name = UffizziCore.table_names[:kubernetes_distributions]
+
+    has_many :clusters
+
+    def self.default
+      find_by(default: true)
+    end
+  end
+end

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

@@ -3,6 +3,7 @@
 module UffizziCore::Concerns::Models::Project
   extend ActiveSupport::Concern
 
+  # rubocop:disable Metrics/BlockLength
   included do
     include AASM
     include UffizziCore::StateMachineConcern
@@ -43,10 +44,15 @@ module UffizziCore::Concerns::Models::Project
 
     def after_disable
       disable_deployments
+      disable_clusters
     end
 
     def active_deployments
-      deployments.active
+      deployments.enabled
+    end
+
+    def active_clusters
+      clusters.enabled
     end
 
     def disable_deployments
@@ -56,8 +62,13 @@ module UffizziCore::Concerns::Models::Project
       end
     end
 
+    def disable_clusters
+      active_clusters.each(&:disable!)
+    end
+
     def compose_file
       compose_files.main.first
     end
   end
+  # rubocop:enable Metrics/BlockLength
 end

data/app/models/uffizzi_core/kubernetes_distribution.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class UffizziCore::KubernetesDistribution < UffizziCore::ApplicationRecord
+  include UffizziCore::Concerns::Models::KubernetesDistribution
+end

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

@@ -3,5 +3,9 @@
 class UffizziCore::Api::Cli::V1::Projects::ClusterSerializer < UffizziCore::BaseSerializer
   type :cluster
 
-  attributes :id, :name, :state, :kubeconfig, :created_at, :host
+  attributes :id, :name, :state, :kubeconfig, :created_at, :host, :k8s_version
+
+  def k8s_version
+    object.kubernetes_distribution&.version || UffizziCore::KubernetesDistribution.default.version
+  end
 end

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::Projects::ShortClusterSerializer < UffizziCore::BaseSerializer
+  type :cluster
+
+  attributes :id, :name
+end

data/app/serializers/uffizzi_core/controller/create_cluster/cluster_serializer.rb

@@ -4,11 +4,25 @@ class UffizziCore::Controller::CreateCluster::ClusterSerializer < UffizziCore::B
   include UffizziCore::DependencyInjectionConcern
   include_module_if_exists('UffizziCore::Controller::CreateCluster::ClusterSerializerModule')
 
-  attributes :name, :manifest, :base_ingress_host
+  attributes :name, :manifest, :base_ingress_host, :distro, :image
 
   def base_ingress_host
     managed_dns_zone = controller_settings_service.vcluster(object).managed_dns_zone
 
     [object.namespace, managed_dns_zone].join('.')
   end
+
+  def image
+    kubernetes_distribution.image
+  end
+
+  def distro
+    kubernetes_distribution.distro
+  end
+
+  private
+
+  def kubernetes_distribution
+    @kubernetes_distribution ||= object.kubernetes_distribution
+  end
 end

data/app/services/uffizzi_core/compose_file/parsers/services_parser_service.rb

@@ -70,7 +70,7 @@ class UffizziCore::ComposeFile::Parsers::ServicesParserService
     def check_and_parse_build_option(value, compose_payload)
       build_parser_module = find_build_parser_module
 
-      raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.not_implemented', option: :build) unless build_parser_module
+      raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.build_not_implemented') unless build_parser_module
 
       build_parser_module.parse(value, compose_payload)
     end

data/config/locales/en.yml

@@ -74,6 +74,7 @@ en:
     required_start_commands: "When 'test' is a list the first item must be one of: '%{available_commands}'"
     volumes_should_be_array: Volumes '%{volumes}' should be an arra
     healthcheck_missing_required_option: "One of these options is required: %{required_options}"
+    build_not_implemented: "The 'build' directive is not supported by the uffizzi command-line tool. Use 'image' instead, or configure Uffizzi CI if you want Uffizzi Cloud to build your application from source. See https://docs.uffizzi.com/references/compose-spec/"
 
   secrets:
     duplicates_exists: Secret with key %{secrets} already exist.
@@ -87,6 +88,9 @@ en:
     unsupported_login_type: This type of login is not supported
     unauthorized: Unauthorized
 
+  kubernetes_distribution:
+    not_available: "The k8s version %{version} is not supported. Available version are: %{available_versions}."
+
   enumerize:
     credential:
       type:

data/db/migrate/20231009162719_create_uffizzi_core_kubernetes_distributions.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class CreateUffizziCoreKubernetesDistributions < ActiveRecord::Migration[6.1]
+  def change
+    create_table :uffizzi_core_kubernetes_distributions do |t|
+      t.string :version
+      t.string :distro
+      t.string :image
+      t.boolean :default, default: false
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20231009182412_add_kubernetes_distribution_id_to_uffizzi_core_clusters.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddKubernetesDistributionIdToUffizziCoreClusters < ActiveRecord::Migration[6.1]
+  def change
+    add_column(:uffizzi_core_clusters, :kubernetes_distribution_id, :integer, foreign_key: true)
+  end
+end

data/lib/uffizzi_core/version.rb

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

data/lib/uffizzi_core.rb

@@ -66,6 +66,7 @@ module UffizziCore
     host_volume_files: :uffizzi_core_host_volume_files,
     container_host_volume_files: :uffizzi_core_container_host_volume_files,
     deployment_events: :uffizzi_core_deployment_events,
+    kubernetes_distributions: :uffizzi_core_kubernetes_distributions,
   }
   mattr_accessor :user_creation_sources, default: [:system, :online_registration, :google, :sso]
   mattr_accessor :user_project_roles, default: [:admin, :developer, :viewer]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.2.22
+  version: 2.2.24
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-07 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -865,6 +865,7 @@ files:
 - app/lib/uffizzi_core/concerns/models/deployment_event.rb
 - app/lib/uffizzi_core/concerns/models/event.rb
 - app/lib/uffizzi_core/concerns/models/host_volume_file.rb
+- app/lib/uffizzi_core/concerns/models/kubernetes_distribution.rb
 - app/lib/uffizzi_core/concerns/models/membership.rb
 - app/lib/uffizzi_core/concerns/models/payment.rb
 - app/lib/uffizzi_core/concerns/models/price.rb
@@ -909,6 +910,7 @@ files:
 - app/models/uffizzi_core/deployment_event.rb
 - app/models/uffizzi_core/event.rb
 - app/models/uffizzi_core/host_volume_file.rb
+- app/models/uffizzi_core/kubernetes_distribution.rb
 - app/models/uffizzi_core/membership.rb
 - app/models/uffizzi_core/payment.rb
 - app/models/uffizzi_core/price.rb
@@ -982,6 +984,7 @@ files:
 - app/serializers/uffizzi_core/api/cli/v1/projects/deployments_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/projects/deployments_serializer/user_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/projects/secret_serializer.rb
+- app/serializers/uffizzi_core/api/cli/v1/projects/short_cluster_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/short_project_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/user_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/user_serializer/account_serializer.rb
@@ -1088,6 +1091,8 @@ files:
 - db/migrate/20230711101901_add_host_to_clusters.rb
 - db/migrate/20230810140316_add_source_to_uffizzi_core_clusters.rb
 - db/migrate/20230824150022_update_name_constraint_to_projects.rb
+- db/migrate/20231009162719_create_uffizzi_core_kubernetes_distributions.rb
+- db/migrate/20231009182412_add_kubernetes_distribution_id_to_uffizzi_core_clusters.rb
 - db/seeds.rb
 - lib/tasks/uffizzi_core_tasks.rake
 - lib/uffizzi_core.rb