From 1427bdcadf5f4026d141a5c4e93db8b1b00fe40a Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 1 Nov 2017 13:56:27 +0100
Subject: Revert back FetchKubernetesTokenService
---
app/models/clusters/cluster.rb | 2 --
app/models/clusters/platforms/kubernetes.rb | 8 ++------
2 files changed, 2 insertions(+), 8 deletions(-)
(limited to 'app/models')
diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb
index a3f6d20ba43..ca09b939f34 100644
--- a/app/models/clusters/cluster.rb
+++ b/app/models/clusters/cluster.rb
@@ -18,8 +18,6 @@ module Clusters
accepts_nested_attributes_for :provider_gcp, update_only: true
accepts_nested_attributes_for :platform_kubernetes, update_only: true
- validates :provider_type, presence: true
- validates :platform_type, presence: true
validates :name, cluster_name: true
validate :restrict_modification, on: :update
diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb
index 4c3e270892e..3ad2ffe531d 100644
--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -28,7 +28,7 @@ module Clusters
}
# We expect to be `active?` only when enabled and cluster is created (the api_url is assigned)
- with_options presence: true, if: :active? do
+ with_options presence: true, if: :enabled? do
validates :api_url, url: true, presence: true
validates :token, presence: true
end
@@ -42,10 +42,6 @@ module Clusters
delegate :project, to: :cluster, allow_nil: true
delegate :enabled?, to: :cluster, allow_nil: true
- def active?
- enabled? && api_url.present?
- end
-
class << self
def namespace_for_project(project)
"#{project.path}-#{project.id}"
@@ -87,7 +83,7 @@ module Clusters
return raise 'Kubernetes service already configured' unless manages_kubernetes_service?
ensure_kubernetes_service.update!(
- active: active?,
+ active: enabled?,
api_url: api_url,
namespace: namespace,
token: token,
--
cgit v1.2.1