summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-07-30 14:56:21 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-07-30 14:56:21 +0000
commitc90d7633da7837deedd67f344ac8d00ba54c4989 (patch)
tree07306b83d274cb52cba71fa2443098d74b50a33f /db
parentdbbe474fe17e04b6c6b0764972b4c56da676a697 (diff)
parent8f41c85760310f65ff219d950b4779b592c6d0c2 (diff)
downloadgitlab-ce-c90d7633da7837deedd67f344ac8d00ba54c4989.tar.gz
Merge branch '48098-mutual-auth-cluster-applications' into 'master'
Resolve "Mutual SSL Auth For Helm TIller" Closes #48098 See merge request gitlab-org/gitlab-ce!20801
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20180612103626_add_columns_for_helm_tiller_certificates.rb11
-rw-r--r--db/schema.rb3
2 files changed, 14 insertions, 0 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
new file mode 100644
index 00000000000..d9f15b6b67d
--- /dev/null
+++ b/db/migrate/20180612103626_add_columns_for_helm_tiller_certificates.rb
@@ -0,0 +1,11 @@
+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 a5f7b8149c6..0638de8c6ff 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -636,6 +636,9 @@ 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|