summaryrefslogtreecommitdiff
path: root/app/models/clusters
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2019-03-29 18:23:18 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-03-29 18:23:18 +0000
commitab06d1eda2fa222b4de400d2b18eab611ffefa68 (patch)
tree978ed57b01da01e1187db25f0423e2ada85550b7 /app/models/clusters
parent0df75d241a5054a19086dca29cca4d65ac1736fe (diff)
downloadgitlab-ce-ab06d1eda2fa222b4de400d2b18eab611ffefa68.tar.gz
Renames Cluster#managed? to provided_by_user?
This will allow to user the term managed? on https://gitlab.com/gitlab-org/gitlab-ce/issues/56557. Managed? will be used to distinct clusters that are automatically managed by GitLab
Diffstat (limited to 'app/models/clusters')
-rw-r--r--app/models/clusters/cluster.rb5
-rw-r--r--app/models/clusters/platforms/kubernetes.rb4
2 files changed, 3 insertions, 6 deletions
diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb
index d9dec680beb..7a10b07ee9d 100644
--- a/app/models/clusters/cluster.rb
+++ b/app/models/clusters/cluster.rb
@@ -70,6 +70,7 @@ module Clusters
delegate :external_hostname, to: :application_ingress, prefix: true, allow_nil: true
alias_attribute :base_domain, :domain
+ alias_attribute :provided_by_user?, :user?
enum cluster_type: {
instance_type: 1,
@@ -149,10 +150,6 @@ module Clusters
return platform_kubernetes if kubernetes?
end
- def managed?
- !user?
- end
-
def all_projects
if project_type?
projects
diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb
index 63ef7ba6b45..2ae141190a8 100644
--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -54,7 +54,7 @@ module Clusters
delegate :project, to: :cluster, allow_nil: true
delegate :enabled?, to: :cluster, allow_nil: true
- delegate :managed?, to: :cluster, allow_nil: true
+ delegate :provided_by_user?, to: :cluster, allow_nil: true
delegate :allow_user_defined_namespace?, to: :cluster, allow_nil: true
delegate :kubernetes_namespace, to: :cluster
@@ -219,7 +219,7 @@ module Clusters
end
def prevent_modification
- return unless managed?
+ return if provided_by_user?
if api_url_changed? || token_changed? || ca_pem_changed?
errors.add(:base, _('Cannot modify managed Kubernetes cluster'))