diff options
author | James Fargher <proglottis@gmail.com> | 2019-06-18 00:01:56 +0000 |
---|---|---|
committer | Thong Kuah <tkuah@gitlab.com> | 2019-06-18 00:01:56 +0000 |
commit | 6b9157d5dc9b45cc6d70f10d075bbf149af5f266 (patch) | |
tree | 29161152edd2c8cfbf1e4097beced805cdd47a72 /spec/support/prometheus | |
parent | 04307096bcc776259d8080bebd688ff6073d07c4 (diff) | |
download | gitlab-ce-6b9157d5dc9b45cc6d70f10d075bbf149af5f266.tar.gz |
Make KubernetesService readonly
We are deprecating this service in favor of instance wide clusters.
Therefore we removed some code that is not anymore needed for a
readonly cluster and also we added some flags to allow for this
deprecation. These flags are to be removed in the next release when
we finally completelly remove KubernetesService.
Diffstat (limited to 'spec/support/prometheus')
-rw-r--r-- | spec/support/prometheus/additional_metrics_shared_examples.rb | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/spec/support/prometheus/additional_metrics_shared_examples.rb b/spec/support/prometheus/additional_metrics_shared_examples.rb index 8044b061ca5..de21e808932 100644 --- a/spec/support/prometheus/additional_metrics_shared_examples.rb +++ b/spec/support/prometheus/additional_metrics_shared_examples.rb @@ -44,7 +44,9 @@ RSpec.shared_examples 'additional metrics query' do end describe 'project has Kubernetes service' do - shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do + context 'when user configured kubernetes from CI/CD > Clusters' do + let!(:cluster) { create(:cluster, :project, :provided_by_gcp) } + let(:project) { cluster.project } let(:environment) { create(:environment, slug: 'environment-slug', project: project) } let(:kube_namespace) { project.deployment_platform.kubernetes_namespace_for(project) } @@ -56,19 +58,6 @@ RSpec.shared_examples 'additional metrics query' do subject.query(*query_params) end end - - context 'when user configured kubernetes from Integration > Kubernetes' do - let(:project) { create(:kubernetes_project) } - - it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes' - end - - context 'when user configured kubernetes from CI/CD > Clusters' do - let!(:cluster) { create(:cluster, :project, :provided_by_gcp) } - let(:project) { cluster.project } - - it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes' - end end describe 'project without Kubernetes service' do |