Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ea4af856
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,发现更多精彩内容 >>
提交
ea4af856
编写于
10月 04, 2017
作者:
K
Kamil Trzcinski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix cluster event names to be prefixed with: `make_`
上级
7329a034
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
14 addition
and
14 deletion
+14
-14
app/models/gcp/cluster.rb
app/models/gcp/cluster.rb
+3
-3
app/services/ci/fetch_gcp_operation_service.rb
app/services/ci/fetch_gcp_operation_service.rb
+1
-1
app/services/ci/finalize_cluster_creation_service.rb
app/services/ci/finalize_cluster_creation_service.rb
+2
-2
app/services/ci/integrate_cluster_service.rb
app/services/ci/integrate_cluster_service.rb
+1
-1
app/services/ci/provision_cluster_service.rb
app/services/ci/provision_cluster_service.rb
+5
-5
app/workers/wait_for_cluster_creation_worker.rb
app/workers/wait_for_cluster_creation_worker.rb
+2
-2
未找到文件。
app/models/gcp/cluster.rb
浏览文件 @
ea4af856
...
...
@@ -67,15 +67,15 @@ module Gcp
validate
:restrict_modification
,
on: :update
,
unless: :status_changed?
state_machine
:status
,
initial: :scheduled
do
event
:creating
do
event
:
make_
creating
do
transition
any
-
[
:creating
]
=>
:creating
end
event
:created
do
event
:
make_
created
do
transition
any
-
[
:created
]
=>
:created
end
event
:errored
do
event
:
make_
errored
do
transition
any
-
[
:errored
]
=>
:errored
end
...
...
app/services/ci/fetch_gcp_operation_service.rb
浏览文件 @
ea4af856
...
...
@@ -11,7 +11,7 @@ module Ci
yield
(
operation
)
if
block_given?
rescue
Google
::
Apis
::
ServerError
,
Google
::
Apis
::
ClientError
,
Google
::
Apis
::
AuthorizationError
=>
e
return
cluster
.
errored!
(
"Failed to request to CloudPlatform;
#{
e
.
message
}
"
)
return
cluster
.
make_
errored!
(
"Failed to request to CloudPlatform;
#{
e
.
message
}
"
)
end
end
end
app/services/ci/finalize_cluster_creation_service.rb
浏览文件 @
ea4af856
...
...
@@ -10,7 +10,7 @@ module Ci
cluster
.
gcp_cluster_zone
,
cluster
.
gcp_cluster_name
)
rescue
Google
::
Apis
::
ServerError
,
Google
::
Apis
::
ClientError
,
Google
::
Apis
::
AuthorizationError
=>
e
return
cluster
.
errored!
(
"Failed to request to CloudPlatform;
#{
e
.
message
}
"
)
return
cluster
.
make_
errored!
(
"Failed to request to CloudPlatform;
#{
e
.
message
}
"
)
end
endpoint
=
gke_cluster
.
endpoint
...
...
@@ -23,7 +23,7 @@ module Ci
api_url
,
ca_cert
,
username
,
password
).
execute
unless
kubernetes_token
return
cluster
.
errored!
(
'Failed to get a default token of kubernetes'
)
return
cluster
.
make_
errored!
(
'Failed to get a default token of kubernetes'
)
end
Ci
::
IntegrateClusterService
.
new
.
execute
(
...
...
app/services/ci/integrate_cluster_service.rb
浏览文件 @
ea4af856
...
...
@@ -10,7 +10,7 @@ module Ci
username:
username
,
password:
password
,
service:
cluster
.
project
.
find_or_initialize_service
(
'kubernetes'
),
status_event: :created
)
status_event: :
make_
created
)
cluster
.
service
.
update!
(
active:
true
,
...
...
app/services/ci/provision_cluster_service.rb
浏览文件 @
ea4af856
...
...
@@ -12,24 +12,24 @@ module Ci
cluster
.
gcp_cluster_size
,
machine_type:
cluster
.
gcp_machine_type
)
rescue
Google
::
Apis
::
ServerError
,
Google
::
Apis
::
ClientError
,
Google
::
Apis
::
AuthorizationError
=>
e
return
cluster
.
errored!
(
"Failed to request to CloudPlatform;
#{
e
.
message
}
"
)
return
cluster
.
make_
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
}
"
)
return
cluster
.
make_
errored!
(
"Operation status is unexpected;
#{
operation
.
status_message
}
"
)
end
cluster
.
gcp_operation_id
=
api_client
.
parse_operation_id
(
operation
.
self_link
)
unless
cluster
.
gcp_operation_id
return
cluster
.
errored!
(
'Can not find operation_id from self_link'
)
return
cluster
.
make_
errored!
(
'Can not find operation_id from self_link'
)
end
if
cluster
.
creating
if
cluster
.
make_
creating
WaitForClusterCreationWorker
.
perform_in
(
WaitForClusterCreationWorker
::
INITIAL_INTERVAL
,
cluster
.
id
)
else
return
cluster
.
errored!
(
"Failed to update cluster record;
#{
cluster
.
errors
}
"
)
return
cluster
.
make_
errored!
(
"Failed to update cluster record;
#{
cluster
.
errors
}
"
)
end
end
end
...
...
app/workers/wait_for_cluster_creation_worker.rb
浏览文件 @
ea4af856
...
...
@@ -12,14 +12,14 @@ class WaitForClusterCreationWorker
case
operation
.
status
when
'RUNNING'
if
TIMEOUT
<
Time
.
zone
.
now
-
operation
.
start_time
.
to_time
return
cluster
.
errored!
(
"Cluster creation time exceeds timeout;
#{
TIMEOUT
}
"
)
return
cluster
.
make_
errored!
(
"Cluster creation time exceeds timeout;
#{
TIMEOUT
}
"
)
end
WaitForClusterCreationWorker
.
perform_in
(
EAGER_INTERVAL
,
cluster
.
id
)
when
'DONE'
Ci
::
FinalizeClusterCreationService
.
new
.
execute
(
cluster
)
else
return
cluster
.
errored!
(
"Unexpected operation status;
#{
operation
.
status
}
#{
operation
.
status_message
}
"
)
return
cluster
.
make_
errored!
(
"Unexpected operation status;
#{
operation
.
status
}
#{
operation
.
status_message
}
"
)
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录