diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-24 00:06:02 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-24 00:06:02 +0000 |
commit | 83ad9ec8cc449dca0b57a34a10afd529326c1d57 (patch) | |
tree | b085aacd0682bb2e6073c45b4a6a7ef8b48b7069 /lib/gitlab/kubernetes | |
parent | b9254657872c4db441ab268154686f5476fb4bc6 (diff) | |
download | gitlab-ce-83ad9ec8cc449dca0b57a34a10afd529326c1d57.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/kubernetes')
-rw-r--r-- | lib/gitlab/kubernetes/helm/reset_command.rb | 9 | ||||
-rw-r--r-- | lib/gitlab/kubernetes/kube_client.rb | 1 |
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, |