From 6438df3a1e0fb944485cebf07976160184697d72 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 20 Jan 2021 13:34:23 -0600 Subject: Add latest changes from gitlab-org/gitlab@13-8-stable-ee --- lib/gitlab/kubernetes/kubectl_cmd.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/gitlab/kubernetes/kubectl_cmd.rb') diff --git a/lib/gitlab/kubernetes/kubectl_cmd.rb b/lib/gitlab/kubernetes/kubectl_cmd.rb index e8fde28b44d..f3ac19e210a 100644 --- a/lib/gitlab/kubernetes/kubectl_cmd.rb +++ b/lib/gitlab/kubernetes/kubectl_cmd.rb @@ -17,7 +17,7 @@ module Gitlab def delete_crds_from_group(group) api_resources_args = %w(-o name --api-group).push(group) - api_resources(*api_resources_args) + " | xargs " + delete('--ignore-not-found', 'crd') + PodCmd.retry_command(api_resources(*api_resources_args) + " | xargs -r " + delete('--ignore-not-found', 'crd')) end def api_resources(*args) -- cgit v1.2.3