diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb index 590d5da24cb..39b4f8f7bfc 100644 --- a/app/models/clusters/platforms/kubernetes.rb +++ b/app/models/clusters/platforms/kubernetes.rb @@ -6,7 +6,7 @@ module Clusters include ReactiveCaching self.table_name = 'cluster_platforms_kubernetes' - self.reactive_cache_key = ->(kubernetes) { [kubernetes.class.model_name.singular, kubernetes.cluster_id] } + self.reactive_cache_key = ->(kubernetes) { [kubernetes.class.model_name.singular, kubernetes.id] } belongs_to :cluster, inverse_of: :platform_kubernetes, class_name: 'Clusters::Cluster' @@ -41,6 +41,8 @@ module Clusters delegate :project, to: :cluster, allow_nil: true delegate :enabled?, to: :cluster, allow_nil: true + alias_method :active?, :enabled? + def actual_namespace if namespace.present? namespace diff --git a/spec/models/project_services/kubernetes_service_spec.rb b/spec/models/project_services/kubernetes_service_spec.rb index d33352c918b..f037ee77a94 100644 --- a/spec/models/project_services/kubernetes_service_spec.rb +++ b/spec/models/project_services/kubernetes_service_spec.rb @@ -4,7 +4,7 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do include KubernetesHelpers include ReactiveCachingHelpers - let(:project) { build_stubbed(:kubernetes_project) } + let(:project) { create(:kubernetes_project) } let(:service) { project.deployment_platform } describe 'Associations' do diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 41483a8a05e..a4abcc49a0d 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -3100,6 +3100,8 @@ describe Project do describe '#deployment_platform' do subject { project.deployment_platform } + let(:project) { create(:project) } + context 'when user configured kubernetes from Integration > Kubernetes' do let!(:kubernetes_service) { create(:kubernetes_service, project: project) } diff --git a/spec/workers/reactive_caching_worker_spec.rb b/spec/workers/reactive_caching_worker_spec.rb index 225d3e38542..3da851de067 100644 --- a/spec/workers/reactive_caching_worker_spec.rb +++ b/spec/workers/reactive_caching_worker_spec.rb @@ -2,28 +2,27 @@ require 'spec_helper' describe ReactiveCachingWorker do let(:service) { project.deployment_platform } - subject { described_class.new.perform("KubernetesService", service.id) } describe '#perform' do - shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do - it 'calls #exclusively_update_reactive_cache!' do - expect_any_instance_of(KubernetesService).to receive(:exclusively_update_reactive_cache!) - - subject - 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' + it 'calls #exclusively_update_reactive_cache!' do + expect_any_instance_of(KubernetesService).to receive(:exclusively_update_reactive_cache!) + + described_class.new.perform("KubernetesService", service.id) + end 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' + it 'calls #exclusively_update_reactive_cache!' do + expect_any_instance_of(Clusters::Platforms::Kubernetes).to receive(:exclusively_update_reactive_cache!) + + described_class.new.perform("Clusters::Platforms::Kubernetes", service.id) + end end end end