diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-17 11:43:48 +0300 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-17 11:43:48 +0300 |
commit | 5a8908bf587a0723b07e510dd6118a686d49af98 (patch) | |
tree | a19af868a1b0a7c676b56a43372811a662754b6f /db | |
parent | ba40c7f1c32f62ad5370621f049500aa904149cd (diff) | |
parent | 528b060b89c2d6a6be611e88ceed28cfe86e167c (diff) |
Merge branch '29398-support-rbac-for-gitlab-provisioned-clusters' into 'master'
Support Kubernetes RBAC for GitLab Managed Apps for creating new clusters
Closes #29398
See merge request gitlab-org/gitlab-ce!21401
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20180907015926_add_legacy_abac_to_cluster_providers_gcp.rb | 17 | ||||
-rw-r--r-- | db/schema.rb | 3 |
2 files changed, 19 insertions, 1 deletions
diff --git a/db/migrate/20180907015926_add_legacy_abac_to_cluster_providers_gcp.rb b/db/migrate/20180907015926_add_legacy_abac_to_cluster_providers_gcp.rb new file mode 100644 index 00000000000..933047e32de --- /dev/null +++ b/db/migrate/20180907015926_add_legacy_abac_to_cluster_providers_gcp.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class AddLegacyAbacToClusterProvidersGcp < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_column_with_default(:cluster_providers_gcp, :legacy_abac, :boolean, default: true) + end + + def down + remove_column(:cluster_providers_gcp, :legacy_abac) + end +end diff --git a/db/schema.rb b/db/schema.rb index 2528a0c1b72..95df735cd37 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180906101639) do +ActiveRecord::Schema.define(version: 20180907015926) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -620,6 +620,7 @@ ActiveRecord::Schema.define(version: 20180906101639) do t.string "endpoint" t.text "encrypted_access_token" t.string "encrypted_access_token_iv" + t.boolean "legacy_abac", default: true, null: false end add_index "cluster_providers_gcp", ["cluster_id"], name: "index_cluster_providers_gcp_on_cluster_id", unique: true, using: :btree |