From 83ad9ec8cc449dca0b57a34a10afd529326c1d57 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 24 Sep 2019 00:06:02 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 spec/lib/gitlab/kubernetes/helm/reset_command_spec.rb | 2 ++
 spec/lib/gitlab/kubernetes/kube_client_spec.rb        | 1 +
 2 files changed, 3 insertions(+)

(limited to 'spec/lib/gitlab/kubernetes')

diff --git a/spec/lib/gitlab/kubernetes/helm/reset_command_spec.rb b/spec/lib/gitlab/kubernetes/helm/reset_command_spec.rb
index d49d4779735..2a89b04723d 100644
--- a/spec/lib/gitlab/kubernetes/helm/reset_command_spec.rb
+++ b/spec/lib/gitlab/kubernetes/helm/reset_command_spec.rb
@@ -15,6 +15,7 @@ describe Gitlab::Kubernetes::Helm::ResetCommand do
       <<~EOS
       helm reset
       kubectl delete replicaset -n gitlab-managed-apps -l name\\=tiller
+      kubectl delete clusterrolebinding tiller-admin
       EOS
     end
   end
@@ -32,6 +33,7 @@ describe Gitlab::Kubernetes::Helm::ResetCommand do
         --tls-key /data/helm/helm/config/key.pem
         EOS1
           kubectl delete replicaset -n gitlab-managed-apps -l name\\=tiller
+          kubectl delete clusterrolebinding tiller-admin
         EOS2
       end
     end
diff --git a/spec/lib/gitlab/kubernetes/kube_client_spec.rb b/spec/lib/gitlab/kubernetes/kube_client_spec.rb
index e5d688aa391..8efaca65f5a 100644
--- a/spec/lib/gitlab/kubernetes/kube_client_spec.rb
+++ b/spec/lib/gitlab/kubernetes/kube_client_spec.rb
@@ -162,6 +162,7 @@ describe Gitlab::Kubernetes::KubeClient do
       :get_secret,
       :get_service,
       :get_service_account,
+      :delete_namespace,
       :delete_pod,
       :create_config_map,
       :create_namespace,
-- 
cgit v1.2.1