Merge branch 'develop'

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: core
   specs:
-    uffizzi_core (2.4.6)
+    uffizzi_core (2.4.7)
       aasm
       actionpack (~> 6.1.0)
       active_model_serializers
@@ -111,7 +111,7 @@ GEM
     ast (2.4.2)
     awesome_print (1.9.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.895.0)
+    aws-partitions (1.897.0)
     aws-sdk-core (3.191.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)

core/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uffizzi_core (2.4.6)
+    uffizzi_core (2.4.7)
       aasm
       actionpack (~> 6.1.0)
       active_model_serializers

core/app/forms/uffizzi_core/api/cli/v1/cluster/create_form.rb

@@ -3,7 +3,7 @@
 class UffizziCore::Api::Cli::V1::Cluster::CreateForm < UffizziCore::Cluster
   include UffizziCore::ApplicationForm
 
-  permit :name, :manifest, :creation_source, :node_selector
+  permit :name, :manifest, :creation_source
 
   validate :check_manifest, if: -> { manifest.present? }
 

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

@@ -19,7 +19,6 @@ module UffizziCore::Concerns::Models::Cluster
     validates :name, presence: true, format: { with: /\A[a-zA-Z0-9-]*\z/ }
 
     enumerize :creation_source, in: UffizziCore.cluster_creation_sources, scope: true, predicates: true
-    enumerize :node_selector, in: [:gvisor, :vanilla]
     attribute :creation_source, :string, default: :manual
     validates :creation_source, presence: true
     belongs_to :kubernetes_distribution, optional: true

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

@@ -4,7 +4,7 @@ class UffizziCore::Controller::CreateCluster::ClusterSerializer < UffizziCore::B
   include UffizziCore::DependencyInjectionConcern
   include_module_if_exists('UffizziCore::Controller::CreateCluster::ClusterSerializerModule')
 
-  attributes :name, :manifest, :base_ingress_host, :distro, :image, :node_selector
+  attributes :name, :manifest, :base_ingress_host, :distro, :image
 
   def base_ingress_host
     managed_dns_zone = controller_settings_service.vcluster_settings_by_vcluster(object).managed_dns_zone

core/db/migrate/20240314170113_delete_node_selector_from_cluster.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class DeleteNodeSelectorFromCluster < ActiveRecord::Migration[6.1]
+  def change
+    remove_column(:uffizzi_core_clusters, :node_selector, :string)
+  end
+end

core/lib/uffizzi_core/version.rb

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

core/test/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2024_03_01_200235) do
+ActiveRecord::Schema.define(version: 2024_03_14_170113) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -85,7 +85,6 @@
     t.string "host"
     t.string "creation_source"
     t.integer "kubernetes_distribution_id"
-    t.string "node_selector"
     t.index ["project_id"], name: "index_cluster_on_project_id"
   end
 

db/migrate/20240314170425_delete_node_selector_from_cluster.uffizzi_core.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# This migration comes from uffizzi_core (originally 20240314170113)
+class DeleteNodeSelectorFromCluster < ActiveRecord::Migration[6.1]
+  def change
+    remove_column(:uffizzi_core_clusters, :node_selector, :string)
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2024_03_01_200916) do
+ActiveRecord::Schema.define(version: 2024_03_14_170425) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -85,7 +85,6 @@
     t.string "host"
     t.string "creation_source"
     t.integer "kubernetes_distribution_id"
-    t.string "node_selector"
     t.index ["project_id"], name: "index_cluster_on_project_id"
   end