diff options
author | Stan Hu <stanhu@gmail.com> | 2019-08-07 09:04:49 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-08-07 09:04:49 -0700 |
commit | 4f1997a05a3d8d8eb04949888eff4c6a92de1bc3 (patch) | |
tree | ee4654944cfa7a5609ef54569301e975a03c2c74 /app/finders/clusters/knative_services_finder.rb | |
parent | 971c1061b22ac921c32d194dd67b67819d1ac74d (diff) | |
parent | 8d659869e1d8ef4a844ea03890f42cb80f312fa0 (diff) | |
download | gitlab-ce-44496-save-project-id.tar.gz |
Merge branch 'master' into 44496-save-project-id44496-save-project-id
Diffstat (limited to 'app/finders/clusters/knative_services_finder.rb')
-rw-r--r-- | app/finders/clusters/knative_services_finder.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/app/finders/clusters/knative_services_finder.rb b/app/finders/clusters/knative_services_finder.rb index 7d3b53ef663..71cebe4495e 100644 --- a/app/finders/clusters/knative_services_finder.rb +++ b/app/finders/clusters/knative_services_finder.rb @@ -13,11 +13,11 @@ module Clusters self.reactive_cache_key = ->(finder) { finder.model_name } self.reactive_cache_worker_finder = ->(_id, *cache_args) { from_cache(*cache_args) } - attr_reader :cluster, :project + attr_reader :cluster, :environment - def initialize(cluster, project) + def initialize(cluster, environment) @cluster = cluster - @project = project + @environment = environment end def with_reactive_cache_memoized(*cache_args, &block) @@ -30,11 +30,11 @@ module Clusters clear_reactive_cache!(*cache_args) end - def self.from_cache(cluster_id, project_id) + def self.from_cache(cluster_id, environment_id) cluster = Clusters::Cluster.find(cluster_id) - project = ::Project.find(project_id) + environment = Environment.find(environment_id) - new(cluster, project) + new(cluster, environment) end def calculate_reactive_cache(*) @@ -56,7 +56,7 @@ module Clusters end def cache_args - [cluster.id, project.id] + [cluster.id, environment.id] end def service_pod_details(service) @@ -84,7 +84,7 @@ module Clusters private def search_namespace - @search_namespace ||= cluster.kubernetes_namespace_for(project) + @search_namespace ||= cluster.kubernetes_namespace_for(environment) end def knative_client |