diff options
author | Tiger <twatson@gitlab.com> | 2019-06-12 09:44:18 +1000 |
---|---|---|
committer | Tiger <twatson@gitlab.com> | 2019-06-18 12:43:52 +1000 |
commit | 74702f0e0e05bc346338fbd11b596fcbedfbaea6 (patch) | |
tree | e426ab17b7dc425c9d63dc9670b865fcbd17bb02 /spec/services | |
parent | db9ef69272155b3c8ead5c0e7d027bda2b623d43 (diff) | |
download | gitlab-ce-74702f0e0e05bc346338fbd11b596fcbedfbaea6.tar.gz |
Enable project-level JIT resource creation60617-enable-project-cluster-jit
Previously this behaviour was only available to group
and instance-level clusters, as some project clusters
relied on Kubernetes credentials being passed through
to the runner instead of having their resources managed
by GitLab (which is not available when using JIT). These
clusters have been migrated to unmanaged, so resources
can be created on demand for the remaining managed clusters.
Diffstat (limited to 'spec/services')
-rw-r--r-- | spec/services/clusters/gcp/finalize_creation_service_spec.rb | 10 | ||||
-rw-r--r-- | spec/services/clusters/update_service_spec.rb | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/spec/services/clusters/gcp/finalize_creation_service_spec.rb b/spec/services/clusters/gcp/finalize_creation_service_spec.rb index 2664649df47..5f91acb8e84 100644 --- a/spec/services/clusters/gcp/finalize_creation_service_spec.rb +++ b/spec/services/clusters/gcp/finalize_creation_service_spec.rb @@ -19,10 +19,6 @@ describe Clusters::Gcp::FinalizeCreationService, '#execute' do subject { described_class.new.execute(provider) } - before do - allow(ClusterConfigureWorker).to receive(:perform_async) - end - shared_examples 'success' do it 'configures provider and kubernetes' do subject @@ -42,12 +38,6 @@ describe Clusters::Gcp::FinalizeCreationService, '#execute' do expect(platform.password).to eq(password) expect(platform.token).to eq(token) end - - it 'calls ClusterConfigureWorker in a ascync fashion' do - expect(ClusterConfigureWorker).to receive(:perform_async).with(cluster.id) - - subject - end end shared_examples 'error' do diff --git a/spec/services/clusters/update_service_spec.rb b/spec/services/clusters/update_service_spec.rb index 21b37f88fd8..3ee45375dca 100644 --- a/spec/services/clusters/update_service_spec.rb +++ b/spec/services/clusters/update_service_spec.rb @@ -39,7 +39,6 @@ describe Clusters::UpdateService do end before do - allow(ClusterConfigureWorker).to receive(:perform_async) stub_kubeclient_get_namespace('https://kubernetes.example.com', namespace: 'my-namespace') end |