Commit e2ce3c1a authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '205181-review-apps-mountvolume-setup-failed-for-volume-secrets' into 'master'

Fix failed kubernetes clean up by name

See merge request gitlab-org/gitlab!25326
parents fdef516a 3554a22b
......@@ -63,7 +63,7 @@ module Quality
'get',
RESOURCE_LIST,
%(--namespace "#{namespace}"),
'-o custom-columns=NAME:.metadata.name'
'-o name'
]
run_command(command).lines.map(&:strip)
end
......
......@@ -102,7 +102,7 @@ RSpec.describe Quality::KubernetesClient do
it 'calls kubectl to retrieve the resource names' do
expect(Gitlab::Popen).to receive(:popen_with_detail)
.with(["kubectl get #{described_class::RESOURCE_LIST} " +
%(--namespace "#{namespace}" -o custom-columns=NAME:.metadata.name)])
%(--namespace "#{namespace}" -o name)])
.and_return(Gitlab::Popen::Result.new([], raw_resource_names_str, '', double(success?: true)))
expect(subject.__send__(:raw_resource_names)).to eq(raw_resource_names)
......
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