summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2018-11-08 23:52:58 +1300
committerThong Kuah <tkuah@gitlab.com>2018-11-08 23:52:58 +1300
commitb054694e497d58302f9cbfd134e84f5304b68e27 (patch)
treecf1f9f5306e23ba659740d494801eff84e642e3a
parentecb4a29fc069990a4e946f40f1bd8e17dcb2186d (diff)
downloadgitlab-ce-b054694e497d58302f9cbfd134e84f5304b68e27.tar.gz
Still raise if there's no #actual_namespace
However, we only need to raise for project_type clusters to maintain previous behaviour. In all probablity this requirement to have actual_namespace came from KubernetesService and will no longer be required soon.
-rw-r--r--app/models/clusters/platforms/kubernetes.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb
index 1fa28e13f60..ea02ae6c9d8 100644
--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -154,6 +154,7 @@ module Clusters
def build_kube_client!
raise "Incomplete settings" unless api_url
+ raise "No namespace" if cluster.project_type? && actual_namespace.empty? # can probably remove this line once we remove #actual_namespace
unless (username && password) || token
raise "Either username/password or token is required to access API"