Commit 34e66c42 authored by Shinya Maeda's avatar Shinya Maeda

PollingInterval, rename to gke_clusters, has_one :cluster

parent 2cb1d617
Pipeline #12359576 failed with stages
in 82 minutes and 56 seconds
......@@ -15,15 +15,15 @@ class Projects::ClustersController < Projects::ApplicationController
end
def index
if project.clusters.any?
redirect_to edit_project_cluster_path(project, project.clusters.last.id)
if project.cluster
redirect_to edit_project_cluster_path(project, project.cluster)
else
redirect_to new_project_cluster_path(project)
end
end
def new
@cluster = project.clusters.new
@cluster = project.build_cluster
end
def create
......@@ -42,6 +42,8 @@ class Projects::ClustersController < Projects::ApplicationController
def status
respond_to do |format|
format.json do
Gitlab::PollingInterval.set_header(response, interval: 10_000)
render json: {
status: cluster.status, # The current status of the operation.
status_reason: cluster.status_reason # If an error has occurred, a textual description of the error.
......@@ -72,7 +74,7 @@ class Projects::ClustersController < Projects::ApplicationController
private
def cluster
@cluster ||= project.clusters.find(params[:id])
@cluster ||= project.cluster
end
def cluster_params
......
module Ci
module Gcp
class Cluster < ActiveRecord::Base
extend Gitlab::Ci::Model
extend Gitlab::Gcp::Model
belongs_to :project
belongs_to :project, inverse_of: :cluster
belongs_to :user
belongs_to :service
attr_encrypted :password,
mode: :per_attribute_iv_and_salt,
mode: :per_attribute_iv,
insecure_mode: true,
key: Gitlab::Application.secrets.db_key_base,
algorithm: 'aes-256-cbc'
attr_encrypted :kubernetes_token,
mode: :per_attribute_iv_and_salt,
mode: :per_attribute_iv,
insecure_mode: true,
key: Gitlab::Application.secrets.db_key_base,
algorithm: 'aes-256-cbc'
attr_encrypted :gcp_token,
mode: :per_attribute_iv_and_salt,
mode: :per_attribute_iv,
insecure_mode: true,
key: Gitlab::Application.secrets.db_key_base,
algorithm: 'aes-256-cbc'
......@@ -54,6 +54,21 @@ module Ci
save!(validate: false)
end
def created!(endpoint, ca_cert, kubernetes_token, username, password)
self.status = :created
self.enabled = true
self.endpoint = endpoint
self.ca_cert = ca_cert
self.kubernetes_token = kubernetes_token
self.username = username
self.password = password
self.service = project.find_or_initialize_service('kubernetes')
self.gcp_token = nil
self.gcp_operation_id = nil
save!
end
def on_creation?
scheduled? || creating?
end
......
......@@ -163,6 +163,7 @@ class Project < ActiveRecord::Base
has_one :import_data, class_name: 'ProjectImportData', inverse_of: :project, autosave: true
has_one :project_feature, inverse_of: :project
has_one :statistics, class_name: 'ProjectStatistics'
has_one :cluster, class_name: 'Gcp::Cluster', inverse_of: :project
# Container repositories need to remove data from the container registry,
# which is not managed by the DB. Hence we're still using dependent: :destroy
......@@ -171,7 +172,6 @@ class Project < ActiveRecord::Base
has_many :commit_statuses
has_many :pipelines, class_name: 'Ci::Pipeline'
has_many :clusters, class_name: 'Ci::Cluster'
# Ci::Build objects store data on the file system such as artifact files and
# build traces. Currently there's no efficient way of removing this data in
......
......@@ -5,9 +5,9 @@ module Ci
params['machine_type'] = GoogleApi::CloudPlatform::Client::DEFAULT_MACHINE_TYPE
end
project.clusters.create(
project.create_cluster(
params.merge(user: current_user,
status: Ci::Cluster.statuses[:scheduled],
status: Gcp::Cluster.statuses[:scheduled],
gcp_token: access_token))
end
end
......
module Ci
class IntegrateClusterService
def execute(cluster, endpoint, ca_cert, token, username, password)
Ci::Cluster.transaction do
kubernetes_service ||=
cluster.project.find_or_initialize_service('kubernetes')
Gcp::Cluster.transaction do
cluster.created!(endpoint, ca_cert, token, username, password)
cluster.update!(
enabled: true,
service: kubernetes_service,
username: username,
password: password,
kubernetes_token: token,
ca_cert: ca_cert,
endpoint: endpoint,
gcp_token: nil,
gcp_operation_id: nil,
status: Ci::Cluster.statuses[:created])
kubernetes_service.update!(
cluster.service.update!(
active: true,
api_url: cluster.api_url,
ca_pem: ca_cert,
......
module Ci
class UpdateClusterService < BaseService
def execute(cluster)
Ci::Cluster.transaction do
Gcp::Cluster.transaction do
cluster.update!(enabled: params['enabled'])
if params['enabled'] == 'true'
......@@ -12,7 +12,7 @@ module Ci
namespace: cluster.project_namespace,
token: cluster.kubernetes_token)
else
cluster.service.update(active: false)
cluster.service.update!(active: false)
end
end
rescue ActiveRecord::RecordInvalid => e
......
......@@ -3,7 +3,7 @@ class ClusterCreationWorker
include DedicatedSidekiqQueue
def perform(cluster_id)
cluster = Ci::Cluster.find_by_id(cluster_id)
cluster = Gcp::Cluster.find_by_id(cluster_id)
unless cluster
return Rails.logger.error "Cluster object is not found; #{cluster_id}"
......
......@@ -7,7 +7,7 @@ class WaitForClusterCreationWorker
TIMEOUT = 20.minutes
def perform(cluster_id)
cluster = Ci::Cluster.find_by_id(cluster_id)
cluster = Gcp::Cluster.find_by_id(cluster_id)
unless cluster
return Rails.logger.error "Cluster object is not found; #{cluster_id}"
......@@ -56,7 +56,7 @@ class WaitForClusterCreationWorker
username = gke_cluster.master_auth.username
password = gke_cluster.master_auth.password
rescue Exception => e
return cluster.errored!("Can not extract the extected data; #{e}")
return cluster.errored!("Can not extract the expected data; #{e}")
end
kubernetes_token = Ci::FetchKubernetesTokenService.new(
......
class CreateCiClusters < ActiveRecord::Migration
class CreateGcpClusters < ActiveRecord::Migration
DOWNTIME = false
def up
create_table :ci_clusters do |t|
def change
create_table :gcp_clusters do |t|
t.references :project, null: false, index: { unique: true }, foreign_key: { on_delete: :cascade }
t.references :user, null: false, foreign_key: true
t.references :service, foreign_key: true
......@@ -41,8 +41,4 @@ class CreateCiClusters < ActiveRecord::Migration
t.datetime_with_timezone :updated_at, null: false
end
end
def down
drop_table :ci_clusters
end
end
......@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20170924094327) do
ActiveRecord::Schema.define(version: 20170928100231) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
......@@ -608,6 +608,38 @@ ActiveRecord::Schema.define(version: 20170924094327) do
add_index "forked_project_links", ["forked_to_project_id"], name: "index_forked_project_links_on_forked_to_project_id", unique: true, using: :btree
create_table "gcp_clusters", force: :cascade do |t|
t.integer "project_id", null: false
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 "encrypted_kubernetes_token"
t.string "encrypted_kubernetes_token_salt"
t.string "encrypted_kubernetes_token_iv"
t.string "username"
t.string "encrypted_password"
t.string "encrypted_password_salt"
t.string "encrypted_password_iv"
t.string "gcp_project_id", null: false
t.string "cluster_zone", null: false
t.string "cluster_name", null: false
t.integer "cluster_size", null: false
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
add_index "gcp_clusters", ["project_id"], name: "index_gcp_clusters_on_project_id", unique: true, using: :btree
create_table "gpg_keys", force: :cascade do |t|
t.datetime_with_timezone "created_at", null: false
t.datetime_with_timezone "updated_at", null: false
......@@ -1742,6 +1774,9 @@ ActiveRecord::Schema.define(version: 20170924094327) do
add_foreign_key "events", "projects", on_delete: :cascade
add_foreign_key "events", "users", column: "author_id", name: "fk_edfd187b6f", on_delete: :cascade
add_foreign_key "forked_project_links", "projects", column: "forked_to_project_id", name: "fk_434510edb0", on_delete: :cascade
add_foreign_key "gcp_clusters", "projects", on_delete: :cascade
add_foreign_key "gcp_clusters", "services"
add_foreign_key "gcp_clusters", "users"
add_foreign_key "gpg_keys", "users", on_delete: :cascade
add_foreign_key "gpg_signatures", "gpg_keys", on_delete: :nullify
add_foreign_key "gpg_signatures", "projects", on_delete: :cascade
......
module Gitlab
module Gcp
module Model
def table_name_prefix
"gcp_"
end
def model_name
@model_name ||= ActiveModel::Name.new(self, nil, self.name.split("::").last)
end
end
end
end
......@@ -86,7 +86,7 @@ module GoogleApi
end
def parse_operation_id(self_link)
self_link.match(/projects\/.*\/zones\/.*\/operations\/(.*)/)[1]
self_link.match(%r{projects/.*/zones/.*/operations/(.*)})[1]
end
end
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment