diff options
author | James Fargher <proglottis@gmail.com> | 2019-06-03 09:34:18 +0100 |
---|---|---|
committer | João Cunha <j.a.cunha@gmail.com> | 2019-06-17 14:29:16 +0100 |
commit | 59661e67d75a20b2b5ef693b4c52909209a744ef (patch) | |
tree | fad95acdea8b75a87a3f78fe40eca6bb3a686c1c /spec/models/project_spec.rb | |
parent | 956bf0d207cd6e361da70014345920f52eddec6d (diff) | |
download | gitlab-ce-readonly_k8s_integration.tar.gz |
Make KubernetesService readonlyreadonly_k8s_integration
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/models/project_spec.rb')
-rw-r--r-- | spec/models/project_spec.rb | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index e6d5e8fc320..1be10b3dbf7 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -2652,7 +2652,10 @@ describe Project do end context 'when project has a deployment service' do - shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do + context 'when user configured kubernetes from CI/CD > Clusters and KubernetesNamespace migration has not been executed' do + let!(:cluster) { create(:cluster, :project, :provided_by_gcp) } + let(:project) { cluster.project } + it 'returns variables from this service' do expect(project.deployment_variables).to include( { key: 'KUBE_TOKEN', value: project.deployment_platform.token, public: false, masked: true } @@ -2660,19 +2663,6 @@ describe Project do 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 and KubernetesNamespace migration has not been executed' do - let!(:cluster) { create(:cluster, :project, :provided_by_gcp) } - let(:project) { cluster.project } - - it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes' - end - context 'when user configured kubernetes from CI/CD > Clusters and KubernetesNamespace migration has been executed' do let!(:kubernetes_namespace) { create(:cluster_kubernetes_namespace, :with_token) } let!(:cluster) { kubernetes_namespace.cluster } |