summaryrefslogtreecommitdiff
path: root/app/models/clusters/platforms/kubernetes.rb
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-11-03 17:22:49 +0900
committerShinya Maeda <shinya@gitlab.com>2017-11-03 17:22:49 +0900
commit600d5f4fba4f73ef438db651d20da92080e5b3b0 (patch)
treed03a13eca8f7145a853466a88ccc4d04e138ca96 /app/models/clusters/platforms/kubernetes.rb
parent6ebe6792de24528a2052b77018b6c1d17ef5e17b (diff)
downloadgitlab-ce-600d5f4fba4f73ef438db651d20da92080e5b3b0.tar.gz
Fix tests. Remove NOT NULL constraint from cluster.user.
Diffstat (limited to 'app/models/clusters/platforms/kubernetes.rb')
-rw-r--r--app/models/clusters/platforms/kubernetes.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb
index a33534da8bb..b11701797c2 100644
--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -58,6 +58,9 @@ module Clusters
def update_kubernetes_integration!
raise 'Kubernetes service already configured' unless manages_kubernetes_service?
+ # This is neccesary, otheriwse enabled? returns true even though cluster updated with enabled: false
+ cluster.reload
+
ensure_kubernetes_service&.update!(
active: enabled?,
api_url: api_url,