diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-29 12:09:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-29 12:09:58 +0300 |
commit | 6c4a39fa9f77d6d7dd971118b5402a5387eb8846 (patch) | |
tree | 41065fdc4d56111b9359a061dac2181aad8adcd8 /db | |
parent | a412f4f58679c9d9120da6dc69ff02a6fcec0c5a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20230725085120_update_remote_development_agent_configs_for_firewall_rules.rb | 22 | ||||
-rw-r--r-- | db/schema_migrations/20230725085120 | 1 | ||||
-rw-r--r-- | db/structure.sql | 3 |
3 files changed, 26 insertions, 0 deletions
diff --git a/db/migrate/20230725085120_update_remote_development_agent_configs_for_firewall_rules.rb b/db/migrate/20230725085120_update_remote_development_agent_configs_for_firewall_rules.rb new file mode 100644 index 00000000000..184fdb0ec9f --- /dev/null +++ b/db/migrate/20230725085120_update_remote_development_agent_configs_for_firewall_rules.rb @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +class UpdateRemoteDevelopmentAgentConfigsForFirewallRules < Gitlab::Database::Migration[2.1] + disable_ddl_transaction! + + def up + with_lock_retries do + add_column :remote_development_agent_configs, :network_policy_enabled, :boolean, default: true, null: false + add_column :remote_development_agent_configs, :gitlab_workspaces_proxy_namespace, :text, + default: "gitlab-workspaces", null: false + end + # Kubernetes namespaces are limited to 63 characters + add_text_limit :remote_development_agent_configs, :gitlab_workspaces_proxy_namespace, 63 + end + + def down + with_lock_retries do + remove_column :remote_development_agent_configs, :gitlab_workspaces_proxy_namespace, if_exists: true + remove_column :remote_development_agent_configs, :network_policy_enabled, if_exists: true + end + end +end diff --git a/db/schema_migrations/20230725085120 b/db/schema_migrations/20230725085120 new file mode 100644 index 00000000000..26f0ee27604 --- /dev/null +++ b/db/schema_migrations/20230725085120 @@ -0,0 +1 @@ +dd5ded7e27fd774358427427179eead1779ec11b9a3167758bde5c5c76db1715
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 6842d465ce2..6a3aa2b4801 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -22073,6 +22073,9 @@ CREATE TABLE remote_development_agent_configs ( cluster_agent_id bigint NOT NULL, enabled boolean NOT NULL, dns_zone text NOT NULL, + network_policy_enabled boolean DEFAULT true NOT NULL, + gitlab_workspaces_proxy_namespace text DEFAULT 'gitlab-workspaces'::text NOT NULL, + CONSTRAINT check_72947a4495 CHECK ((char_length(gitlab_workspaces_proxy_namespace) <= 63)), CONSTRAINT check_9f5cd54d1c CHECK ((char_length(dns_zone) <= 256)) ); |