diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-10-01 00:54:22 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-10-01 00:54:22 +0900 |
| commit | e499c1c39dbea505858874ee47436641df3d93d4 (patch) | |
| tree | bce2333e86abfbdba7e55d15bb1fe8e432657832 /db | |
| parent | c30546f4aa073f44e97b49f47c57a9a89062c3c6 (diff) | |
| download | gitlab-ce-e499c1c39dbea505858874ee47436641df3d93d4.tar.gz | |
Replace reactive_cache by multipel sidekiq workers
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20170924094327_create_ci_clusters.rb | 12 | ||||
| -rw-r--r-- | db/schema.rb | 12 |
2 files changed, 20 insertions, 4 deletions
diff --git a/db/migrate/20170924094327_create_ci_clusters.rb b/db/migrate/20170924094327_create_ci_clusters.rb index 2663130c7e6..798c8e03b37 100644 --- a/db/migrate/20170924094327_create_ci_clusters.rb +++ b/db/migrate/20170924094327_create_ci_clusters.rb @@ -9,6 +9,8 @@ class CreateCiClusters < ActiveRecord::Migration # General t.boolean :enabled, default: true + t.integer :status + t.string :status_reason # k8s integration specific t.string :project_namespace @@ -16,9 +18,10 @@ class CreateCiClusters < ActiveRecord::Migration # Cluster details t.string :endpoint t.text :ca_cert - t.string :token + t.string :encrypted_kubernetes_token + t.string :encrypted_kubernetes_token_salt + t.string :encrypted_kubernetes_token_iv t.string :username - t.string :password t.string :encrypted_password t.string :encrypted_password_salt t.string :encrypted_password_iv @@ -27,7 +30,12 @@ class CreateCiClusters < ActiveRecord::Migration t.string :gcp_project_id t.string :cluster_zone t.string :cluster_name + t.string :cluster_size + t.string :machine_type t.string :gcp_operation_id + t.string :encrypted_gcp_token + t.string :encrypted_gcp_token_salt + t.string :encrypted_gcp_token_iv t.datetime_with_timezone :created_at, null: false t.datetime_with_timezone :updated_at, null: false diff --git a/db/schema.rb b/db/schema.rb index af5367113a2..de844583d56 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -272,19 +272,27 @@ ActiveRecord::Schema.define(version: 20170924094327) do t.integer "user_id", null: false t.integer "service_id" t.boolean "enabled", default: true + t.integer "status" + t.string "status_reason" t.string "project_namespace" t.string "endpoint" t.text "ca_cert" - t.string "token" + t.string "encrypted_kubernetes_token" + t.string "encrypted_kubernetes_token_salt" + t.string "encrypted_kubernetes_token_iv" t.string "username" - t.string "password" t.string "encrypted_password" t.string "encrypted_password_salt" t.string "encrypted_password_iv" t.string "gcp_project_id" t.string "cluster_zone" t.string "cluster_name" + t.string "cluster_size" + t.string "machine_type" t.string "gcp_operation_id" + t.string "encrypted_gcp_token" + t.string "encrypted_gcp_token_salt" + t.string "encrypted_gcp_token_iv" t.datetime "created_at", null: false t.datetime "updated_at", null: false end |