Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6f0b7a39
Commit
6f0b7a39
authored
Sep 17, 2018
by
Mayra Cabrera
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not persist errors from Kubernetes calls
parent
bff85a4b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
app/services/clusters/applications/check_installation_progress_service.rb
...sters/applications/check_installation_progress_service.rb
+3
-3
app/services/clusters/applications/install_service.rb
app/services/clusters/applications/install_service.rb
+4
-4
spec/services/clusters/applications/check_installation_progress_service_spec.rb
.../applications/check_installation_progress_service_spec.rb
+1
-1
spec/services/clusters/applications/install_service_spec.rb
spec/services/clusters/applications/install_service_spec.rb
+1
-1
No files found.
app/services/clusters/applications/check_installation_progress_service.rb
View file @
6f0b7a39
...
@@ -14,8 +14,8 @@ module Clusters
...
@@ -14,8 +14,8 @@ module Clusters
else
else
check_timeout
check_timeout
end
end
rescue
Kubeclient
::
HttpError
=>
ke
rescue
Kubeclient
::
HttpError
app
.
make_errored!
(
"Kubernetes error
:
#{
ke
.
message
}
"
)
unless
app
.
errored?
app
.
make_errored!
(
"Kubernetes error"
)
unless
app
.
errored?
end
end
private
private
...
@@ -27,7 +27,7 @@ module Clusters
...
@@ -27,7 +27,7 @@ module Clusters
end
end
def
on_failed
def
on_failed
app
.
make_errored!
(
installation_errors
||
'Installation silently
failed'
)
app
.
make_errored!
(
'Installation
failed'
)
ensure
ensure
remove_installation_pod
remove_installation_pod
end
end
...
...
app/services/clusters/applications/install_service.rb
View file @
6f0b7a39
...
@@ -12,10 +12,10 @@ module Clusters
...
@@ -12,10 +12,10 @@ module Clusters
ClusterWaitForAppInstallationWorker
.
perform_in
(
ClusterWaitForAppInstallationWorker
.
perform_in
(
ClusterWaitForAppInstallationWorker
::
INTERVAL
,
app
.
name
,
app
.
id
)
ClusterWaitForAppInstallationWorker
::
INTERVAL
,
app
.
name
,
app
.
id
)
rescue
Kubeclient
::
HttpError
=>
ke
rescue
Kubeclient
::
HttpError
app
.
make_errored!
(
"Kubernetes error
:
#{
ke
.
message
}
"
)
app
.
make_errored!
(
"Kubernetes error
.
"
)
rescue
StandardError
=>
e
rescue
StandardError
app
.
make_errored!
(
"Can't start installation process.
#{
e
.
message
}
"
)
app
.
make_errored!
(
"Can't start installation process."
)
end
end
end
end
end
end
...
...
spec/services/clusters/applications/check_installation_progress_service_spec.rb
View file @
6f0b7a39
...
@@ -82,7 +82,7 @@ describe Clusters::Applications::CheckInstallationProgressService do
...
@@ -82,7 +82,7 @@ describe Clusters::Applications::CheckInstallationProgressService do
service
.
execute
service
.
execute
expect
(
application
).
to
be_errored
expect
(
application
).
to
be_errored
expect
(
application
.
status_reason
).
to
eq
(
errors
)
expect
(
application
.
status_reason
).
to
eq
(
"Installation failed"
)
end
end
end
end
...
...
spec/services/clusters/applications/install_service_spec.rb
View file @
6f0b7a39
...
@@ -42,7 +42,7 @@ describe Clusters::Applications::InstallService do
...
@@ -42,7 +42,7 @@ describe Clusters::Applications::InstallService do
service
.
execute
service
.
execute
expect
(
application
).
to
be_errored
expect
(
application
).
to
be_errored
expect
(
application
.
status_reason
).
to
match
(
/kubernetes error:/i
)
expect
(
application
.
status_reason
).
to
match
(
'Kubernetes error.'
)
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment