Add latest changes from gitlab-org/gitlab@master

2 files changed, 16 insertions, 0 deletions

diff --git a/db/migrate/20200130134335_add_cert_and_key_to_serverless_domain_cluster.rb b/db/migrate/20200130134335_add_cert_and_key_to_serverless_domain_cluster.rb
new file mode 100644
index 00000000000..39249053ee0
--- /dev/null
+++ b/db/migrate/20200130134335_add_cert_and_key_to_serverless_domain_cluster.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddCertAndKeyToServerlessDomainCluster < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    add_column :serverless_domain_cluster, :encrypted_key, :text
+    add_column :serverless_domain_cluster, :encrypted_key_iv, :string, limit: 255
+    add_column :serverless_domain_cluster, :certificate, :text
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a61a5533ccf..9617c595a65 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -3786,6 +3786,9 @@ ActiveRecord::Schema.define(version: 2020_02_04_131054) do
     t.bigint "creator_id"
     t.datetime_with_timezone "created_at", null: false
     t.datetime_with_timezone "updated_at", null: false
+    t.text "encrypted_key"
+    t.string "encrypted_key_iv", limit: 255
+    t.text "certificate"
     t.index ["clusters_applications_knative_id"], name: "idx_serverless_domain_cluster_on_clusters_applications_knative", unique: true
     t.index ["creator_id"], name: "index_serverless_domain_cluster_on_creator_id"
     t.index ["pages_domain_id"], name: "index_serverless_domain_cluster_on_pages_domain_id"