Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
53e2987b
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,发现更多精彩内容 >>
提交
53e2987b
编写于
3月 15, 2018
作者:
P
Pirate Praveen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Replace KubeException with Kubeclient::HttpError (kubeclient 3.0)
上级
0b246d57
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
10 addition
and
10 deletion
+10
-10
app/models/clusters/platforms/kubernetes.rb
app/models/clusters/platforms/kubernetes.rb
+1
-1
app/models/project_services/kubernetes_service.rb
app/models/project_services/kubernetes_service.rb
+1
-1
app/services/ci/fetch_kubernetes_token_service.rb
app/services/ci/fetch_kubernetes_token_service.rb
+1
-1
app/services/clusters/applications/check_installation_progress_service.rb
...sters/applications/check_installation_progress_service.rb
+1
-1
app/services/clusters/applications/install_service.rb
app/services/clusters/applications/install_service.rb
+1
-1
lib/gitlab/kubernetes/namespace.rb
lib/gitlab/kubernetes/namespace.rb
+1
-1
spec/lib/gitlab/kubernetes/namespace_spec.rb
spec/lib/gitlab/kubernetes/namespace_spec.rb
+1
-1
spec/models/clusters/platforms/kubernetes_spec.rb
spec/models/clusters/platforms/kubernetes_spec.rb
+1
-1
spec/models/project_services/kubernetes_service_spec.rb
spec/models/project_services/kubernetes_service_spec.rb
+1
-1
spec/services/clusters/applications/install_service_spec.rb
spec/services/clusters/applications/install_service_spec.rb
+1
-1
未找到文件。
app/models/clusters/platforms/kubernetes.rb
浏览文件 @
53e2987b
...
...
@@ -134,7 +134,7 @@ module Clusters
kubeclient
=
build_kubeclient!
kubeclient
.
get_pods
(
namespace:
actual_namespace
).
as_json
rescue
Kube
Exception
=>
err
rescue
Kube
client
::
HttpError
=>
err
raise
err
unless
err
.
error_code
==
404
[]
...
...
app/models/project_services/kubernetes_service.rb
浏览文件 @
53e2987b
...
...
@@ -197,7 +197,7 @@ class KubernetesService < DeploymentService
kubeclient
=
build_kubeclient!
kubeclient
.
get_pods
(
namespace:
actual_namespace
).
as_json
rescue
Kube
Exception
=>
err
rescue
Kube
client
::
HttpError
=>
err
raise
err
unless
err
.
error_code
==
404
[]
...
...
app/services/ci/fetch_kubernetes_token_service.rb
浏览文件 @
53e2987b
...
...
@@ -32,7 +32,7 @@ module Ci
kubeclient
=
build_kubeclient!
kubeclient
.
get_secrets
.
as_json
rescue
Kube
Exception
=>
err
rescue
Kube
client
::
HttpError
=>
err
raise
err
unless
err
.
error_code
==
404
[]
...
...
app/services/clusters/applications/check_installation_progress_service.rb
浏览文件 @
53e2987b
...
...
@@ -12,7 +12,7 @@ module Clusters
else
check_timeout
end
rescue
Kube
Exception
=>
ke
rescue
Kube
client
::
HttpError
=>
ke
app
.
make_errored!
(
"Kubernetes error:
#{
ke
.
message
}
"
)
unless
app
.
errored?
end
...
...
app/services/clusters/applications/install_service.rb
浏览文件 @
53e2987b
...
...
@@ -10,7 +10,7 @@ module Clusters
ClusterWaitForAppInstallationWorker
.
perform_in
(
ClusterWaitForAppInstallationWorker
::
INTERVAL
,
app
.
name
,
app
.
id
)
rescue
Kube
Exception
=>
ke
rescue
Kube
client
::
HttpError
=>
ke
app
.
make_errored!
(
"Kubernetes error:
#{
ke
.
message
}
"
)
rescue
StandardError
app
.
make_errored!
(
"Can't start installation process"
)
...
...
lib/gitlab/kubernetes/namespace.rb
浏览文件 @
53e2987b
...
...
@@ -10,7 +10,7 @@ module Gitlab
def
exists?
@client
.
get_namespace
(
name
)
rescue
::
Kube
Exception
=>
ke
rescue
::
Kube
client
::
HttpError
=>
ke
raise
ke
unless
ke
.
error_code
==
404
false
...
...
spec/lib/gitlab/kubernetes/namespace_spec.rb
浏览文件 @
53e2987b
...
...
@@ -9,7 +9,7 @@ describe Gitlab::Kubernetes::Namespace do
describe
'#exists?'
do
context
'when namespace do not exits'
do
let
(
:exception
)
{
::
Kube
Exception
.
new
(
404
,
"namespace
#{
name
}
not found"
,
nil
)
}
let
(
:exception
)
{
::
Kube
client
::
HttpError
.
new
(
404
,
"namespace
#{
name
}
not found"
,
nil
)
}
it
'returns false'
do
expect
(
client
).
to
receive
(
:get_namespace
).
with
(
name
).
once
.
and_raise
(
exception
)
...
...
spec/models/clusters/platforms/kubernetes_spec.rb
浏览文件 @
53e2987b
...
...
@@ -252,7 +252,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
stub_kubeclient_pods
(
status:
500
)
end
it
{
expect
{
subject
}.
to
raise_error
(
Kube
Exception
)
}
it
{
expect
{
subject
}.
to
raise_error
(
Kube
client
::
HttpError
)
}
end
context
'when kubernetes responds with 404s'
do
...
...
spec/models/project_services/kubernetes_service_spec.rb
浏览文件 @
53e2987b
...
...
@@ -370,7 +370,7 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
stub_kubeclient_pods
(
status:
500
)
end
it
{
expect
{
subject
}.
to
raise_error
(
Kube
Exception
)
}
it
{
expect
{
subject
}.
to
raise_error
(
Kube
client
::
HttpError
)
}
end
context
'when kubernetes responds with 404s'
do
...
...
spec/services/clusters/applications/install_service_spec.rb
浏览文件 @
53e2987b
...
...
@@ -34,7 +34,7 @@ describe Clusters::Applications::InstallService do
context
'when k8s cluster communication fails'
do
before
do
error
=
Kube
Exception
.
new
(
500
,
'system failure'
,
nil
)
error
=
Kube
client
::
HttpError
.
new
(
500
,
'system failure'
,
nil
)
expect
(
helm_client
).
to
receive
(
:install
).
with
(
install_command
).
and_raise
(
error
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录