Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 1 deletions

diff --git a/lib/gitlab/kubernetes/helm/reset_command.rb b/lib/gitlab/kubernetes/helm/reset_command.rb
index c8349639ec3..13176360227 100644
--- a/lib/gitlab/kubernetes/helm/reset_command.rb
+++ b/lib/gitlab/kubernetes/helm/reset_command.rb
@@ -18,7 +18,8 @@ module Gitlab
         def generate_script
           super + [
             reset_helm_command,
-            delete_tiller_replicaset
+            delete_tiller_replicaset,
+            delete_tiller_clusterrolebinding
           ].join("\n")
         end
 
@@ -43,6 +44,12 @@ module Gitlab
           Gitlab::Kubernetes::KubectlCmd.delete(*delete_args)
         end
 
+        def delete_tiller_clusterrolebinding
+          delete_args = %w[clusterrolebinding tiller-admin]
+
+          Gitlab::Kubernetes::KubectlCmd.delete(*delete_args)
+        end
+
         def reset_helm_command
           command = %w[helm reset] + optional_tls_flags
 
diff --git a/lib/gitlab/kubernetes/kube_client.rb b/lib/gitlab/kubernetes/kube_client.rb
index 64317225ec6..aadbc35d499 100644
--- a/lib/gitlab/kubernetes/kube_client.rb
+++ b/lib/gitlab/kubernetes/kube_client.rb
@@ -39,6 +39,7 @@ module Gitlab
         :get_secret,
         :get_service,
         :get_service_account,
+        :delete_namespace,
         :delete_pod,
         :create_config_map,
         :create_namespace,