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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
6d4c2529
Commit
6d4c2529
authored
Dec 19, 2018
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle nil terminals in Clusters::Platforms::Kubernetes
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
22f658e0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
app/models/clusters/platforms/kubernetes.rb
app/models/clusters/platforms/kubernetes.rb
+1
-1
spec/models/clusters/platforms/kubernetes_spec.rb
spec/models/clusters/platforms/kubernetes_spec.rb
+2
-1
No files found.
app/models/clusters/platforms/kubernetes.rb
View file @
6d4c2529
...
@@ -106,7 +106,7 @@ module Clusters
...
@@ -106,7 +106,7 @@ module Clusters
def
terminals
(
environment
)
def
terminals
(
environment
)
with_reactive_cache
do
|
data
|
with_reactive_cache
do
|
data
|
pods
=
filter_by_label
(
data
[
:pods
],
app:
environment
.
slug
)
pods
=
filter_by_label
(
data
[
:pods
],
app:
environment
.
slug
)
terminals
=
pods
.
flat_map
{
|
pod
|
terminals_for_pod
(
api_url
,
actual_namespace
,
pod
)
}
terminals
=
pods
.
flat_map
{
|
pod
|
terminals_for_pod
(
api_url
,
actual_namespace
,
pod
)
}
.
compact
terminals
.
each
{
|
terminal
|
add_terminal_auth
(
terminal
,
terminal_auth
)
}
terminals
.
each
{
|
terminal
|
add_terminal_auth
(
terminal
,
terminal_auth
)
}
end
end
end
end
...
...
spec/models/clusters/platforms/kubernetes_spec.rb
View file @
6d4c2529
...
@@ -325,12 +325,13 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
...
@@ -325,12 +325,13 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
context
'with valid pods'
do
context
'with valid pods'
do
let
(
:pod
)
{
kube_pod
(
app:
environment
.
slug
)
}
let
(
:pod
)
{
kube_pod
(
app:
environment
.
slug
)
}
let
(
:pod_with_no_terminal
)
{
kube_pod
(
app:
environment
.
slug
,
status:
"Pending"
)
}
let
(
:terminals
)
{
kube_terminals
(
service
,
pod
)
}
let
(
:terminals
)
{
kube_terminals
(
service
,
pod
)
}
before
do
before
do
stub_reactive_cache
(
stub_reactive_cache
(
service
,
service
,
pods:
[
pod
,
pod
,
kube_pod
(
app:
"should-be-filtered-out"
)]
pods:
[
pod
,
pod
,
pod_with_no_terminal
,
kube_pod
(
app:
"should-be-filtered-out"
)]
)
)
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