Commit 6d4c2529 authored by Rémy Coutable's avatar Rémy Coutable

Handle nil terminals in Clusters::Platforms::Kubernetes

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 22f658e0
...@@ -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
......
...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment