From 8a55d2c5526ee5cb93bb40075dbbeaa6fcb01f91 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 21 Nov 2017 21:09:55 +0900
Subject: Revert KubernetesService logic in Platforms::Kubernetes

---
 app/models/clusters/platforms/kubernetes.rb       | 123 ++++++++++++++++++++
 spec/models/clusters/platforms/kubernetes_spec.rb | 135 ++++++++++++++++++++++
 2 files changed, 258 insertions(+)

diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb
index 6dc1ee810d3..a1e686d0d12 100644
--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -1,7 +1,12 @@
 module Clusters
   module Platforms
     class Kubernetes < ActiveRecord::Base
+      include Gitlab::CurrentSettings
+      include Gitlab::Kubernetes
+      include ReactiveCaching
+
       self.table_name = 'cluster_platforms_kubernetes'
+      self.reactive_cache_key = ->(kubernetes) { [kubernetes.class.model_name.singular, kubernetes.cluster_id] }
 
       belongs_to :cluster, inverse_of: :platform_kubernetes, class_name: 'Clusters::Cluster'
 
@@ -29,6 +34,8 @@ module Clusters
       validates :api_url, url: true, presence: true
       validates :token, presence: true
 
+      after_save :clear_reactive_cache!
+
       # TODO: Glue code till we migrate Kubernetes Integration into Platforms::Kubernetes
       after_destroy :destroy_kubernetes_integration!
 
@@ -55,6 +62,80 @@ module Clusters
         self.class.namespace_for_project(project) if project
       end
 
+      def predefined_variables
+        config = YAML.dump(kubeconfig)
+
+        variables = [
+          { key: 'KUBE_URL', value: api_url, public: true },
+          { key: 'KUBE_TOKEN', value: token, public: false },
+          { key: 'KUBE_NAMESPACE', value: actual_namespace, public: true },
+          { key: 'KUBECONFIG', value: config, public: false, file: true }
+        ]
+
+        if ca_pem.present?
+          variables << { key: 'KUBE_CA_PEM', value: ca_pem, public: true }
+          variables << { key: 'KUBE_CA_PEM_FILE', value: ca_pem, public: true, file: true }
+        end
+
+        variables
+      end
+
+      # Constructs a list of terminals from the reactive cache
+      #
+      # Returns nil if the cache is empty, in which case you should try again a
+      # short time later
+      def terminals(environment)
+        with_reactive_cache do |data|
+          pods = filter_by_label(data[:pods], app: environment.slug)
+          terminals = pods.flat_map { |pod| terminals_for_pod(api_url, actual_namespace, pod) }
+          terminals.each { |terminal| add_terminal_auth(terminal, terminal_auth) }
+        end
+      end
+
+      # Caches resources in the namespace so other calls don't need to block on
+      # network access
+      def calculate_reactive_cache
+        return unless active? && project && !project.pending_delete?
+
+        # We may want to cache extra things in the future
+        { pods: read_pods }
+      end
+
+      def kubeconfig
+        to_kubeconfig(
+          url: api_url,
+          namespace: actual_namespace,
+          token: token,
+          ca_pem: ca_pem)
+      end
+
+      def read_secrets
+        kubeclient = build_kubeclient!
+
+        kubeclient.get_secrets.as_json
+      end
+
+      # Returns a hash of all pods in the namespace
+      def read_pods
+        kubeclient = build_kubeclient!
+
+        kubeclient.get_pods(namespace: actual_namespace).as_json
+      rescue KubeException => err
+        raise err unless err.error_code == 404
+        []
+      end
+
+      def kubeclient_ssl_options
+        opts = { verify_ssl: OpenSSL::SSL::VERIFY_PEER }
+
+        if ca_pem.present?
+          opts[:cert_store] = OpenSSL::X509::Store.new
+          opts[:cert_store].add_cert(OpenSSL::X509::Certificate.new(ca_pem))
+        end
+
+        opts
+      end
+
       def kubeclient
         @kubeclient ||= kubernetes_service.kubeclient if manages_kubernetes_service?
       end
@@ -104,6 +185,48 @@ module Clusters
       def ensure_kubernetes_service
         @kubernetes_service ||= kubernetes_service || project&.build_kubernetes_service
       end
+
+      def build_kubeclient!(api_path: 'api', api_version: 'v1')
+        raise "Incomplete settings" unless api_url && actual_namespace
+
+        unless (username && password) || token
+          raise "Either username/password or token is required to access API"
+        end
+
+        ::Kubeclient::Client.new(
+          join_api_url(api_path),
+          api_version,
+          auth_options: kubeclient_auth_options,
+          ssl_options: kubeclient_ssl_options,
+          http_proxy_uri: ENV['http_proxy']
+        )
+      end
+
+      def kubeclient_auth_options
+        return { username: username, password: password } if username && password
+        return { bearer_token: token } if token
+      end
+
+      def join_api_url(api_path)
+        url = URI.parse(api_url)
+        prefix = url.path.sub(%r{/+\z}, '')
+
+        url.path = [prefix, api_path].join("/")
+
+        url.to_s
+      end
+
+      def terminal_auth
+        {
+          token: token,
+          ca_pem: ca_pem,
+          max_session_time: current_application_settings.terminal_max_session_time
+        }
+      end
+
+      def enforce_namespace_to_lower_case
+        self.namespace = self.namespace&.downcase
+      end
     end
   end
 end
diff --git a/spec/models/clusters/platforms/kubernetes_spec.rb b/spec/models/clusters/platforms/kubernetes_spec.rb
index ed76be703a5..4ad6e214e2a 100644
--- a/spec/models/clusters/platforms/kubernetes_spec.rb
+++ b/spec/models/clusters/platforms/kubernetes_spec.rb
@@ -5,6 +5,8 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
   include ReactiveCachingHelpers
 
   it { is_expected.to belong_to(:cluster) }
+  it { is_expected.to be_kind_of(Gitlab::Kubernetes) }
+  it { is_expected.to be_kind_of(ReactiveCaching) }
   it { is_expected.to respond_to :ca_pem }
 
   describe 'before_validation' do
@@ -185,4 +187,137 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
       it { is_expected.to be_nil }
     end
   end
+
+  describe '#predefined_variables' do
+    let!(:cluster) { create(:cluster, :project, platform_kubernetes: kubernetes) }
+    let(:kubernetes) { create(:platform_kubernetes, api_url: api_url, ca_cert: ca_pem, token: token) }
+    let(:api_url) { 'https://kube.domain.com' }
+    let(:ca_pem) { 'CA PEM DATA' }
+    let(:token) { 'token' }
+
+    let(:kubeconfig) do
+      config_file = expand_fixture_path('config/kubeconfig.yml')
+      config = YAML.load(File.read(config_file))
+      config.dig('users', 0, 'user')['token'] = token
+      config.dig('contexts', 0, 'context')['namespace'] = namespace
+      config.dig('clusters', 0, 'cluster')['certificate-authority-data'] =
+        Base64.strict_encode64(ca_pem)
+
+      YAML.dump(config)
+    end
+
+    shared_examples 'setting variables' do
+      it 'sets the variables' do
+        expect(kubernetes.predefined_variables).to include(
+          { key: 'KUBE_URL', value: api_url, public: true },
+          { key: 'KUBE_TOKEN', value: token, public: false },
+          { key: 'KUBE_NAMESPACE', value: namespace, public: true },
+          { key: 'KUBECONFIG', value: kubeconfig, public: false, file: true },
+          { key: 'KUBE_CA_PEM', value: ca_pem, public: true },
+          { key: 'KUBE_CA_PEM_FILE', value: ca_pem, public: true, file: true }
+        )
+      end
+    end
+
+    context 'namespace is provided' do
+      let(:namespace) { 'my-project' }
+
+      before do
+        kubernetes.namespace = namespace
+      end
+
+      it_behaves_like 'setting variables'
+    end
+
+    context 'no namespace provided' do
+      let(:namespace) { kubernetes.actual_namespace }
+
+      it_behaves_like 'setting variables'
+
+      it 'sets the KUBE_NAMESPACE' do
+        kube_namespace = kubernetes.predefined_variables.find { |h| h[:key] == 'KUBE_NAMESPACE' }
+
+        expect(kube_namespace).not_to be_nil
+        expect(kube_namespace[:value]).to match(/\A#{Gitlab::PathRegex::PATH_REGEX_STR}-\d+\z/)
+      end
+    end
+  end
+
+  describe '#terminals' do
+    subject { service.terminals(environment) }
+
+    let!(:cluster) { create(:cluster, :project, platform_kubernetes: service) }
+    let(:project) { cluster.project }
+    let(:service) { create(:platform_kubernetes, :configured) }
+    let(:environment) { build(:environment, project: project, name: "env", slug: "env-000000") }
+
+    context 'with invalid pods' do
+      it 'returns no terminals' do
+        stub_reactive_cache(service, pods: [{ "bad" => "pod" }])
+
+        is_expected.to be_empty
+      end
+    end
+
+    context 'with valid pods' do
+      let(:pod) { kube_pod(app: environment.slug) }
+      let(:terminals) { kube_terminals(service, pod) }
+
+      before do
+        stub_reactive_cache(
+          service,
+          pods: [pod, pod, kube_pod(app: "should-be-filtered-out")]
+        )
+      end
+
+      it 'returns terminals' do
+        is_expected.to eq(terminals + terminals)
+      end
+
+      it 'uses max session time from settings' do
+        stub_application_setting(terminal_max_session_time: 600)
+
+        times = subject.map { |terminal| terminal[:max_session_time] }
+        expect(times).to eq [600, 600, 600, 600]
+      end
+    end
+  end
+
+  describe '#calculate_reactive_cache' do
+    subject { service.calculate_reactive_cache }
+
+    let!(:cluster) { create(:cluster, :project, enabled: enabled, platform_kubernetes: service) }
+    let(:service) { create(:platform_kubernetes, :configured) }
+    let(:enabled) { true }
+
+    context 'when cluster is disabled' do
+      let(:enabled) { false }
+
+      it { is_expected.to be_nil }
+    end
+
+    context 'when kubernetes responds with valid pods' do
+      before do
+        stub_kubeclient_pods
+      end
+
+      it { is_expected.to eq(pods: [kube_pod]) }
+    end
+
+    context 'when kubernetes responds with 500s' do
+      before do
+        stub_kubeclient_pods(status: 500)
+      end
+
+      it { expect { subject }.to raise_error(KubeException) }
+    end
+
+    context 'when kubernetes responds with 404s' do
+      before do
+        stub_kubeclient_pods(status: 404)
+      end
+
+      it { is_expected.to eq(pods: []) }
+    end
+  end
 end
-- 
cgit v1.2.1


From 0d95ce51be77d2a2a3e8421c56da6a8e5762a44f Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 21 Nov 2017 22:03:07 +0900
Subject: Check diff between KubernetesService and Platforms::Kubernetes.
 Synchronize again.

---
 app/models/clusters/platforms/kubernetes.rb       | 124 ++++++++++------------
 app/models/project_services/kubernetes_service.rb |   5 +
 2 files changed, 62 insertions(+), 67 deletions(-)

diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb
index a1e686d0d12..549b32ceef1 100644
--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -44,12 +44,6 @@ module Clusters
       delegate :project, to: :cluster, allow_nil: true
       delegate :enabled?, to: :cluster, allow_nil: true
 
-      class << self
-        def namespace_for_project(project)
-          "#{project.path}-#{project.id}"
-        end
-      end
-
       def actual_namespace
         if namespace.present?
           namespace
@@ -58,10 +52,6 @@ module Clusters
         end
       end
 
-      def default_namespace
-        self.class.namespace_for_project(project) if project
-      end
-
       def predefined_variables
         config = YAML.dump(kubeconfig)
 
@@ -101,41 +91,6 @@ module Clusters
         { pods: read_pods }
       end
 
-      def kubeconfig
-        to_kubeconfig(
-          url: api_url,
-          namespace: actual_namespace,
-          token: token,
-          ca_pem: ca_pem)
-      end
-
-      def read_secrets
-        kubeclient = build_kubeclient!
-
-        kubeclient.get_secrets.as_json
-      end
-
-      # Returns a hash of all pods in the namespace
-      def read_pods
-        kubeclient = build_kubeclient!
-
-        kubeclient.get_pods(namespace: actual_namespace).as_json
-      rescue KubeException => err
-        raise err unless err.error_code == 404
-        []
-      end
-
-      def kubeclient_ssl_options
-        opts = { verify_ssl: OpenSSL::SSL::VERIFY_PEER }
-
-        if ca_pem.present?
-          opts[:cert_store] = OpenSSL::X509::Store.new
-          opts[:cert_store].add_cert(OpenSSL::X509::Certificate.new(ca_pem))
-        end
-
-        opts
-      end
-
       def kubeclient
         @kubeclient ||= kubernetes_service.kubeclient if manages_kubernetes_service?
       end
@@ -161,29 +116,19 @@ module Clusters
 
       private
 
-      def enforce_namespace_to_lower_case
-        self.namespace = self.namespace&.downcase
-      end
-
-      # TODO: glue code till we migrate Kubernetes Service into Platforms::Kubernetes class
-      def manages_kubernetes_service?
-        return true unless kubernetes_service&.active?
-
-        kubernetes_service.api_url == api_url
-      end
-
-      def destroy_kubernetes_integration!
-        return unless manages_kubernetes_service?
-
-        kubernetes_service&.destroy!
+      def kubeconfig
+        to_kubeconfig(
+          url: api_url,
+          namespace: actual_namespace,
+          token: token,
+          ca_pem: ca_pem)
       end
 
-      def kubernetes_service
-        @kubernetes_service ||= project&.kubernetes_service
-      end
+      def default_namespace
+        return unless project
 
-      def ensure_kubernetes_service
-        @kubernetes_service ||= kubernetes_service || project&.build_kubernetes_service
+        slug = "#{project.path}-#{project.id}".downcase
+        slug.gsub(/[^-a-z0-9]/, '-').gsub(/^-+/, '')
       end
 
       def build_kubeclient!(api_path: 'api', api_version: 'v1')
@@ -202,9 +147,29 @@ module Clusters
         )
       end
 
+      # Returns a hash of all pods in the namespace
+      def read_pods
+        kubeclient = build_kubeclient!
+
+        kubeclient.get_pods(namespace: actual_namespace).as_json
+      rescue KubeException => err
+        raise err unless err.error_code == 404
+        []
+      end
+
+      def kubeclient_ssl_options
+        opts = { verify_ssl: OpenSSL::SSL::VERIFY_PEER }
+
+        if ca_pem.present?
+          opts[:cert_store] = OpenSSL::X509::Store.new
+          opts[:cert_store].add_cert(OpenSSL::X509::Certificate.new(ca_pem))
+        end
+
+        opts
+      end
+
       def kubeclient_auth_options
-        return { username: username, password: password } if username && password
-        return { bearer_token: token } if token
+        { bearer_token: token }
       end
 
       def join_api_url(api_path)
@@ -227,6 +192,31 @@ module Clusters
       def enforce_namespace_to_lower_case
         self.namespace = self.namespace&.downcase
       end
+
+      def enforce_namespace_to_lower_case
+        self.namespace = self.namespace&.downcase
+      end
+
+      # TODO: glue code till we migrate Kubernetes Service into Platforms::Kubernetes class
+      def manages_kubernetes_service?
+        return true unless kubernetes_service&.active?
+
+        kubernetes_service.api_url == api_url
+      end
+
+      def destroy_kubernetes_integration!
+        return unless manages_kubernetes_service?
+
+        kubernetes_service&.destroy!
+      end
+
+      def kubernetes_service
+        @kubernetes_service ||= project&.kubernetes_service
+      end
+
+      def ensure_kubernetes_service
+        @kubernetes_service ||= kubernetes_service || project&.build_kubernetes_service
+      end
     end
   end
 end
diff --git a/app/models/project_services/kubernetes_service.rb b/app/models/project_services/kubernetes_service.rb
index bc62972dbb0..b82567ce2b3 100644
--- a/app/models/project_services/kubernetes_service.rb
+++ b/app/models/project_services/kubernetes_service.rb
@@ -1,3 +1,8 @@
+##
+# NOTE:
+# We'll move this class to Clusters::Platforms::Kubernetes, which contains exactly the same logic.
+# After we've migrated data, we'll remove KubernetesService. This would happen in a few months.
+# If you're modyfiyng this class, please note that you should update the same change in Clusters::Platforms::Kubernetes.
 class KubernetesService < DeploymentService
   include Gitlab::CurrentSettings
   include Gitlab::Kubernetes
-- 
cgit v1.2.1


From cff4a50e53bb079c47790f21b147ea271f2c73f2 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 21 Nov 2017 22:33:25 +0900
Subject: Fix tests for Clusters::Platforms::Kubernetes

---
 spec/models/clusters/platforms/kubernetes_spec.rb | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/spec/models/clusters/platforms/kubernetes_spec.rb b/spec/models/clusters/platforms/kubernetes_spec.rb
index 4ad6e214e2a..07bb2d637f9 100644
--- a/spec/models/clusters/platforms/kubernetes_spec.rb
+++ b/spec/models/clusters/platforms/kubernetes_spec.rb
@@ -161,16 +161,8 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
     end
   end
 
-  describe '.namespace_for_project' do
-    subject { described_class.namespace_for_project(project) }
-
-    let(:project) { create(:project) }
-
-    it { is_expected.to eq("#{project.path}-#{project.id}") }
-  end
-
   describe '#default_namespace' do
-    subject { kubernetes.default_namespace }
+    subject { kubernetes.send(:default_namespace) }
 
     let(:kubernetes) { create(:cluster_platform_kubernetes, :configured) }
 
@@ -190,7 +182,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
 
   describe '#predefined_variables' do
     let!(:cluster) { create(:cluster, :project, platform_kubernetes: kubernetes) }
-    let(:kubernetes) { create(:platform_kubernetes, api_url: api_url, ca_cert: ca_pem, token: token) }
+    let(:kubernetes) { create(:cluster_platform_kubernetes, api_url: api_url, ca_cert: ca_pem, token: token) }
     let(:api_url) { 'https://kube.domain.com' }
     let(:ca_pem) { 'CA PEM DATA' }
     let(:token) { 'token' }
@@ -248,7 +240,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
 
     let!(:cluster) { create(:cluster, :project, platform_kubernetes: service) }
     let(:project) { cluster.project }
-    let(:service) { create(:platform_kubernetes, :configured) }
+    let(:service) { create(:cluster_platform_kubernetes, :configured) }
     let(:environment) { build(:environment, project: project, name: "env", slug: "env-000000") }
 
     context 'with invalid pods' do
@@ -287,7 +279,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
     subject { service.calculate_reactive_cache }
 
     let!(:cluster) { create(:cluster, :project, enabled: enabled, platform_kubernetes: service) }
-    let(:service) { create(:platform_kubernetes, :configured) }
+    let(:service) { create(:cluster_platform_kubernetes, :configured) }
     let(:enabled) { true }
 
     context 'when cluster is disabled' do
-- 
cgit v1.2.1


From cff5eadd7cca3537db4566126714a376c8e21e9e Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 21 Nov 2017 22:52:05 +0900
Subject: Add deployment platform selector

---
 app/models/project.rb | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index e276bd2422d..1b201b13548 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -123,7 +123,7 @@ class Project < ActiveRecord::Base
   has_one :bugzilla_service
   has_one :gitlab_issue_tracker_service, inverse_of: :project
   has_one :external_wiki_service
-  has_one :kubernetes_service, inverse_of: :project
+  # has_one :kubernetes_service, inverse_of: :project
   has_one :prometheus_service, inverse_of: :project
   has_one :mock_ci_service
   has_one :mock_deployment_service
@@ -907,7 +907,17 @@ class Project < ActiveRecord::Base
   end
 
   def deployment_service
-    @deployment_service ||= deployment_services.reorder(nil).find_by(active: true)
+    deployment_platform
+  end
+
+  def kubernetes_service
+    deployment_platform
+  end
+
+  # TODO: This will be extended for multiple enviroment clusters
+  def deployment_platform
+    @deployment_platform ||= clusters.where(enabled: true).first&.platform_kubernetes
+    @deployment_platform ||= deployment_services.reorder(nil).find_by(active: true)
   end
 
   def monitoring_services
-- 
cgit v1.2.1


From 3cf53cc611930f875995883e3051015ed9bcb49b Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 21 Nov 2017 22:53:36 +0900
Subject: Fix comments

---
 app/models/project.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/project.rb b/app/models/project.rb
index 1b201b13548..512fe77261a 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -915,6 +915,7 @@ class Project < ActiveRecord::Base
   end
 
   # TODO: This will be extended for multiple enviroment clusters
+  # TODO: Add super nice tests to check this interchangeability
   def deployment_platform
     @deployment_platform ||= clusters.where(enabled: true).first&.platform_kubernetes
     @deployment_platform ||= deployment_services.reorder(nil).find_by(active: true)
-- 
cgit v1.2.1


From a8e2094c6591336405a90e4185e89752d38965bf Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 21 Nov 2017 23:29:33 +0900
Subject: Remove logic which glues with KubernetesService, from
 Platforms::Kubernetes

---
 app/models/clusters/cluster.rb              |  9 +----
 app/models/clusters/platforms/kubernetes.rb | 51 ++---------------------------
 2 files changed, 3 insertions(+), 57 deletions(-)

diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb
index 185d9473aab..6d7fb4b7dbf 100644
--- a/app/models/clusters/cluster.rb
+++ b/app/models/clusters/cluster.rb
@@ -17,8 +17,7 @@ module Clusters
     # we force autosave to happen when we save `Cluster` model
     has_one :provider_gcp, class_name: 'Clusters::Providers::Gcp', autosave: true
 
-    # We have to ":destroy" it today to ensure that we clean also the Kubernetes Integration
-    has_one :platform_kubernetes, class_name: 'Clusters::Platforms::Kubernetes', autosave: true, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
+    has_one :platform_kubernetes, class_name: 'Clusters::Platforms::Kubernetes'
 
     has_one :application_helm, class_name: 'Clusters::Applications::Helm'
     has_one :application_ingress, class_name: 'Clusters::Applications::Ingress'
@@ -29,15 +28,9 @@ module Clusters
     validates :name, cluster_name: true
     validate :restrict_modification, on: :update
 
-    # TODO: Move back this into Clusters::Platforms::Kubernetes in 10.3
-    # We need callback here because `enabled` belongs to Clusters::Cluster
-    # Callbacks in Clusters::Platforms::Kubernetes will not be called after update
-    after_save :update_kubernetes_integration!
-
     delegate :status, to: :provider, allow_nil: true
     delegate :status_reason, to: :provider, allow_nil: true
     delegate :on_creation?, to: :provider, allow_nil: true
-    delegate :update_kubernetes_integration!, to: :platform, allow_nil: true
 
     delegate :active?, to: :platform_kubernetes, prefix: true, allow_nil: true
     delegate :installed?, to: :application_helm, prefix: true, allow_nil: true
diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb
index 549b32ceef1..590d5da24cb 100644
--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -36,9 +36,6 @@ module Clusters
 
       after_save :clear_reactive_cache!
 
-      # TODO: Glue code till we migrate Kubernetes Integration into Platforms::Kubernetes
-      after_destroy :destroy_kubernetes_integration!
-
       alias_attribute :ca_pem, :ca_cert
 
       delegate :project, to: :cluster, allow_nil: true
@@ -85,33 +82,14 @@ module Clusters
       # Caches resources in the namespace so other calls don't need to block on
       # network access
       def calculate_reactive_cache
-        return unless active? && project && !project.pending_delete?
+        return unless enabled? && project && !project.pending_delete?
 
         # We may want to cache extra things in the future
         { pods: read_pods }
       end
 
       def kubeclient
-        @kubeclient ||= kubernetes_service.kubeclient if manages_kubernetes_service?
-      end
-
-      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,
-          namespace: namespace,
-          token: token,
-          ca_pem: ca_cert
-        )
-      end
-
-      def active?
-        manages_kubernetes_service?
+        @kubeclient ||= build_kubeclient!
       end
 
       private
@@ -192,31 +170,6 @@ module Clusters
       def enforce_namespace_to_lower_case
         self.namespace = self.namespace&.downcase
       end
-
-      def enforce_namespace_to_lower_case
-        self.namespace = self.namespace&.downcase
-      end
-
-      # TODO: glue code till we migrate Kubernetes Service into Platforms::Kubernetes class
-      def manages_kubernetes_service?
-        return true unless kubernetes_service&.active?
-
-        kubernetes_service.api_url == api_url
-      end
-
-      def destroy_kubernetes_integration!
-        return unless manages_kubernetes_service?
-
-        kubernetes_service&.destroy!
-      end
-
-      def kubernetes_service
-        @kubernetes_service ||= project&.kubernetes_service
-      end
-
-      def ensure_kubernetes_service
-        @kubernetes_service ||= kubernetes_service || project&.build_kubernetes_service
-      end
     end
   end
 end
-- 
cgit v1.2.1


From 45f2d0af4173ae8e06b548c4bef1fabe14353c85 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Wed, 22 Nov 2017 18:31:07 +0900
Subject: Add test suit for platform::kubernetes

---
 app/models/project.rb                              |  14 +--
 .../projects/branches_controller_spec.rb           |  18 ++++
 spec/features/auto_deploy_spec.rb                  | 113 +++++++++++++++------
 .../projects/environments/environment_spec.rb      |  51 ++++++----
 .../projects/environments/environments_spec.rb     |  33 ++++--
 spec/lib/gitlab/ci/build/policy/kubernetes_spec.rb |  21 +++-
 spec/models/project_spec.rb                        |  23 ++++-
 .../additional_metrics_shared_examples.rb          |  28 +++--
 8 files changed, 219 insertions(+), 82 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 512fe77261a..a7f90bc7fc3 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -914,13 +914,6 @@ class Project < ActiveRecord::Base
     deployment_platform
   end
 
-  # TODO: This will be extended for multiple enviroment clusters
-  # TODO: Add super nice tests to check this interchangeability
-  def deployment_platform
-    @deployment_platform ||= clusters.where(enabled: true).first&.platform_kubernetes
-    @deployment_platform ||= deployment_services.reorder(nil).find_by(active: true)
-  end
-
   def monitoring_services
     services.where(category: :monitoring)
   end
@@ -1858,4 +1851,11 @@ class Project < ActiveRecord::Base
 
     raise ex
   end
+
+  # TODO: This will be extended for multiple enviroment clusters
+  # TODO: Add super nice tests to check this interchangeability
+  def deployment_platform
+    @deployment_platform ||= clusters.where(enabled: true).first&.platform_kubernetes
+    @deployment_platform ||= deployment_services.reorder(nil).find_by(active: true)
+  end
 end
diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb
index 973d6fed288..019ffc44c07 100644
--- a/spec/controllers/projects/branches_controller_spec.rb
+++ b/spec/controllers/projects/branches_controller_spec.rb
@@ -130,6 +130,24 @@ describe Projects::BranchesController do
           expect(response.location).to include(project_new_blob_path(project, branch))
           expect(response).to have_gitlab_http_status(302)
         end
+
+        it 'redirects to autodeploy setup page' do
+          result = { status: :success, branch: double(name: branch) }
+
+          create(:cluster, :provided_by_gcp, projects: [project])
+
+          expect_any_instance_of(CreateBranchService).to receive(:execute).and_return(result)
+          expect(SystemNoteService).to receive(:new_issue_branch).and_return(true)
+
+          post :create,
+            namespace_id: project.namespace.to_param,
+            project_id: project.to_param,
+            branch_name: branch,
+            issue_iid: issue.iid
+
+          expect(response.location).to include(project_new_blob_path(project, branch))
+          expect(response).to have_gitlab_http_status(302)
+        end
       end
 
       context 'without issue feature access' do
diff --git a/spec/features/auto_deploy_spec.rb b/spec/features/auto_deploy_spec.rb
index 4a7c3e4f1ab..327059b86e4 100644
--- a/spec/features/auto_deploy_spec.rb
+++ b/spec/features/auto_deploy_spec.rb
@@ -4,52 +4,105 @@ describe 'Auto deploy' do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
 
-  before do
-    create :kubernetes_service, project: project
-    project.team << [user, :master]
-    sign_in user
-  end
-
-  context 'when no deployment service is active' do
+  context 'when user configured kubernetes from Integration > Kubernetes' do
     before do
-      project.kubernetes_service.update!(active: false)
+      create :kubernetes_service, project: project
+      project.team << [user, :master]
+      sign_in user
+    end
+
+    context 'when no deployment service is active' do
+      before do
+        project.kubernetes_service.update!(active: false)
+      end
+
+      it 'does not show a button to set up auto deploy' do
+        visit project_path(project)
+        expect(page).to have_no_content('Set up auto deploy')
+      end
     end
 
-    it 'does not show a button to set up auto deploy' do
-      visit project_path(project)
-      expect(page).to have_no_content('Set up auto deploy')
+    context 'when a deployment service is active' do
+      before do
+        project.kubernetes_service.update!(active: true)
+        visit project_path(project)
+      end
+
+      it 'shows a button to set up auto deploy' do
+        expect(page).to have_link('Set up auto deploy')
+      end
+
+      it 'includes OpenShift as an available template', :js do
+        click_link 'Set up auto deploy'
+        click_button 'Apply a GitLab CI Yaml template'
+
+        within '.gitlab-ci-yml-selector' do
+          expect(page).to have_content('OpenShift')
+        end
+      end
+
+      it 'creates a merge request using "auto-deploy" branch', :js do
+        click_link 'Set up auto deploy'
+        click_button 'Apply a GitLab CI Yaml template'
+        within '.gitlab-ci-yml-selector' do
+          click_on 'OpenShift'
+        end
+        wait_for_requests
+        click_button 'Commit changes'
+
+        expect(page).to have_content('New Merge Request From auto-deploy into master')
+      end
     end
   end
 
-  context 'when a deployment service is active' do
+  context 'when user configured kubernetes from CI/CD > Clusters' do
     before do
-      project.kubernetes_service.update!(active: true)
-      visit project_path(project)
+      create(:cluster, :provided_by_gcp, projects: [project])
+      project.team << [user, :master]
+      sign_in user
     end
 
-    it 'shows a button to set up auto deploy' do
-      expect(page).to have_link('Set up auto deploy')
+    context 'when no deployment service is active' do
+      before do
+        project.kubernetes_service.update!(active: false)
+      end
+
+      it 'does not show a button to set up auto deploy' do
+        visit project_path(project)
+        expect(page).to have_no_content('Set up auto deploy')
+      end
     end
 
-    it 'includes OpenShift as an available template', :js do
-      click_link 'Set up auto deploy'
-      click_button 'Apply a GitLab CI Yaml template'
+    context 'when a deployment service is active' do
+      before do
+        project.kubernetes_service.update!(active: true)
+        visit project_path(project)
+      end
 
-      within '.gitlab-ci-yml-selector' do
-        expect(page).to have_content('OpenShift')
+      it 'shows a button to set up auto deploy' do
+        expect(page).to have_link('Set up auto deploy')
       end
-    end
 
-    it 'creates a merge request using "auto-deploy" branch', :js do
-      click_link 'Set up auto deploy'
-      click_button 'Apply a GitLab CI Yaml template'
-      within '.gitlab-ci-yml-selector' do
-        click_on 'OpenShift'
+      it 'includes OpenShift as an available template', :js do
+        click_link 'Set up auto deploy'
+        click_button 'Apply a GitLab CI Yaml template'
+
+        within '.gitlab-ci-yml-selector' do
+          expect(page).to have_content('OpenShift')
+        end
       end
-      wait_for_requests
-      click_button 'Commit changes'
 
-      expect(page).to have_content('New Merge Request From auto-deploy into master')
+      it 'creates a merge request using "auto-deploy" branch', :js do
+        click_link 'Set up auto deploy'
+        click_button 'Apply a GitLab CI Yaml template'
+        within '.gitlab-ci-yml-selector' do
+          click_on 'OpenShift'
+        end
+        wait_for_requests
+        click_button 'Commit changes'
+
+        expect(page).to have_content('New Merge Request From auto-deploy into master')
+      end
     end
   end
 end
diff --git a/spec/features/projects/environments/environment_spec.rb b/spec/features/projects/environments/environment_spec.rb
index 5fc3ba54f65..3d64b404a84 100644
--- a/spec/features/projects/environments/environment_spec.rb
+++ b/spec/features/projects/environments/environment_spec.rb
@@ -101,35 +101,48 @@ feature 'Environment' do
           end
 
           context 'with terminal' do
-            let(:project) { create(:kubernetes_project, :test_repo) }
+            shared_examples 'correct behavior with terminal' do
+              context 'for project master' do
+                let(:role) { :master }
 
-            context 'for project master' do
-              let(:role) { :master }
+                scenario 'it shows the terminal button' do
+                  expect(page).to have_terminal_button
+                end
 
-              scenario 'it shows the terminal button' do
-                expect(page).to have_terminal_button
+                context 'web terminal', :js do
+                  before do
+                    # Stub #terminals as it causes js-enabled feature specs to render the page incorrectly
+                    allow_any_instance_of(Environment).to receive(:terminals) { nil }
+                    visit terminal_project_environment_path(project, environment)
+                  end
+
+                  it 'displays a web terminal' do
+                    expect(page).to have_selector('#terminal')
+                    expect(page).to have_link(nil, href: environment.external_url)
+                  end
+                end
               end
 
-              context 'web terminal', :js do
-                before do
-                  # Stub #terminals as it causes js-enabled feature specs to render the page incorrectly
-                  allow_any_instance_of(Environment).to receive(:terminals) { nil }
-                  visit terminal_project_environment_path(project, environment)
-                end
+              context 'for developer' do
+                let(:role) { :developer }
 
-                it 'displays a web terminal' do
-                  expect(page).to have_selector('#terminal')
-                  expect(page).to have_link(nil, href: environment.external_url)
+                scenario 'does not show terminal button' do
+                  expect(page).not_to have_terminal_button
                 end
               end
             end
 
-            context 'for developer' do
-              let(:role) { :developer }
+            context 'when user configured kubernetes from Integration > Kubernetes' do
+              let(:project) { create(:kubernetes_project, :test_repo) }
 
-              scenario 'does not show terminal button' do
-                expect(page).not_to have_terminal_button
-              end
+              it_behaves_like 'correct behavior with terminal'
+            end
+
+            context 'when user configured kubernetes from CI/CD > Clusters' do
+              let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
+              let(:project) { cluster.project }
+
+              it_behaves_like 'correct behavior with terminal'
             end
           end
 
diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb
index 879ee6f4b9b..1732d7f2a9f 100644
--- a/spec/features/projects/environments/environments_spec.rb
+++ b/spec/features/projects/environments/environments_spec.rb
@@ -208,22 +208,35 @@ feature 'Environments page', :js do
         end
 
         context 'when kubernetes terminal is available' do
-          let(:project) { create(:kubernetes_project, :test_repo) }
+          shared_examples 'correct behavior with terminal' do
+            context 'for project master' do
+              let(:role) { :master }
 
-          context 'for project master' do
-            let(:role) { :master }
+              it 'shows the terminal button' do
+                expect(page).to have_terminal_button
+              end
+            end
+
+            context 'when user is a developer' do
+              let(:role) { :developer }
 
-            it 'shows the terminal button' do
-              expect(page).to have_terminal_button
+              it 'does not show terminal button' do
+                expect(page).not_to have_terminal_button
+              end
             end
           end
+          
+          context 'when user configured kubernetes from Integration > Kubernetes' do
+            let(:project) { create(:kubernetes_project, :test_repo) }
 
-          context 'when user is a developer' do
-            let(:role) { :developer }
+            it_behaves_like 'correct behavior with terminal'
+          end
 
-            it 'does not show terminal button' do
-              expect(page).not_to have_terminal_button
-            end
+          context 'when user configured kubernetes from CI/CD > Clusters' do
+            let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
+            let(:project) { cluster.project }
+
+            it_behaves_like 'correct behavior with terminal'
           end
         end
       end
diff --git a/spec/lib/gitlab/ci/build/policy/kubernetes_spec.rb b/spec/lib/gitlab/ci/build/policy/kubernetes_spec.rb
index 15eb01eb472..3c143f5305b 100644
--- a/spec/lib/gitlab/ci/build/policy/kubernetes_spec.rb
+++ b/spec/lib/gitlab/ci/build/policy/kubernetes_spec.rb
@@ -4,11 +4,24 @@ describe Gitlab::Ci::Build::Policy::Kubernetes do
   let(:pipeline) { create(:ci_pipeline, project: project) }
 
   context 'when kubernetes service is active' do
-    set(:project) { create(:kubernetes_project) }
+    shared_examples 'correct behavior for satisfied_by?' do
+      it 'is satisfied by a kubernetes pipeline' do
+        expect(described_class.new('active'))
+          .to be_satisfied_by(pipeline)
+      end
+    end
 
-    it 'is satisfied by a kubernetes pipeline' do
-      expect(described_class.new('active'))
-        .to be_satisfied_by(pipeline)
+    context 'when user configured kubernetes from Integration > Kubernetes' do
+      let(:project) { create(:kubernetes_project) }
+
+      it_behaves_like 'correct behavior for satisfied_by?'
+    end
+
+    context 'when user configured kubernetes from CI/CD > Clusters' do
+      let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
+      let(:project) { cluster.project }
+
+      it_behaves_like 'correct behavior for satisfied_by?'
     end
   end
 
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 549c97a9afd..78f2a4df36f 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -2002,12 +2002,25 @@ describe Project do
     end
 
     context 'when project has a deployment service' do
-      let(:project) { create(:kubernetes_project) }
+      shared_examples 'correct behavior with variables' do
+        it 'returns variables from this service' do
+          expect(project.deployment_variables).to include(
+            { key: 'KUBE_TOKEN', value: project.kubernetes_service.token, public: false }
+          )
+        end
+      end
+
+      context 'when user configured kubernetes from Integration > Kubernetes' do
+        let(:project) { create(:kubernetes_project) }
+
+        it_behaves_like 'correct behavior with variables'
+      end
+
+      context 'when user configured kubernetes from CI/CD > Clusters' do
+        let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
+        let(:project) { cluster.project }
 
-      it 'returns variables from this service' do
-        expect(project.deployment_variables).to include(
-          { key: 'KUBE_TOKEN', value: project.kubernetes_service.token, public: false }
-        )
+        it_behaves_like 'correct behavior with variables'
       end
     end
   end
diff --git a/spec/support/prometheus/additional_metrics_shared_examples.rb b/spec/support/prometheus/additional_metrics_shared_examples.rb
index 620fa37d455..7e20b4e0232 100644
--- a/spec/support/prometheus/additional_metrics_shared_examples.rb
+++ b/spec/support/prometheus/additional_metrics_shared_examples.rb
@@ -41,16 +41,30 @@ RSpec.shared_examples 'additional metrics query' do
     end
 
     describe 'project has Kubernetes service' do
-      let(:project) { create(:kubernetes_project) }
-      let(:environment) { create(:environment, slug: 'environment-slug', project: project) }
-      let(:kube_namespace) { project.kubernetes_service.actual_namespace }
+      shared_examples 'correct behavior with metrics' do
+        let(:environment) { create(:environment, slug: 'environment-slug', project: project) }
+        let(:kube_namespace) { project.kubernetes_service.actual_namespace }
 
-      it_behaves_like 'query context containing environment slug and filter'
+        it_behaves_like 'query context containing environment slug and filter'
 
-      it 'query context contains kube_namespace' do
-        expect(subject).to receive(:query_metrics).with(hash_including(kube_namespace: kube_namespace))
+        it 'query context contains kube_namespace' do
+          expect(subject).to receive(:query_metrics).with(hash_including(kube_namespace: kube_namespace))
 
-        subject.query(*query_params)
+          subject.query(*query_params)
+        end
+      end
+
+      context 'when user configured kubernetes from Integration > Kubernetes' do
+        let(:project) { create(:kubernetes_project) }
+
+        it_behaves_like 'correct behavior with metrics'
+      end
+
+      context 'when user configured kubernetes from CI/CD > Clusters' do
+        let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
+        let(:project) { cluster.project }
+
+        it_behaves_like 'correct behavior with metrics'
       end
     end
 
-- 
cgit v1.2.1


From 5324383dba07d60407a5b947f27695867ad45843 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Wed, 22 Nov 2017 23:21:02 +0900
Subject: Add test for checking interchangeability between KubernetesService
 and Clusters::Platform::Kubernetes

---
 .../projects/clusters/interchangeability_spec.rb   | 45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 spec/features/projects/clusters/interchangeability_spec.rb

diff --git a/spec/features/projects/clusters/interchangeability_spec.rb b/spec/features/projects/clusters/interchangeability_spec.rb
new file mode 100644
index 00000000000..b454839e8e2
--- /dev/null
+++ b/spec/features/projects/clusters/interchangeability_spec.rb
@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+feature 'Interchangeability between KubernetesService and Platform::Kubernetes' do
+  let!(:project) { create(:project, :repository) }
+
+  EXCEPT_METHODS = %i[test title description help fields initialize_properties namespace namespace= api_url api_url=]
+  EXCEPT_METHODS_GREP_V = %w[_touched? _changed? _was]
+
+  it 'Clusters::Platform::Kubernetes covers core interfaces in KubernetesService' do
+    expected_interfaces = KubernetesService.instance_methods(false)
+    expected_interfaces = expected_interfaces - EXCEPT_METHODS
+    EXCEPT_METHODS_GREP_V.each do |g|
+      expected_interfaces = expected_interfaces.grep_v(/#{Regexp.escape(g)}\z/)
+    end
+    
+    expect(expected_interfaces - Clusters::Platforms::Kubernetes.instance_methods).to be_empty
+  end
+
+  shared_examples 'selects kubernetes instance' do
+    context 'when user configured kubernetes from Integration > Kubernetes' do
+      let!(:kubernetes_service) { create(:kubernetes_service, project: project) }
+
+      it { is_expected.to eq(kubernetes_service) }
+    end
+
+    context 'when user configured kubernetes from CI/CD > Clusters' do
+      let!(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
+      let(:platform_kubernetes) { cluster.platform_kubernetes }
+
+      it { is_expected.to eq(platform_kubernetes) }
+    end
+  end
+
+  describe 'Project#deployment_service' do
+    subject { project.deployment_service }
+
+    it_behaves_like 'selects kubernetes instance'
+  end
+
+  describe 'Project#kubernetes_service' do
+    subject { project.kubernetes_service }
+
+    it_behaves_like 'selects kubernetes instance'
+  end
+end
-- 
cgit v1.2.1


From 1d7e3ef1a55991e057213add556926eb13e0bd48 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Mon, 27 Nov 2017 21:48:54 +0900
Subject: Duplicate spec for Platform::Kubernetes with kubernetes_project

---
 .../projects/branches_controller_spec.rb           | 52 ++++++++++++----------
 spec/lib/gitlab/ci/yaml_processor_spec.rb          | 28 +++++++++---
 spec/models/ci/pipeline_spec.rb                    | 19 ++++++--
 spec/models/environment_spec.rb                    | 25 ++++++++---
 spec/workers/reactive_caching_worker_spec.rb       | 22 +++++++--
 5 files changed, 102 insertions(+), 44 deletions(-)

diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb
index 019ffc44c07..83974b2c876 100644
--- a/spec/controllers/projects/branches_controller_spec.rb
+++ b/spec/controllers/projects/branches_controller_spec.rb
@@ -113,40 +113,44 @@ describe Projects::BranchesController do
           expect(response).to redirect_to project_tree_path(project, branch)
         end
 
-        it 'redirects to autodeploy setup page' do
-          result = { status: :success, branch: double(name: branch) }
+        context 'when user configured kubernetes from Integration > Kubernetes' do
+          it 'redirects to autodeploy setup page' do
+            result = { status: :success, branch: double(name: branch) }
 
-          project.services << build(:kubernetes_service)
+            project.services << build(:kubernetes_service)
 
-          expect_any_instance_of(CreateBranchService).to receive(:execute).and_return(result)
-          expect(SystemNoteService).to receive(:new_issue_branch).and_return(true)
+            expect_any_instance_of(CreateBranchService).to receive(:execute).and_return(result)
+            expect(SystemNoteService).to receive(:new_issue_branch).and_return(true)
 
-          post :create,
-            namespace_id: project.namespace.to_param,
-            project_id: project.to_param,
-            branch_name: branch,
-            issue_iid: issue.iid
+            post :create,
+              namespace_id: project.namespace.to_param,
+              project_id: project.to_param,
+              branch_name: branch,
+              issue_iid: issue.iid
 
-          expect(response.location).to include(project_new_blob_path(project, branch))
-          expect(response).to have_gitlab_http_status(302)
+            expect(response.location).to include(project_new_blob_path(project, branch))
+            expect(response).to have_gitlab_http_status(302)
+          end
         end
 
-        it 'redirects to autodeploy setup page' do
-          result = { status: :success, branch: double(name: branch) }
+        context 'when user configured kubernetes from CI/CD > Clusters' do
+          it 'redirects to autodeploy setup page' do
+            result = { status: :success, branch: double(name: branch) }
 
-          create(:cluster, :provided_by_gcp, projects: [project])
+            create(:cluster, :provided_by_gcp, projects: [project])
 
-          expect_any_instance_of(CreateBranchService).to receive(:execute).and_return(result)
-          expect(SystemNoteService).to receive(:new_issue_branch).and_return(true)
+            expect_any_instance_of(CreateBranchService).to receive(:execute).and_return(result)
+            expect(SystemNoteService).to receive(:new_issue_branch).and_return(true)
 
-          post :create,
-            namespace_id: project.namespace.to_param,
-            project_id: project.to_param,
-            branch_name: branch,
-            issue_iid: issue.iid
+            post :create,
+              namespace_id: project.namespace.to_param,
+              project_id: project.to_param,
+              branch_name: branch,
+              issue_iid: issue.iid
 
-          expect(response.location).to include(project_new_blob_path(project, branch))
-          expect(response).to have_gitlab_http_status(302)
+            expect(response.location).to include(project_new_blob_path(project, branch))
+            expect(response).to have_gitlab_http_status(302)
+          end
         end
       end
 
diff --git a/spec/lib/gitlab/ci/yaml_processor_spec.rb b/spec/lib/gitlab/ci/yaml_processor_spec.rb
index d72f8553f55..4f44f35205e 100644
--- a/spec/lib/gitlab/ci/yaml_processor_spec.rb
+++ b/spec/lib/gitlab/ci/yaml_processor_spec.rb
@@ -178,15 +178,29 @@ module Gitlab
           end
 
           context 'when kubernetes is active' do
-            let(:project) { create(:kubernetes_project) }
-            let(:pipeline) { create(:ci_empty_pipeline, project: project) }
+            shared_examples 'correct behavior for kubernetes policy' do
+              it 'returns seeds for kubernetes dependent job' do
+                seeds = subject.stage_seeds(pipeline)
 
-            it 'returns seeds for kubernetes dependent job' do
-              seeds = subject.stage_seeds(pipeline)
+                expect(seeds.size).to eq 2
+                expect(seeds.first.builds.dig(0, :name)).to eq 'spinach'
+                expect(seeds.second.builds.dig(0, :name)).to eq 'production'
+              end
+            end
 
-              expect(seeds.size).to eq 2
-              expect(seeds.first.builds.dig(0, :name)).to eq 'spinach'
-              expect(seeds.second.builds.dig(0, :name)).to eq 'production'
+            context 'when user configured kubernetes from Integration > Kubernetes' do
+              let(:project) { create(:kubernetes_project) }
+              let(:pipeline) { create(:ci_empty_pipeline, project: project) }
+
+              it_behaves_like 'correct behavior for kubernetes policy'
+            end
+
+            context 'when user configured kubernetes from CI/CD > Clusters' do
+              let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
+              let(:project) { cluster.project }
+              let(:pipeline) { create(:ci_empty_pipeline, project: project) }
+
+              it_behaves_like 'correct behavior for kubernetes policy'
             end
           end
 
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 3a19a0753e2..c53942ed61c 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -557,10 +557,23 @@ describe Ci::Pipeline, :mailer do
 
   describe '#has_kubernetes_active?' do
     context 'when kubernetes is active' do
-      let(:project) { create(:kubernetes_project) }
+      shared_examples 'correct behavior with has_kubernetes_active?' do
+        it 'returns true' do
+          expect(pipeline).to have_kubernetes_active
+        end
+      end
 
-      it 'returns true' do
-        expect(pipeline).to have_kubernetes_active
+      context 'when user configured kubernetes from Integration > Kubernetes' do
+        let(:project) { create(:kubernetes_project) }
+
+        it_behaves_like 'correct behavior with has_kubernetes_active?'
+      end
+
+      context 'when user configured kubernetes from CI/CD > Clusters' do
+        let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
+        let(:project) { cluster.project }
+
+        it_behaves_like 'correct behavior with has_kubernetes_active?'
       end
     end
 
diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb
index 1ce1d595c60..de030844a28 100644
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
@@ -327,15 +327,28 @@ describe Environment do
 
     context 'when the enviroment is available' do
       context 'with a deployment service' do
-        let(:project) { create(:kubernetes_project) }
+        shared_examples 'correct behavior for has_terminals?' do
+          context 'and a deployment' do
+            let!(:deployment) { create(:deployment, environment: environment) }
+            it { is_expected.to be_truthy }
+          end
 
-        context 'and a deployment' do
-          let!(:deployment) { create(:deployment, environment: environment) }
-          it { is_expected.to be_truthy }
+          context 'but no deployments' do
+            it { is_expected.to be_falsy }
+          end
         end
 
-        context 'but no deployments' do
-          it { is_expected.to be_falsy }
+        context 'when user configured kubernetes from Integration > Kubernetes' do
+          let(:project) { create(:kubernetes_project) }
+
+          it_behaves_like 'correct behavior for has_terminals?'
+        end
+
+        context 'when user configured kubernetes from CI/CD > Clusters' do
+          let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
+          let(:project) { cluster.project }
+
+          it_behaves_like 'correct behavior for has_terminals?'
         end
       end
 
diff --git a/spec/workers/reactive_caching_worker_spec.rb b/spec/workers/reactive_caching_worker_spec.rb
index 5f4453c15d6..98282af2d18 100644
--- a/spec/workers/reactive_caching_worker_spec.rb
+++ b/spec/workers/reactive_caching_worker_spec.rb
@@ -1,15 +1,29 @@
 require 'spec_helper'
 
 describe ReactiveCachingWorker do
-  let(:project) { create(:kubernetes_project) }
   let(:service) { project.deployment_service }
   subject { described_class.new.perform("KubernetesService", service.id) }
 
   describe '#perform' do
-    it 'calls #exclusively_update_reactive_cache!' do
-      expect_any_instance_of(KubernetesService).to receive(:exclusively_update_reactive_cache!)
+    shared_examples 'correct behavior with perform' do
+      it 'calls #exclusively_update_reactive_cache!' do
+        expect_any_instance_of(KubernetesService).to receive(:exclusively_update_reactive_cache!)
 
-      subject
+        subject
+      end
+    end
+
+    context 'when user configured kubernetes from Integration > Kubernetes' do
+      let(:project) { create(:kubernetes_project) }
+
+      it_behaves_like 'correct behavior with perform'
+    end
+
+    context 'when user configured kubernetes from CI/CD > Clusters' do
+      let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
+      let(:project) { cluster.project }
+
+      it_behaves_like 'correct behavior with perform'
     end
   end
 end
-- 
cgit v1.2.1


From 53da3d976f3705a87edc50dca41748b5e479fc83 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Mon, 27 Nov 2017 22:35:16 +0900
Subject: Replce kubernetes_service and deployment_service to
 deployment_platform

---
 app/controllers/projects/branches_controller.rb    |  2 +-
 app/helpers/auto_devops_helper.rb                  |  2 +-
 app/models/ci/pipeline.rb                          |  2 +-
 app/models/environment.rb                          |  4 +-
 app/models/project.rb                              | 28 ++-----
 app/views/projects/clusters/new.html.haml          |  2 +-
 app/views/projects/edit.html.haml                  |  2 +-
 app/views/projects/show.html.haml                  |  2 +-
 .../prometheus/queries/query_additional_metrics.rb |  2 +-
 .../projects/branches_controller_spec.rb           | 30 +++----
 spec/features/auto_deploy_spec.rb                  | 59 +++-----------
 .../projects/clusters/interchangeability_spec.rb   | 29 -------
 spec/models/clusters/platforms/kubernetes_spec.rb  | 92 +++++++++++-----------
 spec/models/environment_spec.rb                    | 26 ++++--
 .../project_services/kubernetes_service_spec.rb    |  2 +-
 spec/models/project_spec.rb                        | 25 +++++-
 .../additional_metrics_shared_examples.rb          |  2 +-
 spec/workers/reactive_caching_worker_spec.rb       |  2 +-
 18 files changed, 130 insertions(+), 183 deletions(-)

diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index f28df83d5a5..56df9991fda 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -41,7 +41,7 @@ class Projects::BranchesController < Projects::ApplicationController
     branch_name = sanitize(strip_tags(params[:branch_name]))
     branch_name = Addressable::URI.unescape(branch_name)
 
-    redirect_to_autodeploy = project.empty_repo? && project.deployment_services.present?
+    redirect_to_autodeploy = project.empty_repo? && project.deployment_platform.present?
 
     result = CreateBranchService.new(project, current_user)
         .execute(branch_name, ref)
diff --git a/app/helpers/auto_devops_helper.rb b/app/helpers/auto_devops_helper.rb
index 483b957decb..f4310ca2f06 100644
--- a/app/helpers/auto_devops_helper.rb
+++ b/app/helpers/auto_devops_helper.rb
@@ -10,7 +10,7 @@ module AutoDevopsHelper
 
   def auto_devops_warning_message(project)
     missing_domain = !project.auto_devops&.has_domain?
-    missing_service = !project.kubernetes_service&.active?
+    missing_service = !project.deployment_platform&.active?
 
     if missing_service
       params = {
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index ebbefc51a4f..fd64670f6b0 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -365,7 +365,7 @@ module Ci
     end
 
     def has_kubernetes_active?
-      project.kubernetes_service&.active?
+      project.deployment_platform&.active?
     end
 
     def has_stage_seeds?
diff --git a/app/models/environment.rb b/app/models/environment.rb
index 21a028e351c..bf69b4c50f0 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -138,11 +138,11 @@ class Environment < ActiveRecord::Base
   end
 
   def has_terminals?
-    project.deployment_service.present? && available? && last_deployment.present?
+    project.deployment_platform.present? && available? && last_deployment.present?
   end
 
   def terminals
-    project.deployment_service.terminals(self) if has_terminals?
+    project.deployment_platform.terminals(self) if has_terminals?
   end
 
   def has_metrics?
diff --git a/app/models/project.rb b/app/models/project.rb
index a7f90bc7fc3..49c56e76dfc 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -123,7 +123,7 @@ class Project < ActiveRecord::Base
   has_one :bugzilla_service
   has_one :gitlab_issue_tracker_service, inverse_of: :project
   has_one :external_wiki_service
-  # has_one :kubernetes_service, inverse_of: :project
+  has_one :kubernetes_service, inverse_of: :project
   has_one :prometheus_service, inverse_of: :project
   has_one :mock_ci_service
   has_one :mock_deployment_service
@@ -902,16 +902,11 @@ class Project < ActiveRecord::Base
     @ci_service ||= ci_services.reorder(nil).find_by(active: true)
   end
 
-  def deployment_services
-    services.where(category: :deployment)
-  end
-
-  def deployment_service
-    deployment_platform
-  end
-
-  def kubernetes_service
-    deployment_platform
+  # TODO: This will be extended for multiple enviroment clusters
+  # TODO: Add super nice tests to check this interchangeability
+  def deployment_platform
+    @deployment_platform ||= clusters.where(enabled: true).first&.platform_kubernetes
+    @deployment_platform ||= services.where(category: :deployment).reorder(nil).find_by(active: true)
   end
 
   def monitoring_services
@@ -1556,9 +1551,9 @@ class Project < ActiveRecord::Base
   end
 
   def deployment_variables
-    return [] unless deployment_service
+    return [] unless deployment_platform
 
-    deployment_service.predefined_variables
+    deployment_platform.predefined_variables
   end
 
   def auto_devops_variables
@@ -1851,11 +1846,4 @@ class Project < ActiveRecord::Base
 
     raise ex
   end
-
-  # TODO: This will be extended for multiple enviroment clusters
-  # TODO: Add super nice tests to check this interchangeability
-  def deployment_platform
-    @deployment_platform ||= clusters.where(enabled: true).first&.platform_kubernetes
-    @deployment_platform ||= deployment_services.reorder(nil).find_by(active: true)
-  end
 end
diff --git a/app/views/projects/clusters/new.html.haml b/app/views/projects/clusters/new.html.haml
index 6b321f60212..665120c7e49 100644
--- a/app/views/projects/clusters/new.html.haml
+++ b/app/views/projects/clusters/new.html.haml
@@ -5,7 +5,7 @@
   .col-sm-4
     = render 'sidebar'
   .col-sm-8
-    - if @project.kubernetes_service&.active?
+    - if @project.deployment_platform&.active?
       %h4.prepend-top-0= s_('ClusterIntegration|Cluster management')
 
       %p= s_('ClusterIntegration|A cluster has been set up on this project through the Kubernetes integration page')
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 5ebeae5c35f..52be8330813 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -147,7 +147,7 @@
             %ul
               %li Be careful. Renaming a project's repository can have unintended side effects.
               %li You will need to update your local repositories to point to the new location.
-              - if @project.deployment_services.any?
+              - if @project.deployment_platform.any?
                 %li Your deployment services will be broken, you will need to manually fix the services after renaming.
           = f.submit 'Rename project', class: "btn btn-warning"
       - if can?(current_user, :change_namespace, @project)
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 705a4607ad2..7a68aa16aa4 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -67,7 +67,7 @@
         - if koding_enabled? && @repository.koding_yml.blank?
           %li.missing
             = link_to  _('Set up Koding'), add_koding_stack_path(@project)
-        - if @repository.gitlab_ci_yml.blank? && @project.deployment_service.present?
+        - if @repository.gitlab_ci_yml.blank? && @project.deployment_platform.present?
           %li.missing
             = link_to add_special_file_path(@project, file_name: '.gitlab-ci.yml', commit_message: 'Set up auto deploy', branch_name: 'auto-deploy', context: 'autodeploy') do
               #{ _('Set up auto deploy') }
diff --git a/lib/gitlab/prometheus/queries/query_additional_metrics.rb b/lib/gitlab/prometheus/queries/query_additional_metrics.rb
index 7ac6162b54d..5cddc96a643 100644
--- a/lib/gitlab/prometheus/queries/query_additional_metrics.rb
+++ b/lib/gitlab/prometheus/queries/query_additional_metrics.rb
@@ -76,7 +76,7 @@ module Gitlab
             timeframe_start: timeframe_start,
             timeframe_end: timeframe_end,
             ci_environment_slug: environment.slug,
-            kube_namespace: environment.project.kubernetes_service&.actual_namespace || '',
+            kube_namespace: environment.project.deployment_platform&.actual_namespace || '',
             environment_filter: %{container_name!="POD",environment="#{environment.slug}"}
           }
         end
diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb
index 83974b2c876..91f8210964e 100644
--- a/spec/controllers/projects/branches_controller_spec.rb
+++ b/spec/controllers/projects/branches_controller_spec.rb
@@ -113,12 +113,10 @@ describe Projects::BranchesController do
           expect(response).to redirect_to project_tree_path(project, branch)
         end
 
-        context 'when user configured kubernetes from Integration > Kubernetes' do
+        shared_examples 'correct behavior on KubernetesService and Platform::Kubernetes' do
           it 'redirects to autodeploy setup page' do
             result = { status: :success, branch: double(name: branch) }
 
-            project.services << build(:kubernetes_service)
-
             expect_any_instance_of(CreateBranchService).to receive(:execute).and_return(result)
             expect(SystemNoteService).to receive(:new_issue_branch).and_return(true)
 
@@ -133,24 +131,20 @@ describe Projects::BranchesController do
           end
         end
 
-        context 'when user configured kubernetes from CI/CD > Clusters' do
-          it 'redirects to autodeploy setup page' do
-            result = { status: :success, branch: double(name: branch) }
-
-            create(:cluster, :provided_by_gcp, projects: [project])
-
-            expect_any_instance_of(CreateBranchService).to receive(:execute).and_return(result)
-            expect(SystemNoteService).to receive(:new_issue_branch).and_return(true)
+        context 'when user configured kubernetes from Integration > Kubernetes' do
+          before do
+            project.services << build(:kubernetes_service)
+          end
 
-            post :create,
-              namespace_id: project.namespace.to_param,
-              project_id: project.to_param,
-              branch_name: branch,
-              issue_iid: issue.iid
+          it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes'
+        end
 
-            expect(response.location).to include(project_new_blob_path(project, branch))
-            expect(response).to have_gitlab_http_status(302)
+        context 'when user configured kubernetes from CI/CD > Clusters' do
+          before do
+            create(:cluster, :provided_by_gcp, projects: [project])
           end
+
+          it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes'
         end
       end
 
diff --git a/spec/features/auto_deploy_spec.rb b/spec/features/auto_deploy_spec.rb
index 327059b86e4..240c5711a7b 100644
--- a/spec/features/auto_deploy_spec.rb
+++ b/spec/features/auto_deploy_spec.rb
@@ -4,13 +4,7 @@ describe 'Auto deploy' do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
 
-  context 'when user configured kubernetes from Integration > Kubernetes' do
-    before do
-      create :kubernetes_service, project: project
-      project.team << [user, :master]
-      sign_in user
-    end
-
+  shared_examples 'correct behavior on KubernetesService and Platform::Kubernetes' do
     context 'when no deployment service is active' do
       before do
         project.kubernetes_service.update!(active: false)
@@ -55,54 +49,23 @@ describe 'Auto deploy' do
     end
   end
 
-  context 'when user configured kubernetes from CI/CD > Clusters' do
+  context 'when user configured kubernetes from Integration > Kubernetes' do
     before do
-      create(:cluster, :provided_by_gcp, projects: [project])
+      create :kubernetes_service, project: project
       project.team << [user, :master]
       sign_in user
     end
 
-    context 'when no deployment service is active' do
-      before do
-        project.kubernetes_service.update!(active: false)
-      end
+    it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes'
+  end
 
-      it 'does not show a button to set up auto deploy' do
-        visit project_path(project)
-        expect(page).to have_no_content('Set up auto deploy')
-      end
+  context 'when user configured kubernetes from CI/CD > Clusters' do
+    before do
+      create(:cluster, :provided_by_gcp, projects: [project])
+      project.team << [user, :master]
+      sign_in user
     end
 
-    context 'when a deployment service is active' do
-      before do
-        project.kubernetes_service.update!(active: true)
-        visit project_path(project)
-      end
-
-      it 'shows a button to set up auto deploy' do
-        expect(page).to have_link('Set up auto deploy')
-      end
-
-      it 'includes OpenShift as an available template', :js do
-        click_link 'Set up auto deploy'
-        click_button 'Apply a GitLab CI Yaml template'
-
-        within '.gitlab-ci-yml-selector' do
-          expect(page).to have_content('OpenShift')
-        end
-      end
-
-      it 'creates a merge request using "auto-deploy" branch', :js do
-        click_link 'Set up auto deploy'
-        click_button 'Apply a GitLab CI Yaml template'
-        within '.gitlab-ci-yml-selector' do
-          click_on 'OpenShift'
-        end
-        wait_for_requests
-        click_button 'Commit changes'
-
-        expect(page).to have_content('New Merge Request From auto-deploy into master')
-      end
-    end
+    it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes'
   end
 end
diff --git a/spec/features/projects/clusters/interchangeability_spec.rb b/spec/features/projects/clusters/interchangeability_spec.rb
index b454839e8e2..cf5c0ca347f 100644
--- a/spec/features/projects/clusters/interchangeability_spec.rb
+++ b/spec/features/projects/clusters/interchangeability_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'Interchangeability between KubernetesService and Platform::Kubernetes' do
-  let!(:project) { create(:project, :repository) }
-
   EXCEPT_METHODS = %i[test title description help fields initialize_properties namespace namespace= api_url api_url=]
   EXCEPT_METHODS_GREP_V = %w[_touched? _changed? _was]
 
@@ -15,31 +13,4 @@ feature 'Interchangeability between KubernetesService and Platform::Kubernetes'
     
     expect(expected_interfaces - Clusters::Platforms::Kubernetes.instance_methods).to be_empty
   end
-
-  shared_examples 'selects kubernetes instance' do
-    context 'when user configured kubernetes from Integration > Kubernetes' do
-      let!(:kubernetes_service) { create(:kubernetes_service, project: project) }
-
-      it { is_expected.to eq(kubernetes_service) }
-    end
-
-    context 'when user configured kubernetes from CI/CD > Clusters' do
-      let!(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
-      let(:platform_kubernetes) { cluster.platform_kubernetes }
-
-      it { is_expected.to eq(platform_kubernetes) }
-    end
-  end
-
-  describe 'Project#deployment_service' do
-    subject { project.deployment_service }
-
-    it_behaves_like 'selects kubernetes instance'
-  end
-
-  describe 'Project#kubernetes_service' do
-    subject { project.kubernetes_service }
-
-    it_behaves_like 'selects kubernetes instance'
-  end
 end
diff --git a/spec/models/clusters/platforms/kubernetes_spec.rb b/spec/models/clusters/platforms/kubernetes_spec.rb
index 07bb2d637f9..7c5a17a4e95 100644
--- a/spec/models/clusters/platforms/kubernetes_spec.rb
+++ b/spec/models/clusters/platforms/kubernetes_spec.rb
@@ -93,52 +93,52 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
   end
 
   describe 'after_save from Clusters::Cluster' do
-    context 'when platform_kubernetes is being cerated' do
-      let(:enabled) { true }
-      let(:project) { create(:project) }
-      let(:cluster) { build(:cluster, provider_type: :gcp, platform_type: :kubernetes, platform_kubernetes: platform, provider_gcp: provider, enabled: enabled, projects: [project]) }
-      let(:platform) { build(:cluster_platform_kubernetes, :configured) }
-      let(:provider) { build(:cluster_provider_gcp) }
-      let(:kubernetes_service) { project.kubernetes_service }
-
-      it 'updates KubernetesService' do
-        cluster.save!
-
-        expect(kubernetes_service.active).to eq(enabled)
-        expect(kubernetes_service.api_url).to eq(platform.api_url)
-        expect(kubernetes_service.namespace).to eq(platform.namespace)
-        expect(kubernetes_service.ca_pem).to eq(platform.ca_cert)
-      end
-    end
-
-    context 'when platform_kubernetes has been created' do
-      let(:enabled) { false }
-      let!(:project) { create(:project) }
-      let!(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
-      let(:platform) { cluster.platform }
-      let(:kubernetes_service) { project.kubernetes_service }
-
-      it 'updates KubernetesService' do
-        cluster.update(enabled: enabled)
-
-        expect(kubernetes_service.active).to eq(enabled)
-      end
-    end
-
-    context 'when kubernetes_service has been configured without cluster integration' do
-      let!(:project) { create(:project) }
-      let(:cluster) { build(:cluster, provider_type: :gcp, platform_type: :kubernetes, platform_kubernetes: platform, provider_gcp: provider, projects: [project]) }
-      let(:platform) { build(:cluster_platform_kubernetes, :configured, api_url: 'https://111.111.111.111') }
-      let(:provider) { build(:cluster_provider_gcp) }
-
-      before do
-        create(:kubernetes_service, project: project)
-      end
-
-      it 'raises an error' do
-        expect { cluster.save! }.to raise_error('Kubernetes service already configured')
-      end
-    end
+    # context 'when platform_kubernetes is being cerated' do
+    #   let(:enabled) { true }
+    #   let(:project) { create(:project) }
+    #   let(:cluster) { build(:cluster, provider_type: :gcp, platform_type: :kubernetes, platform_kubernetes: platform, provider_gcp: provider, enabled: enabled, projects: [project]) }
+    #   let(:platform) { build(:cluster_platform_kubernetes, :configured) }
+    #   let(:provider) { build(:cluster_provider_gcp) }
+    #   let(:kubernetes_service) { project.kubernetes_service }
+
+    #   it 'updates KubernetesService' do
+    #     cluster.save!
+
+    #     expect(kubernetes_service.active).to eq(enabled)
+    #     expect(kubernetes_service.api_url).to eq(platform.api_url)
+    #     expect(kubernetes_service.namespace).to eq(platform.namespace)
+    #     expect(kubernetes_service.ca_pem).to eq(platform.ca_cert)
+    #   end
+    # end
+
+    # context 'when platform_kubernetes has been created' do
+    #   let(:enabled) { false }
+    #   let!(:project) { create(:project) }
+    #   let!(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
+    #   let(:platform) { cluster.platform }
+    #   let(:kubernetes_service) { project.kubernetes_service }
+
+    #   it 'updates KubernetesService' do
+    #     cluster.update(enabled: enabled)
+
+    #     expect(kubernetes_service.active).to eq(enabled)
+    #   end
+    # end
+
+    # context 'when kubernetes_service has been configured without cluster integration' do
+    #   let!(:project) { create(:project) }
+    #   let(:cluster) { build(:cluster, provider_type: :gcp, platform_type: :kubernetes, platform_kubernetes: platform, provider_gcp: provider, projects: [project]) }
+    #   let(:platform) { build(:cluster_platform_kubernetes, :configured, api_url: 'https://111.111.111.111') }
+    #   let(:provider) { build(:cluster_provider_gcp) }
+
+    #   before do
+    #     create(:kubernetes_service, project: project)
+    #   end
+
+    #   it 'raises an error' do
+    #     expect { cluster.save! }.to raise_error('Kubernetes service already configured')
+    #   end
+    # end
   end
 
   describe '#actual_namespace' do
diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb
index de030844a28..dc71cf16f54 100644
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
@@ -369,7 +369,6 @@ describe Environment do
   end
 
   describe '#terminals' do
-    let(:project) { create(:kubernetes_project) }
     subject { environment.terminals }
 
     context 'when the environment has terminals' do
@@ -377,12 +376,27 @@ describe Environment do
         allow(environment).to receive(:has_terminals?).and_return(true)
       end
 
-      it 'returns the terminals from the deployment service' do
-        expect(project.deployment_service)
-          .to receive(:terminals).with(environment)
-          .and_return(:fake_terminals)
+      shared_examples 'correct behavior on KubernetesService and Platform::Kubernetes' do
+        it 'returns the terminals from the deployment service' do
+          expect(project.deployment_platform)
+            .to receive(:terminals).with(environment)
+            .and_return(:fake_terminals)
 
-        is_expected.to eq(:fake_terminals)
+          is_expected.to eq(:fake_terminals)
+        end
+      end
+
+      context 'when user configured kubernetes from Integration > Kubernetes' do
+        let(:project) { create(:kubernetes_project) }
+
+        it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes'
+      end
+
+      context 'when user configured kubernetes from CI/CD > Clusters' do
+        let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
+        let(:project) { cluster.project }
+
+        it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes'
       end
     end
 
diff --git a/spec/models/project_services/kubernetes_service_spec.rb b/spec/models/project_services/kubernetes_service_spec.rb
index 1c629155e1e..d33352c918b 100644
--- a/spec/models/project_services/kubernetes_service_spec.rb
+++ b/spec/models/project_services/kubernetes_service_spec.rb
@@ -5,7 +5,7 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
   include ReactiveCachingHelpers
 
   let(:project) { build_stubbed(:kubernetes_project) }
-  let(:service) { project.kubernetes_service }
+  let(:service) { project.deployment_platform }
 
   describe 'Associations' do
     it { is_expected.to belong_to :project }
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 78f2a4df36f..a28b15c9d7b 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -2002,10 +2002,10 @@ describe Project do
     end
 
     context 'when project has a deployment service' do
-      shared_examples 'correct behavior with variables' do
+      shared_examples 'correct behavior on KubernetesService and Platform::Kubernetes' do
         it 'returns variables from this service' do
           expect(project.deployment_variables).to include(
-            { key: 'KUBE_TOKEN', value: project.kubernetes_service.token, public: false }
+            { key: 'KUBE_TOKEN', value: project.deployment_platform.token, public: false }
           )
         end
       end
@@ -2013,14 +2013,14 @@ describe Project do
       context 'when user configured kubernetes from Integration > Kubernetes' do
         let(:project) { create(:kubernetes_project) }
 
-        it_behaves_like 'correct behavior with variables'
+        it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes'
       end
 
       context 'when user configured kubernetes from CI/CD > Clusters' do
         let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
         let(:project) { cluster.project }
 
-        it_behaves_like 'correct behavior with variables'
+        it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes'
       end
     end
   end
@@ -3096,4 +3096,21 @@ describe Project do
       expect(project.wiki_repository_exists?).to eq(false)
     end
   end
+
+  describe '#deployment_platform' do
+    subject { project.deployment_platform }
+
+    context 'when user configured kubernetes from Integration > Kubernetes' do
+      let!(:kubernetes_service) { create(:kubernetes_service, project: project) }
+
+      it { is_expected.to eq(kubernetes_service) }
+    end
+
+    context 'when user configured kubernetes from CI/CD > Clusters' do
+      let!(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
+      let(:platform_kubernetes) { cluster.platform_kubernetes }
+
+      it { is_expected.to eq(platform_kubernetes) }
+    end
+  end
 end
diff --git a/spec/support/prometheus/additional_metrics_shared_examples.rb b/spec/support/prometheus/additional_metrics_shared_examples.rb
index 7e20b4e0232..f3338259a77 100644
--- a/spec/support/prometheus/additional_metrics_shared_examples.rb
+++ b/spec/support/prometheus/additional_metrics_shared_examples.rb
@@ -43,7 +43,7 @@ RSpec.shared_examples 'additional metrics query' do
     describe 'project has Kubernetes service' do
       shared_examples 'correct behavior with metrics' do
         let(:environment) { create(:environment, slug: 'environment-slug', project: project) }
-        let(:kube_namespace) { project.kubernetes_service.actual_namespace }
+        let(:kube_namespace) { project.deployment_platform.actual_namespace }
 
         it_behaves_like 'query context containing environment slug and filter'
 
diff --git a/spec/workers/reactive_caching_worker_spec.rb b/spec/workers/reactive_caching_worker_spec.rb
index 98282af2d18..dd654c941bc 100644
--- a/spec/workers/reactive_caching_worker_spec.rb
+++ b/spec/workers/reactive_caching_worker_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe ReactiveCachingWorker do
-  let(:service) { project.deployment_service }
+  let(:service) { project.deployment_platform }
   subject { described_class.new.perform("KubernetesService", service.id) }
 
   describe '#perform' do
-- 
cgit v1.2.1


From c36d7842da24e6726705199f178c1324c634bdaf Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Mon, 27 Nov 2017 23:19:16 +0900
Subject: Aling shared_exmaples to "same behavior between KubernetesService and
 Platform::Kubernetes"

---
 app/views/projects/edit.html.haml                  |  2 +-
 .../projects/branches_controller_spec.rb           |  6 +--
 spec/features/auto_deploy_spec.rb                  |  6 +--
 .../projects/environments/environment_spec.rb      |  6 +--
 .../projects/environments/environments_spec.rb     |  6 +--
 spec/lib/gitlab/ci/build/policy/kubernetes_spec.rb |  6 +--
 spec/lib/gitlab/ci/yaml_processor_spec.rb          |  6 +--
 spec/models/ci/pipeline_spec.rb                    |  6 +--
 spec/models/clusters/platforms/kubernetes_spec.rb  | 49 ----------------------
 spec/models/environment_spec.rb                    | 12 +++---
 spec/models/project_spec.rb                        |  6 +--
 .../additional_metrics_shared_examples.rb          |  6 +--
 spec/workers/reactive_caching_worker_spec.rb       |  6 +--
 13 files changed, 37 insertions(+), 86 deletions(-)

diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 52be8330813..71206f3a386 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -147,7 +147,7 @@
             %ul
               %li Be careful. Renaming a project's repository can have unintended side effects.
               %li You will need to update your local repositories to point to the new location.
-              - if @project.deployment_platform.any?
+              - if @project.deployment_platform.present?
                 %li Your deployment services will be broken, you will need to manually fix the services after renaming.
           = f.submit 'Rename project', class: "btn btn-warning"
       - if can?(current_user, :change_namespace, @project)
diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb
index 91f8210964e..d731200f70f 100644
--- a/spec/controllers/projects/branches_controller_spec.rb
+++ b/spec/controllers/projects/branches_controller_spec.rb
@@ -113,7 +113,7 @@ describe Projects::BranchesController do
           expect(response).to redirect_to project_tree_path(project, branch)
         end
 
-        shared_examples 'correct behavior on KubernetesService and Platform::Kubernetes' do
+        shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
           it 'redirects to autodeploy setup page' do
             result = { status: :success, branch: double(name: branch) }
 
@@ -136,7 +136,7 @@ describe Projects::BranchesController do
             project.services << build(:kubernetes_service)
           end
 
-          it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes'
+          it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
         end
 
         context 'when user configured kubernetes from CI/CD > Clusters' do
@@ -144,7 +144,7 @@ describe Projects::BranchesController do
             create(:cluster, :provided_by_gcp, projects: [project])
           end
 
-          it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes'
+          it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
         end
       end
 
diff --git a/spec/features/auto_deploy_spec.rb b/spec/features/auto_deploy_spec.rb
index 240c5711a7b..453b31e0d77 100644
--- a/spec/features/auto_deploy_spec.rb
+++ b/spec/features/auto_deploy_spec.rb
@@ -4,7 +4,7 @@ describe 'Auto deploy' do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
 
-  shared_examples 'correct behavior on KubernetesService and Platform::Kubernetes' do
+  shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
     context 'when no deployment service is active' do
       before do
         project.kubernetes_service.update!(active: false)
@@ -56,7 +56,7 @@ describe 'Auto deploy' do
       sign_in user
     end
 
-    it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes'
+    it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
   end
 
   context 'when user configured kubernetes from CI/CD > Clusters' do
@@ -66,6 +66,6 @@ describe 'Auto deploy' do
       sign_in user
     end
 
-    it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes'
+    it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
   end
 end
diff --git a/spec/features/projects/environments/environment_spec.rb b/spec/features/projects/environments/environment_spec.rb
index 3d64b404a84..dfcf97ad495 100644
--- a/spec/features/projects/environments/environment_spec.rb
+++ b/spec/features/projects/environments/environment_spec.rb
@@ -101,7 +101,7 @@ feature 'Environment' do
           end
 
           context 'with terminal' do
-            shared_examples 'correct behavior with terminal' do
+            shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
               context 'for project master' do
                 let(:role) { :master }
 
@@ -135,14 +135,14 @@ feature 'Environment' do
             context 'when user configured kubernetes from Integration > Kubernetes' do
               let(:project) { create(:kubernetes_project, :test_repo) }
 
-              it_behaves_like 'correct behavior with terminal'
+              it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
             end
 
             context 'when user configured kubernetes from CI/CD > Clusters' do
               let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
               let(:project) { cluster.project }
 
-              it_behaves_like 'correct behavior with terminal'
+              it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
             end
           end
 
diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb
index 1732d7f2a9f..8a7c9766f9e 100644
--- a/spec/features/projects/environments/environments_spec.rb
+++ b/spec/features/projects/environments/environments_spec.rb
@@ -208,7 +208,7 @@ feature 'Environments page', :js do
         end
 
         context 'when kubernetes terminal is available' do
-          shared_examples 'correct behavior with terminal' do
+          shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
             context 'for project master' do
               let(:role) { :master }
 
@@ -229,14 +229,14 @@ feature 'Environments page', :js do
           context 'when user configured kubernetes from Integration > Kubernetes' do
             let(:project) { create(:kubernetes_project, :test_repo) }
 
-            it_behaves_like 'correct behavior with terminal'
+            it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
           end
 
           context 'when user configured kubernetes from CI/CD > Clusters' do
             let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
             let(:project) { cluster.project }
 
-            it_behaves_like 'correct behavior with terminal'
+            it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
           end
         end
       end
diff --git a/spec/lib/gitlab/ci/build/policy/kubernetes_spec.rb b/spec/lib/gitlab/ci/build/policy/kubernetes_spec.rb
index 3c143f5305b..4884d5f8ba4 100644
--- a/spec/lib/gitlab/ci/build/policy/kubernetes_spec.rb
+++ b/spec/lib/gitlab/ci/build/policy/kubernetes_spec.rb
@@ -4,7 +4,7 @@ describe Gitlab::Ci::Build::Policy::Kubernetes do
   let(:pipeline) { create(:ci_pipeline, project: project) }
 
   context 'when kubernetes service is active' do
-    shared_examples 'correct behavior for satisfied_by?' do
+    shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
       it 'is satisfied by a kubernetes pipeline' do
         expect(described_class.new('active'))
           .to be_satisfied_by(pipeline)
@@ -14,14 +14,14 @@ describe Gitlab::Ci::Build::Policy::Kubernetes do
     context 'when user configured kubernetes from Integration > Kubernetes' do
       let(:project) { create(:kubernetes_project) }
 
-      it_behaves_like 'correct behavior for satisfied_by?'
+      it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
     end
 
     context 'when user configured kubernetes from CI/CD > Clusters' do
       let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
       let(:project) { cluster.project }
 
-      it_behaves_like 'correct behavior for satisfied_by?'
+      it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
     end
   end
 
diff --git a/spec/lib/gitlab/ci/yaml_processor_spec.rb b/spec/lib/gitlab/ci/yaml_processor_spec.rb
index 4f44f35205e..98880fe9f28 100644
--- a/spec/lib/gitlab/ci/yaml_processor_spec.rb
+++ b/spec/lib/gitlab/ci/yaml_processor_spec.rb
@@ -178,7 +178,7 @@ module Gitlab
           end
 
           context 'when kubernetes is active' do
-            shared_examples 'correct behavior for kubernetes policy' do
+            shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
               it 'returns seeds for kubernetes dependent job' do
                 seeds = subject.stage_seeds(pipeline)
 
@@ -192,7 +192,7 @@ module Gitlab
               let(:project) { create(:kubernetes_project) }
               let(:pipeline) { create(:ci_empty_pipeline, project: project) }
 
-              it_behaves_like 'correct behavior for kubernetes policy'
+              it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
             end
 
             context 'when user configured kubernetes from CI/CD > Clusters' do
@@ -200,7 +200,7 @@ module Gitlab
               let(:project) { cluster.project }
               let(:pipeline) { create(:ci_empty_pipeline, project: project) }
 
-              it_behaves_like 'correct behavior for kubernetes policy'
+              it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
             end
           end
 
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index c53942ed61c..4cf0088ac9c 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -557,7 +557,7 @@ describe Ci::Pipeline, :mailer do
 
   describe '#has_kubernetes_active?' do
     context 'when kubernetes is active' do
-      shared_examples 'correct behavior with has_kubernetes_active?' do
+      shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
         it 'returns true' do
           expect(pipeline).to have_kubernetes_active
         end
@@ -566,14 +566,14 @@ describe Ci::Pipeline, :mailer do
       context 'when user configured kubernetes from Integration > Kubernetes' do
         let(:project) { create(:kubernetes_project) }
 
-        it_behaves_like 'correct behavior with has_kubernetes_active?'
+        it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
       end
 
       context 'when user configured kubernetes from CI/CD > Clusters' do
         let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
         let(:project) { cluster.project }
 
-        it_behaves_like 'correct behavior with has_kubernetes_active?'
+        it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
       end
     end
 
diff --git a/spec/models/clusters/platforms/kubernetes_spec.rb b/spec/models/clusters/platforms/kubernetes_spec.rb
index 7c5a17a4e95..53a4e545ff6 100644
--- a/spec/models/clusters/platforms/kubernetes_spec.rb
+++ b/spec/models/clusters/platforms/kubernetes_spec.rb
@@ -92,55 +92,6 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
     end
   end
 
-  describe 'after_save from Clusters::Cluster' do
-    # context 'when platform_kubernetes is being cerated' do
-    #   let(:enabled) { true }
-    #   let(:project) { create(:project) }
-    #   let(:cluster) { build(:cluster, provider_type: :gcp, platform_type: :kubernetes, platform_kubernetes: platform, provider_gcp: provider, enabled: enabled, projects: [project]) }
-    #   let(:platform) { build(:cluster_platform_kubernetes, :configured) }
-    #   let(:provider) { build(:cluster_provider_gcp) }
-    #   let(:kubernetes_service) { project.kubernetes_service }
-
-    #   it 'updates KubernetesService' do
-    #     cluster.save!
-
-    #     expect(kubernetes_service.active).to eq(enabled)
-    #     expect(kubernetes_service.api_url).to eq(platform.api_url)
-    #     expect(kubernetes_service.namespace).to eq(platform.namespace)
-    #     expect(kubernetes_service.ca_pem).to eq(platform.ca_cert)
-    #   end
-    # end
-
-    # context 'when platform_kubernetes has been created' do
-    #   let(:enabled) { false }
-    #   let!(:project) { create(:project) }
-    #   let!(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
-    #   let(:platform) { cluster.platform }
-    #   let(:kubernetes_service) { project.kubernetes_service }
-
-    #   it 'updates KubernetesService' do
-    #     cluster.update(enabled: enabled)
-
-    #     expect(kubernetes_service.active).to eq(enabled)
-    #   end
-    # end
-
-    # context 'when kubernetes_service has been configured without cluster integration' do
-    #   let!(:project) { create(:project) }
-    #   let(:cluster) { build(:cluster, provider_type: :gcp, platform_type: :kubernetes, platform_kubernetes: platform, provider_gcp: provider, projects: [project]) }
-    #   let(:platform) { build(:cluster_platform_kubernetes, :configured, api_url: 'https://111.111.111.111') }
-    #   let(:provider) { build(:cluster_provider_gcp) }
-
-    #   before do
-    #     create(:kubernetes_service, project: project)
-    #   end
-
-    #   it 'raises an error' do
-    #     expect { cluster.save! }.to raise_error('Kubernetes service already configured')
-    #   end
-    # end
-  end
-
   describe '#actual_namespace' do
     subject { kubernetes.actual_namespace }
 
diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb
index dc71cf16f54..6f24a039998 100644
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
@@ -327,7 +327,7 @@ describe Environment do
 
     context 'when the enviroment is available' do
       context 'with a deployment service' do
-        shared_examples 'correct behavior for has_terminals?' do
+        shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
           context 'and a deployment' do
             let!(:deployment) { create(:deployment, environment: environment) }
             it { is_expected.to be_truthy }
@@ -341,14 +341,14 @@ describe Environment do
         context 'when user configured kubernetes from Integration > Kubernetes' do
           let(:project) { create(:kubernetes_project) }
 
-          it_behaves_like 'correct behavior for has_terminals?'
+          it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
         end
 
         context 'when user configured kubernetes from CI/CD > Clusters' do
           let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
           let(:project) { cluster.project }
 
-          it_behaves_like 'correct behavior for has_terminals?'
+          it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
         end
       end
 
@@ -376,7 +376,7 @@ describe Environment do
         allow(environment).to receive(:has_terminals?).and_return(true)
       end
 
-      shared_examples 'correct behavior on KubernetesService and Platform::Kubernetes' do
+      shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
         it 'returns the terminals from the deployment service' do
           expect(project.deployment_platform)
             .to receive(:terminals).with(environment)
@@ -389,14 +389,14 @@ describe Environment do
       context 'when user configured kubernetes from Integration > Kubernetes' do
         let(:project) { create(:kubernetes_project) }
 
-        it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes'
+        it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
       end
 
       context 'when user configured kubernetes from CI/CD > Clusters' do
         let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
         let(:project) { cluster.project }
 
-        it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes'
+        it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
       end
     end
 
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index a28b15c9d7b..41483a8a05e 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -2002,7 +2002,7 @@ describe Project do
     end
 
     context 'when project has a deployment service' do
-      shared_examples 'correct behavior on KubernetesService and Platform::Kubernetes' do
+      shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
         it 'returns variables from this service' do
           expect(project.deployment_variables).to include(
             { key: 'KUBE_TOKEN', value: project.deployment_platform.token, public: false }
@@ -2013,14 +2013,14 @@ describe Project do
       context 'when user configured kubernetes from Integration > Kubernetes' do
         let(:project) { create(:kubernetes_project) }
 
-        it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes'
+        it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
       end
 
       context 'when user configured kubernetes from CI/CD > Clusters' do
         let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
         let(:project) { cluster.project }
 
-        it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes'
+        it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
       end
     end
   end
diff --git a/spec/support/prometheus/additional_metrics_shared_examples.rb b/spec/support/prometheus/additional_metrics_shared_examples.rb
index f3338259a77..dbbd4ad4d40 100644
--- a/spec/support/prometheus/additional_metrics_shared_examples.rb
+++ b/spec/support/prometheus/additional_metrics_shared_examples.rb
@@ -41,7 +41,7 @@ RSpec.shared_examples 'additional metrics query' do
     end
 
     describe 'project has Kubernetes service' do
-      shared_examples 'correct behavior with metrics' do
+      shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
         let(:environment) { create(:environment, slug: 'environment-slug', project: project) }
         let(:kube_namespace) { project.deployment_platform.actual_namespace }
 
@@ -57,14 +57,14 @@ RSpec.shared_examples 'additional metrics query' do
       context 'when user configured kubernetes from Integration > Kubernetes' do
         let(:project) { create(:kubernetes_project) }
 
-        it_behaves_like 'correct behavior with metrics'
+        it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
       end
 
       context 'when user configured kubernetes from CI/CD > Clusters' do
         let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
         let(:project) { cluster.project }
 
-        it_behaves_like 'correct behavior with metrics'
+        it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
       end
     end
 
diff --git a/spec/workers/reactive_caching_worker_spec.rb b/spec/workers/reactive_caching_worker_spec.rb
index dd654c941bc..225d3e38542 100644
--- a/spec/workers/reactive_caching_worker_spec.rb
+++ b/spec/workers/reactive_caching_worker_spec.rb
@@ -5,7 +5,7 @@ describe ReactiveCachingWorker do
   subject { described_class.new.perform("KubernetesService", service.id) }
 
   describe '#perform' do
-    shared_examples 'correct behavior with perform' do
+    shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
       it 'calls #exclusively_update_reactive_cache!' do
         expect_any_instance_of(KubernetesService).to receive(:exclusively_update_reactive_cache!)
 
@@ -16,14 +16,14 @@ describe ReactiveCachingWorker do
     context 'when user configured kubernetes from Integration > Kubernetes' do
       let(:project) { create(:kubernetes_project) }
 
-      it_behaves_like 'correct behavior with perform'
+      it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
     end
 
     context 'when user configured kubernetes from CI/CD > Clusters' do
       let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
       let(:project) { cluster.project }
 
-      it_behaves_like 'correct behavior with perform'
+      it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
     end
   end
 end
-- 
cgit v1.2.1


From f6d9dcf8382a00a5f2ae2100b13774b01f0328bb Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Mon, 27 Nov 2017 23:55:25 +0900
Subject: Fix unit tests

---
 app/models/clusters/platforms/kubernetes.rb           |  4 +++-
 .../project_services/kubernetes_service_spec.rb       |  2 +-
 spec/models/project_spec.rb                           |  2 ++
 spec/workers/reactive_caching_worker_spec.rb          | 19 +++++++++----------
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb
index 590d5da24cb..39b4f8f7bfc 100644
--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -6,7 +6,7 @@ module Clusters
       include ReactiveCaching
 
       self.table_name = 'cluster_platforms_kubernetes'
-      self.reactive_cache_key = ->(kubernetes) { [kubernetes.class.model_name.singular, kubernetes.cluster_id] }
+      self.reactive_cache_key = ->(kubernetes) { [kubernetes.class.model_name.singular, kubernetes.id] }
 
       belongs_to :cluster, inverse_of: :platform_kubernetes, class_name: 'Clusters::Cluster'
 
@@ -41,6 +41,8 @@ module Clusters
       delegate :project, to: :cluster, allow_nil: true
       delegate :enabled?, to: :cluster, allow_nil: true
 
+      alias_method :active?, :enabled?
+
       def actual_namespace
         if namespace.present?
           namespace
diff --git a/spec/models/project_services/kubernetes_service_spec.rb b/spec/models/project_services/kubernetes_service_spec.rb
index d33352c918b..f037ee77a94 100644
--- a/spec/models/project_services/kubernetes_service_spec.rb
+++ b/spec/models/project_services/kubernetes_service_spec.rb
@@ -4,7 +4,7 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
   include KubernetesHelpers
   include ReactiveCachingHelpers
 
-  let(:project) { build_stubbed(:kubernetes_project) }
+  let(:project) { create(:kubernetes_project) }
   let(:service) { project.deployment_platform }
 
   describe 'Associations' do
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 41483a8a05e..a4abcc49a0d 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -3100,6 +3100,8 @@ describe Project do
   describe '#deployment_platform' do
     subject { project.deployment_platform }
 
+    let(:project) { create(:project) }
+
     context 'when user configured kubernetes from Integration > Kubernetes' do
       let!(:kubernetes_service) { create(:kubernetes_service, project: project) }
 
diff --git a/spec/workers/reactive_caching_worker_spec.rb b/spec/workers/reactive_caching_worker_spec.rb
index 225d3e38542..3da851de067 100644
--- a/spec/workers/reactive_caching_worker_spec.rb
+++ b/spec/workers/reactive_caching_worker_spec.rb
@@ -2,28 +2,27 @@ require 'spec_helper'
 
 describe ReactiveCachingWorker do
   let(:service) { project.deployment_platform }
-  subject { described_class.new.perform("KubernetesService", service.id) }
 
   describe '#perform' do
-    shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
+    context 'when user configured kubernetes from Integration > Kubernetes' do
+      let(:project) { create(:kubernetes_project) }
+
       it 'calls #exclusively_update_reactive_cache!' do
         expect_any_instance_of(KubernetesService).to receive(:exclusively_update_reactive_cache!)
 
-        subject
+        described_class.new.perform("KubernetesService", service.id)
       end
     end
 
-    context 'when user configured kubernetes from Integration > Kubernetes' do
-      let(:project) { create(:kubernetes_project) }
-
-      it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
-    end
-
     context 'when user configured kubernetes from CI/CD > Clusters' do
       let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
       let(:project) { cluster.project }
 
-      it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
+      it 'calls #exclusively_update_reactive_cache!' do
+        expect_any_instance_of(Clusters::Platforms::Kubernetes).to receive(:exclusively_update_reactive_cache!)
+
+        described_class.new.perform("Clusters::Platforms::Kubernetes", service.id)
+      end
     end
   end
 end
-- 
cgit v1.2.1


From 54c70a775af21863d51bd2b3e96e5998c90ddaf7 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 28 Nov 2017 01:26:14 +0900
Subject: Fix static analysys

---
 app/models/clusters/platforms/kubernetes.rb                | 1 +
 app/models/project.rb                                      | 2 +-
 spec/features/projects/clusters/interchangeability_spec.rb | 6 +++---
 spec/features/projects/environments/environments_spec.rb   | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb
index 39b4f8f7bfc..7ab670cf1ef 100644
--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -134,6 +134,7 @@ module Clusters
         kubeclient.get_pods(namespace: actual_namespace).as_json
       rescue KubeException => err
         raise err unless err.error_code == 404
+
         []
       end
 
diff --git a/app/models/project.rb b/app/models/project.rb
index 49c56e76dfc..95aabc4ad45 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -905,7 +905,7 @@ class Project < ActiveRecord::Base
   # TODO: This will be extended for multiple enviroment clusters
   # TODO: Add super nice tests to check this interchangeability
   def deployment_platform
-    @deployment_platform ||= clusters.where(enabled: true).first&.platform_kubernetes
+    @deployment_platform ||= clusters.find_by(enabled: true)&.platform_kubernetes
     @deployment_platform ||= services.where(category: :deployment).reorder(nil).find_by(active: true)
   end
 
diff --git a/spec/features/projects/clusters/interchangeability_spec.rb b/spec/features/projects/clusters/interchangeability_spec.rb
index cf5c0ca347f..01f9526608f 100644
--- a/spec/features/projects/clusters/interchangeability_spec.rb
+++ b/spec/features/projects/clusters/interchangeability_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 feature 'Interchangeability between KubernetesService and Platform::Kubernetes' do
-  EXCEPT_METHODS = %i[test title description help fields initialize_properties namespace namespace= api_url api_url=]
-  EXCEPT_METHODS_GREP_V = %w[_touched? _changed? _was]
+  EXCEPT_METHODS = %i[test title description help fields initialize_properties namespace namespace= api_url api_url=].freeze
+  EXCEPT_METHODS_GREP_V = %w[_touched? _changed? _was].freeze
 
   it 'Clusters::Platform::Kubernetes covers core interfaces in KubernetesService' do
     expected_interfaces = KubernetesService.instance_methods(false)
@@ -10,7 +10,7 @@ feature 'Interchangeability between KubernetesService and Platform::Kubernetes'
     EXCEPT_METHODS_GREP_V.each do |g|
       expected_interfaces = expected_interfaces.grep_v(/#{Regexp.escape(g)}\z/)
     end
-    
+
     expect(expected_interfaces - Clusters::Platforms::Kubernetes.instance_methods).to be_empty
   end
 end
diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb
index 8a7c9766f9e..911486e534a 100644
--- a/spec/features/projects/environments/environments_spec.rb
+++ b/spec/features/projects/environments/environments_spec.rb
@@ -225,7 +225,7 @@ feature 'Environments page', :js do
               end
             end
           end
-          
+
           context 'when user configured kubernetes from Integration > Kubernetes' do
             let(:project) { create(:kubernetes_project, :test_repo) }
 
-- 
cgit v1.2.1


From b4c4e1bd6ea3c8c12540d50f0bf11e04d72d114b Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 28 Nov 2017 02:01:41 +0900
Subject: Fix integraetion tests

---
 spec/models/clusters/cluster_spec.rb                           | 1 -
 spec/views/projects/pipelines_settings/_show.html.haml_spec.rb | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/spec/models/clusters/cluster_spec.rb b/spec/models/clusters/cluster_spec.rb
index b91a5e7a272..7f43e747000 100644
--- a/spec/models/clusters/cluster_spec.rb
+++ b/spec/models/clusters/cluster_spec.rb
@@ -9,7 +9,6 @@ describe Clusters::Cluster do
   it { is_expected.to delegate_method(:status_reason).to(:provider) }
   it { is_expected.to delegate_method(:status_name).to(:provider) }
   it { is_expected.to delegate_method(:on_creation?).to(:provider) }
-  it { is_expected.to delegate_method(:update_kubernetes_integration!).to(:platform) }
   it { is_expected.to respond_to :project }
 
   describe '.enabled' do
diff --git a/spec/views/projects/pipelines_settings/_show.html.haml_spec.rb b/spec/views/projects/pipelines_settings/_show.html.haml_spec.rb
index c757ccf02d3..95f0be49412 100644
--- a/spec/views/projects/pipelines_settings/_show.html.haml_spec.rb
+++ b/spec/views/projects/pipelines_settings/_show.html.haml_spec.rb
@@ -35,7 +35,7 @@ describe 'projects/pipelines_settings/_show' do
 
   context 'when kubernetes is active' do
     before do
-      project.build_kubernetes_service(active: true)
+      create(:kubernetes_service, project: project)
     end
 
     context 'when auto devops domain is not defined' do
-- 
cgit v1.2.1


From 7277b3b32c2afd26a033ecf81b93319efb65861d Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 28 Nov 2017 03:06:38 +0900
Subject: Fix feature spec

---
 app/models/project.rb                                    |  1 -
 spec/features/auto_deploy_spec.rb                        | 10 ++++++++--
 spec/features/projects/environments/environments_spec.rb |  2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 95aabc4ad45..027c437d7da 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -903,7 +903,6 @@ class Project < ActiveRecord::Base
   end
 
   # TODO: This will be extended for multiple enviroment clusters
-  # TODO: Add super nice tests to check this interchangeability
   def deployment_platform
     @deployment_platform ||= clusters.find_by(enabled: true)&.platform_kubernetes
     @deployment_platform ||= services.where(category: :deployment).reorder(nil).find_by(active: true)
diff --git a/spec/features/auto_deploy_spec.rb b/spec/features/auto_deploy_spec.rb
index 453b31e0d77..7a395f62511 100644
--- a/spec/features/auto_deploy_spec.rb
+++ b/spec/features/auto_deploy_spec.rb
@@ -7,7 +7,7 @@ describe 'Auto deploy' do
   shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
     context 'when no deployment service is active' do
       before do
-        project.kubernetes_service.update!(active: false)
+        trun_off
       end
 
       it 'does not show a button to set up auto deploy' do
@@ -18,7 +18,7 @@ describe 'Auto deploy' do
 
     context 'when a deployment service is active' do
       before do
-        project.kubernetes_service.update!(active: true)
+        trun_on
         visit project_path(project)
       end
 
@@ -56,6 +56,9 @@ describe 'Auto deploy' do
       sign_in user
     end
 
+    let(:trun_on) { project.deployment_platform.update!(active: true) }
+    let(:trun_off) { project.deployment_platform.update!(active: false) }
+
     it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
   end
 
@@ -66,6 +69,9 @@ describe 'Auto deploy' do
       sign_in user
     end
 
+    let(:trun_on) { project.deployment_platform.cluster.update!(enabled: true) }
+    let(:trun_off) { project.deployment_platform.cluster.update!(enabled: false) }
+
     it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
   end
 end
diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb
index 911486e534a..4a05313c14a 100644
--- a/spec/features/projects/environments/environments_spec.rb
+++ b/spec/features/projects/environments/environments_spec.rb
@@ -233,7 +233,7 @@ feature 'Environments page', :js do
           end
 
           context 'when user configured kubernetes from CI/CD > Clusters' do
-            let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
+            let(:cluster) { create(:cluster, :provided_by_gcp, projects: [create(:project, :repository)]) }
             let(:project) { cluster.project }
 
             it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
-- 
cgit v1.2.1