diff options
author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-07-31 13:15:18 +0000 |
---|---|---|
committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-07-31 13:15:18 +0000 |
commit | b21730116ea14fc1ac153478ed058e505bceed17 (patch) | |
tree | b3c6c481f1a3368ad13cb2b1471b94a4b1034965 /db | |
parent | 5a3948a5733d7d4dc09bfa2daeaad5cc15ba2a00 (diff) | |
download | gitlab-ce-b21730116ea14fc1ac153478ed058e505bceed17.tar.gz |
Revert "Merge branch '48098-mutual-auth-cluster-applications' into 'master'"
This reverts merge request !20801
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20180612103626_add_columns_for_helm_tiller_certificates.rb | 11 | ||||
-rw-r--r-- | db/schema.rb | 3 |
2 files changed, 0 insertions, 14 deletions
diff --git a/db/migrate/20180612103626_add_columns_for_helm_tiller_certificates.rb b/db/migrate/20180612103626_add_columns_for_helm_tiller_certificates.rb deleted file mode 100644 index d9f15b6b67d..00000000000 --- a/db/migrate/20180612103626_add_columns_for_helm_tiller_certificates.rb +++ /dev/null @@ -1,11 +0,0 @@ -class AddColumnsForHelmTillerCertificates < ActiveRecord::Migration - include Gitlab::Database::MigrationHelpers - - DOWNTIME = false - - def change - add_column :clusters_applications_helm, :encrypted_ca_key, :text - add_column :clusters_applications_helm, :encrypted_ca_key_iv, :text - add_column :clusters_applications_helm, :ca_cert, :text - end -end diff --git a/db/schema.rb b/db/schema.rb index 0638de8c6ff..a5f7b8149c6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -636,9 +636,6 @@ ActiveRecord::Schema.define(version: 20180722103201) do t.integer "status", null: false t.string "version", null: false t.text "status_reason" - t.text "encrypted_ca_key" - t.text "encrypted_ca_key_iv" - t.text "ca_cert" end create_table "clusters_applications_ingress", force: :cascade do |t| |