diff options
author | Eric Eastwood <contact@ericeastwood.com> | 2017-11-06 13:39:54 -0600 |
---|---|---|
committer | Eric Eastwood <contact@ericeastwood.com> | 2017-11-06 13:39:54 -0600 |
commit | 39dd1c66dd349146ae75070b1ea15d3539a4b2a8 (patch) | |
tree | da8a7d53245e21df62aaa12a3d9e570b48b269f1 /db | |
parent | 6d2a564dc3d0f84c2ac9b15a940a2375363f79b4 (diff) | |
parent | 14fcd394dabefc54bbd57ccf28e407b910f70d9a (diff) | |
download | gitlab-ce-39dd1c66dd349146ae75070b1ea15d3539a4b2a8.tar.gz |
Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applications
Diffstat (limited to 'db')
-rw-r--r-- | db/schema.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/db/schema.rb b/db/schema.rb index 2e5c98f2541..d2019e93475 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -472,8 +472,6 @@ ActiveRecord::Schema.define(version: 20171106101200) do t.string "encrypted_password_iv" t.text "encrypted_token" t.string "encrypted_token_iv" - t.datetime_with_timezone "created_at", null: false - t.datetime_with_timezone "updated_at", null: false end add_index "cluster_platforms_kubernetes", ["cluster_id"], name: "index_cluster_platforms_kubernetes_on_cluster_id", unique: true, using: :btree @@ -494,14 +492,11 @@ ActiveRecord::Schema.define(version: 20171106101200) do t.text "status_reason" t.string "gcp_project_id", null: false t.string "zone", null: false - t.integer "num_nodes", null: false t.string "machine_type" t.string "operation_id" t.string "endpoint" t.text "encrypted_access_token" t.string "encrypted_access_token_iv" - t.datetime_with_timezone "created_at", null: false - t.datetime_with_timezone "updated_at", null: false end add_index "cluster_providers_gcp", ["cluster_id"], name: "index_cluster_providers_gcp_on_cluster_id", unique: true, using: :btree @@ -510,12 +505,11 @@ ActiveRecord::Schema.define(version: 20171106101200) do t.integer "user_id" t.boolean "enabled", default: true t.string "name", null: false - t.integer "provider_type" - t.integer "platform_type" - t.datetime_with_timezone "created_at", null: false - t.datetime_with_timezone "updated_at", null: false end + add_index "clusters", ["enabled"], name: "index_clusters_on_enabled", using: :btree + add_index "clusters", ["user_id"], name: "index_clusters_on_user_id", using: :btree + create_table "clusters_applications_helm", force: :cascade do |t| t.integer "cluster_id", null: false t.datetime_with_timezone "created_at", null: false |