diff options
Diffstat (limited to 'spec/lib/gitlab/kubernetes/helm')
7 files changed, 23 insertions, 34 deletions
diff --git a/spec/lib/gitlab/kubernetes/helm/api_spec.rb b/spec/lib/gitlab/kubernetes/helm/api_spec.rb index 1f925fd45af..0e4179d5887 100644 --- a/spec/lib/gitlab/kubernetes/helm/api_spec.rb +++ b/spec/lib/gitlab/kubernetes/helm/api_spec.rb @@ -17,7 +17,8 @@ describe Gitlab::Kubernetes::Helm::API do name: application_name, chart: 'chart-name', rbac: rbac, - files: files + files: files, + local_tiller_enabled: true ) end @@ -142,7 +143,7 @@ describe Gitlab::Kubernetes::Helm::API do end context 'with a service account' do - let(:command) { Gitlab::Kubernetes::Helm::InitCommand.new(name: application_name, files: files, rbac: rbac) } + let(:command) { Gitlab::Kubernetes::Helm::InitCommand.new(name: application_name, files: files, rbac: rbac, local_tiller_enabled: true) } context 'rbac-enabled cluster' do let(:rbac) { true } diff --git a/spec/lib/gitlab/kubernetes/helm/base_command_spec.rb b/spec/lib/gitlab/kubernetes/helm/base_command_spec.rb index 2a4a911cf38..f9bcb8abdb1 100644 --- a/spec/lib/gitlab/kubernetes/helm/base_command_spec.rb +++ b/spec/lib/gitlab/kubernetes/helm/base_command_spec.rb @@ -11,25 +11,14 @@ describe Gitlab::Kubernetes::Helm::BaseCommand do let(:rbac) { false } let(:test_class) do - Class.new do - include Gitlab::Kubernetes::Helm::BaseCommand - + Class.new(Gitlab::Kubernetes::Helm::BaseCommand) do def initialize(rbac) - @rbac = rbac - end - - def name - "test-class-name" - end - - def rbac? - @rbac - end - - def files - { - some: 'value' - } + super( + name: 'test-class-name', + rbac: rbac, + files: { some: 'value' }, + local_tiller_enabled: false + ) end end end diff --git a/spec/lib/gitlab/kubernetes/helm/delete_command_spec.rb b/spec/lib/gitlab/kubernetes/helm/delete_command_spec.rb index 95d60c18d56..2bf8b294821 100644 --- a/spec/lib/gitlab/kubernetes/helm/delete_command_spec.rb +++ b/spec/lib/gitlab/kubernetes/helm/delete_command_spec.rb @@ -3,11 +3,12 @@ require 'spec_helper' describe Gitlab::Kubernetes::Helm::DeleteCommand do - subject(:delete_command) { described_class.new(name: app_name, rbac: rbac, files: files) } + subject(:delete_command) { described_class.new(name: app_name, rbac: rbac, files: files, local_tiller_enabled: local_tiller_enabled) } let(:app_name) { 'app-name' } let(:rbac) { true } let(:files) { {} } + let(:local_tiller_enabled) { true } it_behaves_like 'helm command generator' do let(:commands) do @@ -21,9 +22,7 @@ describe Gitlab::Kubernetes::Helm::DeleteCommand do end context 'tillerless feature disabled' do - before do - stub_feature_flags(managed_apps_local_tiller: false) - end + let(:local_tiller_enabled) { false } it_behaves_like 'helm command generator' do let(:commands) do diff --git a/spec/lib/gitlab/kubernetes/helm/init_command_spec.rb b/spec/lib/gitlab/kubernetes/helm/init_command_spec.rb index 05d9b63d12b..61b8eb30b42 100644 --- a/spec/lib/gitlab/kubernetes/helm/init_command_spec.rb +++ b/spec/lib/gitlab/kubernetes/helm/init_command_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Gitlab::Kubernetes::Helm::InitCommand do - subject(:init_command) { described_class.new(name: application.name, files: files, rbac: rbac) } + subject(:init_command) { described_class.new(name: application.name, files: files, rbac: rbac, local_tiller_enabled: false) } let(:application) { create(:clusters_applications_helm) } let(:rbac) { false } diff --git a/spec/lib/gitlab/kubernetes/helm/install_command_spec.rb b/spec/lib/gitlab/kubernetes/helm/install_command_spec.rb index abd29e97505..6fc91300f5b 100644 --- a/spec/lib/gitlab/kubernetes/helm/install_command_spec.rb +++ b/spec/lib/gitlab/kubernetes/helm/install_command_spec.rb @@ -12,7 +12,8 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do version: version, repository: repository, preinstall: preinstall, - postinstall: postinstall + postinstall: postinstall, + local_tiller_enabled: local_tiller_enabled ) end @@ -22,6 +23,7 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do let(:version) { '1.2.3' } let(:preinstall) { nil } let(:postinstall) { nil } + let(:local_tiller_enabled) { true } it_behaves_like 'helm command generator' do let(:commands) do @@ -51,9 +53,7 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do end context 'tillerless feature disabled' do - before do - stub_feature_flags(managed_apps_local_tiller: false) - end + let(:local_tiller_enabled) { false } let(:tls_flags) do <<~EOS.squish diff --git a/spec/lib/gitlab/kubernetes/helm/patch_command_spec.rb b/spec/lib/gitlab/kubernetes/helm/patch_command_spec.rb index eee842fa7d6..8d965a25f84 100644 --- a/spec/lib/gitlab/kubernetes/helm/patch_command_spec.rb +++ b/spec/lib/gitlab/kubernetes/helm/patch_command_spec.rb @@ -7,6 +7,7 @@ describe Gitlab::Kubernetes::Helm::PatchCommand do let(:repository) { 'https://repository.example.com' } let(:rbac) { false } let(:version) { '1.2.3' } + let(:local_tiller_enabled) { true } subject(:patch_command) do described_class.new( @@ -15,14 +16,13 @@ describe Gitlab::Kubernetes::Helm::PatchCommand do rbac: rbac, files: files, version: version, - repository: repository + repository: repository, + local_tiller_enabled: local_tiller_enabled ) end context 'when local tiller feature is disabled' do - before do - stub_feature_flags(managed_apps_local_tiller: false) - end + let(:local_tiller_enabled) { false } let(:tls_flags) do <<~EOS.squish diff --git a/spec/lib/gitlab/kubernetes/helm/reset_command_spec.rb b/spec/lib/gitlab/kubernetes/helm/reset_command_spec.rb index 981bb4e4abf..3773c428713 100644 --- a/spec/lib/gitlab/kubernetes/helm/reset_command_spec.rb +++ b/spec/lib/gitlab/kubernetes/helm/reset_command_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Gitlab::Kubernetes::Helm::ResetCommand do - subject(:reset_command) { described_class.new(name: name, rbac: rbac, files: files) } + subject(:reset_command) { described_class.new(name: name, rbac: rbac, files: files, local_tiller_enabled: false) } let(:rbac) { true } let(:name) { 'helm' } |