Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e8e2a210
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e8e2a210
编写于
10月 03, 2017
作者:
K
Kamil Trzcinski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename to ClusterProvisionWorker and CreateGkeClusterService.new.execute
上级
25a1ef69
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
8 deletion
+8
-8
app/services/ci/create_cluster_service.rb
app/services/ci/create_cluster_service.rb
+1
-1
app/services/ci/provision_cluster_service.rb
app/services/ci/provision_cluster_service.rb
+5
-5
app/workers/cluster_provision_worker.rb
app/workers/cluster_provision_worker.rb
+2
-2
未找到文件。
app/services/ci/create_cluster_service.rb
浏览文件 @
e8e2a210
...
...
@@ -7,7 +7,7 @@ module Ci
params
.
merge
(
user:
current_user
,
status:
Gcp
::
Cluster
.
statuses
[
:scheduled
],
gcp_token:
access_token
)).
tap
do
|
cluster
|
Cluster
Creat
ionWorker
.
perform_async
(
cluster
.
id
)
if
cluster
.
persisted?
Cluster
Provis
ionWorker
.
perform_async
(
cluster
.
id
)
if
cluster
.
persisted?
end
end
end
...
...
app/services/ci/
create_gke
_cluster_service.rb
→
app/services/ci/
provision
_cluster_service.rb
浏览文件 @
e8e2a210
module
Ci
class
CreateGke
ClusterService
class
Provision
ClusterService
def
execute
(
cluster
)
api_client
=
GoogleApi
::
CloudPlatform
::
Client
.
new
(
cluster
.
gcp_token
,
nil
)
...
...
@@ -15,18 +15,18 @@ module Ci
rescue
Google
::
Apis
::
ServerError
,
Google
::
Apis
::
ClientError
,
Google
::
Apis
::
AuthorizationError
=>
e
return
cluster
.
errored!
(
"Failed to request to CloudPlatform;
#{
e
.
message
}
"
)
end
unless
operation
.
status
==
'RUNNING'
||
operation
.
status
==
'PENDING'
return
cluster
.
errored!
(
"Operation status is unexpected;
#{
operation
.
status_message
}
"
)
end
operation_id
=
api_client
.
parse_operation_id
(
operation
.
self_link
)
cluster
.
gcp_
operation_id
=
api_client
.
parse_operation_id
(
operation
.
self_link
)
unless
operation_id
unless
cluster
.
gcp_
operation_id
return
cluster
.
errored!
(
'Can not find operation_id from self_link'
)
end
if
cluster
.
creating
!
(
operation_id
)
if
cluster
.
creating
WaitForClusterCreationWorker
.
perform_in
(
WaitForClusterCreationWorker
::
INITIAL_INTERVAL
,
cluster
.
id
)
else
...
...
app/workers/cluster_
creat
ion_worker.rb
→
app/workers/cluster_
provis
ion_worker.rb
浏览文件 @
e8e2a210
class
Cluster
Creat
ionWorker
class
Cluster
Provis
ionWorker
include
Sidekiq
::
Worker
include
ClusterQueue
def
perform
(
cluster_id
)
Gcp
::
Cluster
.
find_by_id
(
cluster_id
).
try
do
|
cluster
|
Ci
::
CreateGke
ClusterService
.
new
.
execute
(
cluster
)
Ci
::
Provision
ClusterService
.
new
.
execute
(
cluster
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录