Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
990f18453861
Commit
990f1845
authored
Nov 28, 2017
by
Shinya Maeda
Browse files
Fix static analysys
parent
68ff9e4009de
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/models/clusters/platforms/kubernetes.rb
View file @
990f1845
...
...
@@ -134,6 +134,7 @@
kubeclient
.
get_pods
(
namespace:
actual_namespace
).
as_json
rescue
KubeException
=>
err
raise
err
unless
err
.
error_code
==
404
[]
end
...
...
app/models/project.rb
View file @
990f1845
...
...
@@ -905,7 +905,7 @@
# TODO: This will be extended for multiple enviroment clusters
# TODO: Add super nice tests to check this interchangeability
def
deployment_platform
@deployment_platform
||=
clusters
.
where
(
enabled:
true
)
.
first
&
.
platform_kubernetes
@deployment_platform
||=
clusters
.
find_by
(
enabled:
true
)
&
.
platform_kubernetes
@deployment_platform
||=
services
.
where
(
category: :deployment
).
reorder
(
nil
).
find_by
(
active:
true
)
end
...
...
spec/features/projects/clusters/interchangeability_spec.rb
View file @
990f1845
require
'spec_helper'
feature
'Interchangeability between KubernetesService and Platform::Kubernetes'
do
EXCEPT_METHODS
=
%i[test title description help fields initialize_properties namespace namespace= api_url api_url=]
EXCEPT_METHODS_GREP_V
=
%w[_touched? _changed? _was]
EXCEPT_METHODS
=
%i[test title description help fields initialize_properties namespace namespace= api_url api_url=]
.
freeze
EXCEPT_METHODS_GREP_V
=
%w[_touched? _changed? _was]
.
freeze
it
'Clusters::Platform::Kubernetes covers core interfaces in KubernetesService'
do
expected_interfaces
=
KubernetesService
.
instance_methods
(
false
)
...
...
@@ -10,7 +10,7 @@
EXCEPT_METHODS_GREP_V
.
each
do
|
g
|
expected_interfaces
=
expected_interfaces
.
grep_v
(
/
#{
Regexp
.
escape
(
g
)
}
\z/
)
end
expect
(
expected_interfaces
-
Clusters
::
Platforms
::
Kubernetes
.
instance_methods
).
to
be_empty
end
end
spec/features/projects/environments/environments_spec.rb
View file @
990f1845
...
...
@@ -225,7 +225,7 @@
end
end
end
context
'when user configured kubernetes from Integration > Kubernetes'
do
let
(
:project
)
{
create
(
:kubernetes_project
,
:test_repo
)
}
...
...
Write
Preview
Supports
Markdown
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