Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc2

1 files changed, 4 insertions, 22 deletions

diff --git a/spec/lib/gitlab/kubernetes/helm/v2/reset_command_spec.rb b/spec/lib/gitlab/kubernetes/helm/v2/reset_command_spec.rb
index 9e580cea397..2a3a4cec2b0 100644
--- a/spec/lib/gitlab/kubernetes/helm/v2/reset_command_spec.rb
+++ b/spec/lib/gitlab/kubernetes/helm/v2/reset_command_spec.rb
@@ -12,32 +12,14 @@ RSpec.describe Gitlab::Kubernetes::Helm::V2::ResetCommand do
   it_behaves_like 'helm command generator' do
     let(:commands) do
       <<~EOS
-      helm reset
-      kubectl delete replicaset -n gitlab-managed-apps -l name\\=tiller
-      kubectl delete clusterrolebinding tiller-admin
+      export HELM_HOST="localhost:44134"
+      tiller -listen ${HELM_HOST} -alsologtostderr &
+      helm init --client-only
+      helm reset --force
       EOS
     end
   end
 
-  context 'when there is a ca.pem file' do
-    let(:files) { { 'ca.pem': 'some file content' } }
-
-    it_behaves_like 'helm command generator' do
-      let(:commands) do
-        <<~EOS1.squish + "\n" + <<~EOS2
-        helm reset
-        --tls
-        --tls-ca-cert /data/helm/helm/config/ca.pem
-        --tls-cert /data/helm/helm/config/cert.pem
-        --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
-  end
-
   describe '#pod_name' do
     subject { reset_command.pod_name }