Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 0 deletions

diff --git a/lib/gitlab/kubernetes/kubectl_cmd.rb b/lib/gitlab/kubernetes/kubectl_cmd.rb
index 981eb5681dc..e8fde28b44d 100644
--- a/lib/gitlab/kubernetes/kubectl_cmd.rb
+++ b/lib/gitlab/kubernetes/kubectl_cmd.rb
@@ -13,6 +13,16 @@ module Gitlab
 
           %w(kubectl apply -f).concat([filename], args).shelljoin
         end
+
+        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')
+        end
+
+        def api_resources(*args)
+          %w(kubectl api-resources).concat(args).shelljoin
+        end
       end
     end
   end