diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-06-05 09:42:20 +0000 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-06-05 09:42:20 +0000 |
commit | eebdfbc334a66064b2d9972bbe8b5f35e2fe9746 (patch) | |
tree | 427524d9f6042d94cec598e07ff3a2ca48e6e43e /spec/lib/gitlab | |
parent | f305081c29570278e379de00d048c983d4ff3cc0 (diff) | |
parent | c7d50ddf5504828296c97447b281be17282a056e (diff) | |
download | gitlab-ce-eebdfbc334a66064b2d9972bbe8b5f35e2fe9746.tar.gz |
Merge branch '62713-fix-uninstalling-cluster-apps' into 'master'
Fix connection to Tiller error while uninstalling
Closes #62713
See merge request gitlab-org/gitlab-ce!29131
Diffstat (limited to 'spec/lib/gitlab')
-rw-r--r-- | spec/lib/gitlab/kubernetes/helm/api_spec.rb | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/spec/lib/gitlab/kubernetes/helm/api_spec.rb b/spec/lib/gitlab/kubernetes/helm/api_spec.rb index 24ce397ec3d..0de809833e6 100644 --- a/spec/lib/gitlab/kubernetes/helm/api_spec.rb +++ b/spec/lib/gitlab/kubernetes/helm/api_spec.rb @@ -36,6 +36,8 @@ describe Gitlab::Kubernetes::Helm::Api do describe '#uninstall' do before do allow(client).to receive(:create_pod).and_return(nil) + allow(client).to receive(:get_config_map).and_return(nil) + allow(client).to receive(:create_config_map).and_return(nil) allow(client).to receive(:delete_pod).and_return(nil) allow(namespace).to receive(:ensure_exists!).once end @@ -53,6 +55,28 @@ describe Gitlab::Kubernetes::Helm::Api do subject.uninstall(command) end + + context 'with a ConfigMap' do + let(:resource) { Gitlab::Kubernetes::ConfigMap.new(application_name, files).generate } + + it 'creates a ConfigMap on kubeclient' do + expect(client).to receive(:create_config_map).with(resource).once + + subject.install(command) + end + + context 'config map already exists' do + before do + expect(client).to receive(:get_config_map).with("values-content-configuration-#{application_name}", gitlab_namespace).and_return(resource) + end + + it 'updates the config map' do + expect(client).to receive(:update_config_map).with(resource).once + + subject.install(command) + end + end + end end describe '#install' do |