diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-24 03:06:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-24 03:06:02 +0300 |
commit | 83ad9ec8cc449dca0b57a34a10afd529326c1d57 (patch) | |
tree | b085aacd0682bb2e6073c45b4a6a7ef8b48b7069 /spec | |
parent | b9254657872c4db441ab268154686f5476fb4bc6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/kubernetes/helm/reset_command_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/kubernetes/kube_client_spec.rb | 1 | ||||
-rw-r--r-- | spec/models/clusters/applications/helm_spec.rb | 10 |
3 files changed, 13 insertions, 0 deletions
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, diff --git a/spec/models/clusters/applications/helm_spec.rb b/spec/models/clusters/applications/helm_spec.rb index 9672129bb1e..64f58155a66 100644 --- a/spec/models/clusters/applications/helm_spec.rb +++ b/spec/models/clusters/applications/helm_spec.rb @@ -134,4 +134,14 @@ describe Clusters::Applications::Helm do end end end + + describe '#post_uninstall' do + let(:helm) { create(:clusters_applications_helm, :installed) } + + it do + expect(helm.cluster.kubeclient).to receive(:delete_namespace).with('gitlab-managed-apps') + + helm.post_uninstall + end + end end |