diff options
| author | Alessio Caiazza <acaiazza@gitlab.com> | 2017-11-03 11:02:59 +0100 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2017-11-03 11:02:59 +0100 |
| commit | 1ca9aaf860e09351a94331020cd43be4af5f2131 (patch) | |
| tree | 46f5e2f1b6352eddfe9cbf759421e2bcafd43a82 /db | |
| parent | 08752e5d742a144ffb1ec7c8e07e7a558774fbfc (diff) | |
| parent | 694cfeb7b7288d7d27eca30f808fba421c1f1719 (diff) | |
| download | gitlab-ce-1ca9aaf860e09351a94331020cd43be4af5f2131.tar.gz | |
Merge branch 'refactor-clusters' into 38464-k8s-apps
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20171013094327_create_new_clusters_architectures.rb | 2 | ||||
| -rw-r--r-- | db/schema.rb | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/db/migrate/20171013094327_create_new_clusters_architectures.rb b/db/migrate/20171013094327_create_new_clusters_architectures.rb index b196aa1949c..dabb3e25e48 100644 --- a/db/migrate/20171013094327_create_new_clusters_architectures.rb +++ b/db/migrate/20171013094327_create_new_clusters_architectures.rb @@ -3,7 +3,7 @@ class CreateNewClustersArchitectures < ActiveRecord::Migration def change create_table :clusters do |t| - t.references :user, null: false, index: true, foreign_key: { on_delete: :nullify } + t.references :user, index: true, foreign_key: { on_delete: :nullify } t.integer :provider_type t.integer :platform_type diff --git a/db/schema.rb b/db/schema.rb index d4f1b192acf..548f4711339 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -464,7 +464,9 @@ ActiveRecord::Schema.define(version: 20171031100710) do create_table "cluster_platforms_kubernetes", force: :cascade do |t| t.integer "cluster_id", null: false - t.string "api_url" + t.datetime_with_timezone "created_at", null: false + t.datetime_with_timezone "updated_at", null: false + t.text "api_url" t.text "ca_cert" t.string "namespace" t.string "username" @@ -491,6 +493,9 @@ ActiveRecord::Schema.define(version: 20171031100710) do create_table "cluster_providers_gcp", force: :cascade do |t| t.integer "cluster_id", null: false t.integer "status" + t.integer "num_nodes", null: false + t.datetime_with_timezone "created_at", null: false + t.datetime_with_timezone "updated_at", null: false t.text "status_reason" t.string "gcp_project_id", null: false t.string "zone", null: false @@ -508,6 +513,10 @@ ActiveRecord::Schema.define(version: 20171031100710) do create_table "clusters", force: :cascade do |t| t.integer "user_id" + t.integer "provider_type" + t.integer "platform_type" + t.datetime_with_timezone "created_at", null: false + t.datetime_with_timezone "updated_at", null: false t.boolean "enabled", default: true t.string "name", null: false t.integer "provider_type" |