summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Kasa <mkasa@gitlab.com>2019-09-05 14:57:12 -0700
committerMatt Kasa <mkasa@gitlab.com>2019-09-05 16:23:35 -0700
commit99d5cd9dabb9c810227e419d35dcf52f0f480f54 (patch)
treee4dd6a9e84138d2f591b3418a0a8aa72eb2b24ef
parentaf83cd2ae154877104c76db1c3271f04265bd4a4 (diff)
downloadgitlab-ce-99d5cd9dabb9c810227e419d35dcf52f0f480f54.tar.gz
Add cloud_run column for Cloud Run on GKE
- Add cloud_run boolean column and index to cluster_providers_gcp table with default set to false - Add cloud_run scope to Clusters::Cluster - Update schema.rb with cloud_run migration Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/59370
-rw-r--r--app/models/clusters/providers/gcp.rb3
-rw-r--r--db/migrate/20190905140605_add_cloud_run_to_clusters_providers_gcp.rb19
-rw-r--r--db/schema.rb2
3 files changed, 24 insertions, 0 deletions
diff --git a/app/models/clusters/providers/gcp.rb b/app/models/clusters/providers/gcp.rb
index 390748bf252..dbb6cc45aa4 100644
--- a/app/models/clusters/providers/gcp.rb
+++ b/app/models/clusters/providers/gcp.rb
@@ -10,6 +10,9 @@ module Clusters
default_value_for :zone, 'us-central1-a'
default_value_for :num_nodes, 3
default_value_for :machine_type, 'n1-standard-2'
+ default_value_for :cloud_run, false
+
+ scope :cloud_run, -> { where(cloud_run: true) }
attr_encrypted :access_token,
mode: :per_attribute_iv,
diff --git a/db/migrate/20190905140605_add_cloud_run_to_clusters_providers_gcp.rb b/db/migrate/20190905140605_add_cloud_run_to_clusters_providers_gcp.rb
new file mode 100644
index 00000000000..ac2e66a51dc
--- /dev/null
+++ b/db/migrate/20190905140605_add_cloud_run_to_clusters_providers_gcp.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddCloudRunToClustersProvidersGcp < ActiveRecord::Migration[5.2]
+ include Gitlab::Database::MigrationHelpers
+
+ DOWNTIME = false
+
+ disable_ddl_transaction!
+
+ def up
+ add_column_with_default(:cluster_providers_gcp, :cloud_run, :boolean, default: false)
+ add_concurrent_index(:cluster_providers_gcp, :cloud_run)
+ end
+
+ def down
+ remove_column(:cluster_providers_gcp, :cloud_run)
+ remove_concurrent_index(:cluster_providers_gcp, :cloud_run)
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 61f7787f192..fb8876c30ff 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -923,6 +923,8 @@ ActiveRecord::Schema.define(version: 2019_09_05_223900) do
t.text "encrypted_access_token"
t.string "encrypted_access_token_iv"
t.boolean "legacy_abac", default: false, null: false
+ t.boolean "cloud_run", default: false, null: false
+ t.index ["cloud_run"], name: "index_cluster_providers_gcp_on_cloud_run"
t.index ["cluster_id"], name: "index_cluster_providers_gcp_on_cluster_id", unique: true
end