summaryrefslogtreecommitdiff
path: root/app/validators
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-12-05 12:00:02 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2017-12-05 12:00:02 +0000
commit4b66bdfa1af8fbef5d2af94a62e2522806cc7250 (patch)
treeb63b843eca0e92ac2938ad8a49a979c2b8ab52e9 /app/validators
parent04a882d8d3bd68bee71f5b7073cb7a8ce0149852 (diff)
downloadgitlab-ce-4b66bdfa1af8fbef5d2af94a62e2522806cc7250.tar.gz
Second iteration of Move Kubernetes from service to Cluster page
Diffstat (limited to 'app/validators')
-rw-r--r--app/validators/cluster_name_validator.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/validators/cluster_name_validator.rb b/app/validators/cluster_name_validator.rb
index 13ec342f399..e7d32550176 100644
--- a/app/validators/cluster_name_validator.rb
+++ b/app/validators/cluster_name_validator.rb
@@ -3,11 +3,7 @@
# Custom validator for ClusterName.
class ClusterNameValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value)
- if record.user?
- unless value.present?
- record.errors.add(attribute, " has to be present")
- end
- elsif record.gcp?
+ if record.managed?
if record.persisted? && record.name_changed?
record.errors.add(attribute, " can not be changed because it's synchronized with provider")
end
@@ -19,6 +15,10 @@ class ClusterNameValidator < ActiveModel::EachValidator
unless value =~ Gitlab::Regex.kubernetes_namespace_regex
record.errors.add(attribute, Gitlab::Regex.kubernetes_namespace_regex_message)
end
+ else
+ unless value.present?
+ record.errors.add(attribute, " has to be present")
+ end
end
end
end