From a3c6bf5a9ac56162d567e3306b5090ea8285da85 Mon Sep 17 00:00:00 2001 From: Ashvin Sharma Date: Tue, 14 Oct 2025 19:47:49 +0530 Subject: [PATCH 1/2] Delete desired config generator version column This is done because we are no longer using desired_config_generator. All the kubernetes configuration is frozen at the time of workspace creation and is re-used for reconciliation. Changelog: other EE: true --- ...desired_config_generator_version_column.rb | 20 +++++++++++++++++++ db/schema_migrations/20251014140356 | 1 + db/structure.sql | 3 --- 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 db/post_migrate/20251014140356_remove_workspace_desired_config_generator_version_column.rb create mode 100644 db/schema_migrations/20251014140356 diff --git a/db/post_migrate/20251014140356_remove_workspace_desired_config_generator_version_column.rb b/db/post_migrate/20251014140356_remove_workspace_desired_config_generator_version_column.rb new file mode 100644 index 00000000000000..294e75ac8c045c --- /dev/null +++ b/db/post_migrate/20251014140356_remove_workspace_desired_config_generator_version_column.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +class RemoveWorkspaceDesiredConfigGeneratorVersionColumn < Gitlab::Database::Migration[2.3] + disable_ddl_transaction! + milestone '18.5' + + def up + remove_column :workspaces, :desired_config_generator_version + end + + def down + add_column :workspaces, :desired_config_generator_version, :integer, default: 3 + add_concurrent_index( + :workspaces, + :id, + where: "desired_config_generator_version IS NULL", + name: "idx_workspaces_null_config_version_id" + ) + end +end diff --git a/db/schema_migrations/20251014140356 b/db/schema_migrations/20251014140356 new file mode 100644 index 00000000000000..4c3f0fb96196cd --- /dev/null +++ b/db/schema_migrations/20251014140356 @@ -0,0 +1 @@ +a459ee0d2bfd8f3b66a430d9411867f476832a646bd3a2459472e6075644b0fd \ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 493aecdd6d88ae..9f400f08431a18 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -29469,7 +29469,6 @@ CREATE TABLE workspaces ( url_prefix text, url_query_string text, workspaces_agent_config_version integer NOT NULL, - desired_config_generator_version integer DEFAULT 3, project_ref text, actual_state_updated_at timestamp with time zone NOT NULL, CONSTRAINT check_15543fb0fa CHECK ((char_length(name) <= 64)), @@ -38386,8 +38385,6 @@ CREATE INDEX idx_wi_type_custom_lifecycles_on_work_item_type_id ON work_item_typ CREATE INDEX idx_workflows_status_updated_at_id ON duo_workflows_workflows USING btree (status, updated_at, id); -CREATE INDEX idx_workspaces_null_config_version_id ON workspaces USING btree (id) WHERE (desired_config_generator_version IS NULL); - CREATE INDEX idx_zoekt_last_indexed_at_gt_used_storage_bytes_updated_at ON zoekt_indices USING btree (used_storage_bytes_updated_at) WHERE (last_indexed_at >= used_storage_bytes_updated_at); CREATE INDEX idx_zoekt_repositories_on_zoekt_index_id_and_size_bytes ON zoekt_repositories USING btree (zoekt_index_id, size_bytes); -- GitLab From b30ed24dfd5be8c0e7f0e15893e36a21699836ec Mon Sep 17 00:00:00 2001 From: Ashvin Sharma Date: Wed, 15 Oct 2025 13:25:36 +0530 Subject: [PATCH 2/2] Apply 3 suggestion(s) to 1 file(s) Co-authored-by: Mehmet Emin INAC Co-authored-by: Bojan Marjanovic --- ...ove_workspace_desired_config_generator_version_column.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/db/post_migrate/20251014140356_remove_workspace_desired_config_generator_version_column.rb b/db/post_migrate/20251014140356_remove_workspace_desired_config_generator_version_column.rb index 294e75ac8c045c..d4e58da492222b 100644 --- a/db/post_migrate/20251014140356_remove_workspace_desired_config_generator_version_column.rb +++ b/db/post_migrate/20251014140356_remove_workspace_desired_config_generator_version_column.rb @@ -2,14 +2,14 @@ class RemoveWorkspaceDesiredConfigGeneratorVersionColumn < Gitlab::Database::Migration[2.3] disable_ddl_transaction! - milestone '18.5' + milestone '18.6' def up - remove_column :workspaces, :desired_config_generator_version + remove_column :workspaces, :desired_config_generator_version, if_exists: true end def down - add_column :workspaces, :desired_config_generator_version, :integer, default: 3 + add_column :workspaces, :desired_config_generator_version, :integer, default: 3, if_not_exists: true add_concurrent_index( :workspaces, :id, -- GitLab