From c9726c934556033eb379d5bc7fa855d774d07eff Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 11 Dec 2021 21:13:04 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../gitlab/delegate_predicate_methods.yml | 1 - app/models/clusters/platforms/kubernetes.rb | 19 +++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.rubocop_todo/gitlab/delegate_predicate_methods.yml b/.rubocop_todo/gitlab/delegate_predicate_methods.yml index abb71b09da7..2f3a1dce1e8 100644 --- a/.rubocop_todo/gitlab/delegate_predicate_methods.yml +++ b/.rubocop_todo/gitlab/delegate_predicate_methods.yml @@ -2,7 +2,6 @@ Gitlab/DelegatePredicateMethods: Exclude: - app/models/clusters/cluster.rb - - app/models/clusters/platforms/kubernetes.rb - app/models/concerns/ci/metadatable.rb - app/models/concerns/integrations/base_data_fields.rb - app/models/concerns/resolvable_discussion.rb diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb index 7ec614b048c..1bd8e8b44cb 100644 --- a/app/models/clusters/platforms/kubernetes.rb +++ b/app/models/clusters/platforms/kubernetes.rb @@ -50,12 +50,6 @@ module Clusters alias_attribute :ca_pem, :ca_cert - delegate :enabled?, to: :cluster, allow_nil: true - delegate :provided_by_user?, to: :cluster, allow_nil: true - delegate :allow_user_defined_namespace?, to: :cluster, allow_nil: true - - alias_method :active?, :enabled? - enum_with_nil authorization_type: { unknown_authorization: nil, rbac: 1, @@ -66,6 +60,19 @@ module Clusters nullify_if_blank :namespace + def enabled? + !!cluster&.enabled? + end + alias_method :active?, :enabled? + + def provided_by_user? + !!cluster&.provided_by_user? + end + + def allow_user_defined_namespace? + !!cluster&.allow_user_defined_namespace? + end + def predefined_variables(project:, environment_name:, kubernetes_namespace: nil) Gitlab::Ci::Variables::Collection.new.tap do |variables| variables.append(key: 'KUBE_URL', value: api_url)