From c1828eaed56159998d1eaafdaa135f1b3480549b Mon Sep 17 00:00:00 2001
From: Dylan Griffith <dyl.griffith@gmail.com>
Date: Mon, 12 Feb 2018 14:22:15 +1100
Subject: Persist external IP of ingress controller created for GKE (#42643)

---
 app/models/clusters/applications/ingress.rb        |  7 ++
 app/models/clusters/concerns/application_core.rb   |  4 ++
 app/serializers/cluster_application_entity.rb      |  1 +
 .../check_ingress_ip_address_service.rb            | 37 ++++++++++
 .../check_installation_progress_service.rb         |  1 +
 app/workers/all_queues.yml                         |  1 +
 .../cluster_wait_for_ingress_ip_address_worker.rb  | 14 ++++
 ...external_ip_to_clusters_applications_ingress.rb | 31 +++++++++
 db/schema.rb                                       |  3 +-
 spec/fixtures/api/schemas/cluster_status.json      |  3 +-
 spec/models/clusters/applications/ingress_spec.rb  | 14 ++++
 .../serializers/cluster_application_entity_spec.rb | 14 ++++
 .../check_ingress_ip_address_service_spec.rb       | 81 ++++++++++++++++++++++
 ...ster_wait_for_ingress_ip_address_worker_spec.rb | 20 ++++++
 14 files changed, 229 insertions(+), 2 deletions(-)
 create mode 100644 app/services/clusters/applications/check_ingress_ip_address_service.rb
 create mode 100644 app/workers/cluster_wait_for_ingress_ip_address_worker.rb
 create mode 100644 db/migrate/20180212030105_add_external_ip_to_clusters_applications_ingress.rb
 create mode 100644 spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb
 create mode 100644 spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb

diff --git a/app/models/clusters/applications/ingress.rb b/app/models/clusters/applications/ingress.rb
index aa5cf97756f..5e9086aecca 100644
--- a/app/models/clusters/applications/ingress.rb
+++ b/app/models/clusters/applications/ingress.rb
@@ -13,6 +13,8 @@ module Clusters
         nginx: 1
       }
 
+      IP_ADDRESS_FETCH_RETRIES = 3
+
       def chart
         'stable/nginx-ingress'
       end
@@ -24,6 +26,11 @@ module Clusters
       def install_command
         Gitlab::Kubernetes::Helm::InstallCommand.new(name, chart: chart, chart_values_file: chart_values_file)
       end
+
+      def post_install
+        ClusterWaitForIngressIpAddressWorker.perform_in(
+          ClusterWaitForIngressIpAddressWorker::INTERVAL, name, id, IP_ADDRESS_FETCH_RETRIES)
+      end
     end
   end
 end
diff --git a/app/models/clusters/concerns/application_core.rb b/app/models/clusters/concerns/application_core.rb
index a98fa85a5ff..b047fbce214 100644
--- a/app/models/clusters/concerns/application_core.rb
+++ b/app/models/clusters/concerns/application_core.rb
@@ -23,6 +23,10 @@ module Clusters
         def name
           self.class.application_name
         end
+
+        def post_install
+          # Override for any extra work that needs to be done after install
+        end
       end
     end
   end
diff --git a/app/serializers/cluster_application_entity.rb b/app/serializers/cluster_application_entity.rb
index 3f9a275ad08..b22a0b666ef 100644
--- a/app/serializers/cluster_application_entity.rb
+++ b/app/serializers/cluster_application_entity.rb
@@ -2,4 +2,5 @@ class ClusterApplicationEntity < Grape::Entity
   expose :name
   expose :status_name, as: :status
   expose :status_reason
+  expose :external_ip, if: -> (e, _) { e.respond_to?(:external_ip) }
 end
diff --git a/app/services/clusters/applications/check_ingress_ip_address_service.rb b/app/services/clusters/applications/check_ingress_ip_address_service.rb
new file mode 100644
index 00000000000..cf132676aa6
--- /dev/null
+++ b/app/services/clusters/applications/check_ingress_ip_address_service.rb
@@ -0,0 +1,37 @@
+module Clusters
+  module Applications
+    class CheckIngressIpAddressService < BaseHelmService
+      def execute(retries_remaining)
+        return if app.external_ip
+
+        service = get_service
+
+        if service.status.loadBalancer.ingress
+          resolve_external_ip(service)
+        else
+          retry_if_necessary(retries_remaining)
+        end
+
+      rescue KubeException
+        retry_if_necessary(retries_remaining)
+      end
+
+      private
+
+      def resolve_external_ip(service)
+        app.update!( external_ip: service.status.loadBalancer.ingress[0].ip)
+      end
+
+      def get_service
+        kubeclient.get_service('ingress-nginx-ingress-controller', Gitlab::Kubernetes::Helm::NAMESPACE)
+      end
+
+      def retry_if_necessary(retries_remaining)
+        if retries_remaining > 0
+          ClusterWaitForIngressIpAddressWorker.perform_in(
+            ClusterWaitForIngressIpAddressWorker::INTERVAL, app.name, app.id, retries_remaining - 1)
+        end
+      end
+    end
+  end
+end
diff --git a/app/services/clusters/applications/check_installation_progress_service.rb b/app/services/clusters/applications/check_installation_progress_service.rb
index bde090eaeec..7dcddc1c3f7 100644
--- a/app/services/clusters/applications/check_installation_progress_service.rb
+++ b/app/services/clusters/applications/check_installation_progress_service.rb
@@ -20,6 +20,7 @@ module Clusters
 
       def on_success
         app.make_installed!
+        app.post_install
       ensure
         remove_installation_pod
       end
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index f2c20114534..35ffa5d5fda 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -23,6 +23,7 @@
 - gcp_cluster:cluster_wait_for_app_installation
 - gcp_cluster:wait_for_cluster_creation
 - gcp_cluster:check_gcp_project_billing
+- gcp_cluster:cluster_wait_for_ingress_ip_address
 
 - github_import_advance_stage
 - github_importer:github_import_import_diff_note
diff --git a/app/workers/cluster_wait_for_ingress_ip_address_worker.rb b/app/workers/cluster_wait_for_ingress_ip_address_worker.rb
new file mode 100644
index 00000000000..829417484cf
--- /dev/null
+++ b/app/workers/cluster_wait_for_ingress_ip_address_worker.rb
@@ -0,0 +1,14 @@
+class ClusterWaitForIngressIpAddressWorker
+  include ApplicationWorker
+  include ClusterQueue
+  include ClusterApplications
+
+  INTERVAL = 10.seconds
+  TIMEOUT = 20.minutes
+
+  def perform(app_name, app_id, retries_remaining)
+    find_application(app_name, app_id) do |app|
+      Clusters::Applications::CheckIngressIpAddressService.new(app).execute(retries_remaining)
+    end
+  end
+end
diff --git a/db/migrate/20180212030105_add_external_ip_to_clusters_applications_ingress.rb b/db/migrate/20180212030105_add_external_ip_to_clusters_applications_ingress.rb
new file mode 100644
index 00000000000..c18d1d7a67b
--- /dev/null
+++ b/db/migrate/20180212030105_add_external_ip_to_clusters_applications_ingress.rb
@@ -0,0 +1,31 @@
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddExternalIpToClustersApplicationsIngress < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  # Set this constant to true if this migration requires downtime.
+  DOWNTIME = false
+
+  # When a migration requires downtime you **must** uncomment the following
+  # constant and define a short and easy to understand explanation as to why the
+  # migration requires downtime.
+  # DOWNTIME_REASON = ''
+
+  # When using the methods "add_concurrent_index", "remove_concurrent_index" or
+  # "add_column_with_default" you must disable the use of transactions
+  # as these methods can not run in an existing transaction.
+  # When using "add_concurrent_index" or "remove_concurrent_index" methods make sure
+  # that either of them is the _only_ method called in the migration,
+  # any other changes should go in a separate migration.
+  # This ensures that upon failure _only_ the index creation or removing fails
+  # and can be retried or reverted easily.
+  #
+  # To disable transactions uncomment the following line and remove these
+  # comments:
+  # disable_ddl_transaction!
+
+  def change
+    add_column :clusters_applications_ingress, :external_ip, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6b43fc8403c..e13415926ec 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180208183958) do
+ActiveRecord::Schema.define(version: 20180212030105) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -568,6 +568,7 @@ ActiveRecord::Schema.define(version: 20180208183958) do
     t.string "version", null: false
     t.string "cluster_ip"
     t.text "status_reason"
+    t.string "external_ip"
   end
 
   create_table "clusters_applications_prometheus", force: :cascade do |t|
diff --git a/spec/fixtures/api/schemas/cluster_status.json b/spec/fixtures/api/schemas/cluster_status.json
index 489d563be2b..9617157ee37 100644
--- a/spec/fixtures/api/schemas/cluster_status.json
+++ b/spec/fixtures/api/schemas/cluster_status.json
@@ -30,7 +30,8 @@
             ]
           }
         },
-        "status_reason": { "type": ["string", "null"] }
+        "status_reason": { "type": ["string", "null"] },
+        "external_ip": { "type": ["string", null] }
       },
       "required" : [ "name", "status" ]
     }
diff --git a/spec/models/clusters/applications/ingress_spec.rb b/spec/models/clusters/applications/ingress_spec.rb
index 619c088b0bf..da9535f9d16 100644
--- a/spec/models/clusters/applications/ingress_spec.rb
+++ b/spec/models/clusters/applications/ingress_spec.rb
@@ -5,4 +5,18 @@ describe Clusters::Applications::Ingress do
   it { is_expected.to validate_presence_of(:cluster) }
 
   include_examples 'cluster application specs', described_class
+
+  describe '#post_install' do
+    let(:application) { create(:clusters_applications_ingress, :installed) }
+
+    before do
+      allow(ClusterWaitForIngressIpAddressWorker).to receive(:perform_in)
+      application.post_install
+    end
+
+    it 'schedules a ClusterWaitForIngressIpAddressWorker' do
+      expect(ClusterWaitForIngressIpAddressWorker).to have_received(:perform_in)
+        .with(ClusterWaitForIngressIpAddressWorker::INTERVAL, 'ingress', application.id, 3)
+    end
+  end
 end
diff --git a/spec/serializers/cluster_application_entity_spec.rb b/spec/serializers/cluster_application_entity_spec.rb
index b5a55b4ef6e..70b274083b2 100644
--- a/spec/serializers/cluster_application_entity_spec.rb
+++ b/spec/serializers/cluster_application_entity_spec.rb
@@ -26,5 +26,19 @@ describe ClusterApplicationEntity do
         expect(subject[:status_reason]).to eq(application.status_reason)
       end
     end
+
+    context 'for ingress application' do
+      let(:application) do
+        build(
+          :clusters_applications_ingress,
+          :installed,
+          external_ip: '111.222.111.222',
+        )
+      end
+
+      it 'includes external_ip' do
+        expect(subject[:external_ip]).to eq('111.222.111.222')
+      end
+    end
   end
 end
diff --git a/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb b/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb
new file mode 100644
index 00000000000..5d99196fbe6
--- /dev/null
+++ b/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb
@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+describe Clusters::Applications::CheckIngressIpAddressService do
+  let(:application) { create(:clusters_applications_ingress, :installed) }
+  let(:service) { described_class.new(application) }
+  let(:kube_service) do
+    ::Kubeclient::Resource.new(
+      {
+          status: {
+              loadBalancer: {
+                  ingress: ingress
+              }
+          }
+      }
+    )
+  end
+  let(:kubeclient) { double(::Kubeclient::Client, get_service: kube_service) }
+  let(:ingress) { [{ ip: '111.222.111.222' }] }
+
+  before do
+    allow(application.cluster).to receive(:kubeclient).and_return(kubeclient)
+  end
+
+  describe '#execute' do
+    context 'when the ingress ip address is available' do
+      it 'updates the external_ip for the app and does not schedule another worker' do
+        expect(ClusterWaitForIngressIpAddressWorker).not_to receive(:perform_in)
+
+        service.execute(1)
+
+        expect(application.external_ip).to eq('111.222.111.222')
+      end
+    end
+
+    context 'when the ingress ip address is not available' do
+      let(:ingress) { nil }
+
+      it 'it schedules another worker with 1 less retry' do
+        expect(ClusterWaitForIngressIpAddressWorker)
+          .to receive(:perform_in)
+          .with(ClusterWaitForIngressIpAddressWorker::INTERVAL, 'ingress', application.id, 0)
+
+        service.execute(1)
+      end
+
+      context 'when no more retries remaining' do
+        it 'does not schedule another worker' do
+          expect(ClusterWaitForIngressIpAddressWorker).not_to receive(:perform_in)
+
+          service.execute(0)
+        end
+      end
+    end
+
+    context 'when there is already an external_ip' do
+      let(:application) { create(:clusters_applications_ingress, :installed, external_ip: '001.111.002.111') }
+
+      it 'does nothing' do
+        expect(kubeclient).not_to receive(:get_service)
+
+        service.execute(1)
+
+        expect(application.external_ip).to eq('001.111.002.111')
+      end
+    end
+
+    context 'when a kubernetes error occurs' do
+      before do
+        allow(kubeclient).to receive(:get_service).and_raise(KubeException.new(500, 'something blew up', nil))
+      end
+
+      it 'it schedules another worker with 1 less retry' do
+        expect(ClusterWaitForIngressIpAddressWorker)
+          .to receive(:perform_in)
+          .with(ClusterWaitForIngressIpAddressWorker::INTERVAL, 'ingress', application.id, 0)
+
+        service.execute(1)
+      end
+    end
+  end
+end
diff --git a/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb b/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb
new file mode 100644
index 00000000000..9f8bf35f604
--- /dev/null
+++ b/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb
@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe ClusterWaitForIngressIpAddressWorker do
+  describe '#perform' do
+    let(:service) { instance_double(Clusters::Applications::CheckIngressIpAddressService) }
+    let(:application) { instance_double(Clusters::Applications::Ingress) }
+    let(:worker) { described_class.new }
+
+    it 'finds the application and calls CheckIngressIpAddressService#execute' do
+      expect(worker).to receive(:find_application).with('ingress', 117).and_yield(application)
+      expect(Clusters::Applications::CheckIngressIpAddressService)
+        .to receive(:new)
+        .with(application)
+        .and_return(service)
+      expect(service).to receive(:execute).with(2)
+
+      worker.perform('ingress', 117, 2)
+    end
+  end
+end
-- 
cgit v1.2.1


From 5190ef57a3c5a4333020a5281904e56c00519e91 Mon Sep 17 00:00:00 2001
From: Dylan Griffith <dyl.griffith@gmail.com>
Date: Thu, 15 Feb 2018 17:24:59 +1100
Subject: Ensure CheckIngressIpAddressService obtains exclusive lease per
 ingress controller (#42643)

---
 .../applications/check_ingress_ip_address_service.rb  |  9 +++++++++
 .../check_ingress_ip_address_service_spec.rb          | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/app/services/clusters/applications/check_ingress_ip_address_service.rb b/app/services/clusters/applications/check_ingress_ip_address_service.rb
index cf132676aa6..3262aa59a90 100644
--- a/app/services/clusters/applications/check_ingress_ip_address_service.rb
+++ b/app/services/clusters/applications/check_ingress_ip_address_service.rb
@@ -1,8 +1,11 @@
 module Clusters
   module Applications
     class CheckIngressIpAddressService < BaseHelmService
+      LEASE_TIMEOUT = 3.seconds.to_i
+
       def execute(retries_remaining)
         return if app.external_ip
+        return unless try_obtain_lease
 
         service = get_service
 
@@ -18,6 +21,12 @@ module Clusters
 
       private
 
+      def try_obtain_lease
+        Gitlab::ExclusiveLease
+          .new("check_ingress_ip_address_service:#{app.id}", timeout: LEASE_TIMEOUT)
+          .try_obtain
+      end
+
       def resolve_external_ip(service)
         app.update!( external_ip: service.status.loadBalancer.ingress[0].ip)
       end
diff --git a/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb b/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb
index 5d99196fbe6..6c81acfcf84 100644
--- a/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb
+++ b/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb
@@ -16,9 +16,14 @@ describe Clusters::Applications::CheckIngressIpAddressService do
   end
   let(:kubeclient) { double(::Kubeclient::Client, get_service: kube_service) }
   let(:ingress) { [{ ip: '111.222.111.222' }] }
+  let(:exclusive_lease) { instance_double(Gitlab::ExclusiveLease, try_obtain: true) }
 
   before do
     allow(application.cluster).to receive(:kubeclient).and_return(kubeclient)
+    allow(Gitlab::ExclusiveLease)
+      .to receive(:new)
+      .with("check_ingress_ip_address_service:#{application.id}", timeout: 3.seconds.to_i)
+      .and_return(exclusive_lease)
   end
 
   describe '#execute' do
@@ -52,6 +57,20 @@ describe Clusters::Applications::CheckIngressIpAddressService do
       end
     end
 
+    context 'when the exclusive lease cannot be obtained' do
+      before do
+        allow(exclusive_lease)
+          .to receive(:try_obtain)
+          .and_return(false)
+      end
+
+      it 'does not call kubeclient' do
+        expect(kubeclient).not_to receive(:get_service)
+
+        service.execute(1)
+      end
+    end
+
     context 'when there is already an external_ip' do
       let(:application) { create(:clusters_applications_ingress, :installed, external_ip: '001.111.002.111') }
 
-- 
cgit v1.2.1


From b284ce0428d855600899764a1c9bf0a7f3e88277 Mon Sep 17 00:00:00 2001
From: Dylan Griffith <dyl.griffith@gmail.com>
Date: Fri, 16 Feb 2018 11:47:42 +1100
Subject: Fix rubocop warning (#42643)

---
 spec/serializers/cluster_application_entity_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/serializers/cluster_application_entity_spec.rb b/spec/serializers/cluster_application_entity_spec.rb
index 70b274083b2..852b6af9f7f 100644
--- a/spec/serializers/cluster_application_entity_spec.rb
+++ b/spec/serializers/cluster_application_entity_spec.rb
@@ -32,7 +32,7 @@ describe ClusterApplicationEntity do
         build(
           :clusters_applications_ingress,
           :installed,
-          external_ip: '111.222.111.222',
+          external_ip: '111.222.111.222'
         )
       end
 
-- 
cgit v1.2.1


From f0b27f9b406579a03e55fa16cbc7095009dc8c2b Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 19 Feb 2018 14:03:41 +0000
Subject: Adds support to render the IP address in the application ingress row
 Updates components to use a slot to allow to reuse the clipboard button Adds
 tests

---
 .../clusters/components/application_row.vue        |  11 +-
 .../clusters/components/applications.vue           | 123 +++++++++++++++++----
 .../vue_shared/components/clipboard_button.vue     |   7 +-
 ...rsist-external-ip-of-ingress-controller-gke.yml |   5 +
 .../clusters/components/applications_spec.js       |  70 ++++++++++++
 5 files changed, 189 insertions(+), 27 deletions(-)
 create mode 100644 changelogs/unreleased/42643-persist-external-ip-of-ingress-controller-gke.yml

diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue
index 50e35bbbba5..428a762a9c8 100644
--- a/app/assets/javascripts/clusters/components/application_row.vue
+++ b/app/assets/javascripts/clusters/components/application_row.vue
@@ -36,10 +36,6 @@
         type: String,
         required: false,
       },
-      description: {
-        type: String,
-        required: true,
-      },
       status: {
         type: String,
         required: false,
@@ -148,11 +144,14 @@
         class="table-section section-wrap"
         role="gridcell"
       >
-        <div v-html="description"></div>
+        <slot name="description"></slot>
       </div>
       <div
         class="table-section table-button-footer section-align-top"
-        :class="{ 'section-20': showManageButton, 'section-15': !showManageButton }"
+        :class="{
+          'section-20': showManageButton,
+          'section-15': !showManageButton,
+        }"
         role="gridcell"
       >
         <div
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index 978881a4831..69178cb0162 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -2,10 +2,15 @@
   import _ from 'underscore';
   import { s__, sprintf } from '../../locale';
   import applicationRow from './application_row.vue';
+  import clipboardButton from '../../vue_shared/components/clipboard_button.vue';
+  import {
+    APPLICATION_INSTALLED,
+  } from '../constants';
 
   export default {
     components: {
       applicationRow,
+      clipboardButton,
     },
     props: {
       applications: {
@@ -43,19 +48,10 @@
           false,
         );
       },
-      helmTillerDescription() {
-        return _.escape(s__(
-          `ClusterIntegration|Helm streamlines installing and managing Kubernetes applications.
-          Tiller runs inside of your Kubernetes Cluster, and manages
-          releases of your charts.`,
-        ));
+      ingressInstalled() {
+        return this.applications.ingress.status === APPLICATION_INSTALLED;
       },
       ingressDescription() {
-        const descriptionParagraph = _.escape(s__(
-          `ClusterIntegration|Ingress gives you a way to route requests to services based on the
-          request host or path, centralizing a number of services into a single entrypoint.`,
-        ));
-
         const extraCostParagraph = sprintf(
           _.escape(s__(
             `ClusterIntegration|%{boldNotice} This will add some extra resources
@@ -83,9 +79,6 @@
         );
 
         return `
-          <p>
-            ${descriptionParagraph}
-          </p>
           <p>
             ${extraCostParagraph}
           </p>
@@ -136,33 +129,123 @@
           id="helm"
           :title="applications.helm.title"
           title-link="https://docs.helm.sh/"
-          :description="helmTillerDescription"
           :status="applications.helm.status"
           :status-reason="applications.helm.statusReason"
           :request-status="applications.helm.requestStatus"
           :request-reason="applications.helm.requestReason"
-        />
+        >
+          <div slot="description">
+            {{ s__(
+              `ClusterIntegration|Helm streamlines installing and managing Kubernetes applications.
+              Tiller runs inside of your Kubernetes Cluster, and manages releases of your charts.`,
+            ) }}
+          </div>
+        </application-row>
         <application-row
           id="ingress"
           :title="applications.ingress.title"
           title-link="https://kubernetes.io/docs/concepts/services-networking/ingress/"
-          :description="ingressDescription"
           :status="applications.ingress.status"
           :status-reason="applications.ingress.statusReason"
           :request-status="applications.ingress.requestStatus"
           :request-reason="applications.ingress.requestReason"
-        />
+        >
+          <div slot="description">
+            <p>
+              {{ s__(
+                `ClusterIntegration|Ingress gives you a way to route
+                requests to services based on the request host or path,
+                centralizing a number of services into a single entrypoint.`,
+              ) }}
+            </p>
+
+            <template v-if="ingressInstalled">
+              <div class="form-group">
+                <label for="ipAddress">
+                  {{ s__("ClusterIntegration| Ingress IP Address") }}
+                </label>
+                <div
+                  v-if="applications.ingress.external_ip"
+                  class="input-group"
+                >
+                  <input
+                    type="text"
+                    id="ipAddress"
+                    class="form-control js-select-on-focus"
+                    :placeholder="applications.ingress.external_ip"
+                    readonly
+                  />
+                  <span class="input-group-btn">
+                    <clipboard-button
+                      :text="applications.ingress.external_ip"
+                      :title="s__('ClusterIntegration|Copy Ingress IP Address')"
+                      css-class="btn btn-default js-clipboard-btn"
+                    />
+                  </span>
+                </div>
+                <input
+                  v-else
+                  type="text"
+                  id="ipAddress"
+                  class="form-control"
+                  readonly
+                  placeholder="?"
+                />
+              </div>
+
+              <p
+                v-if="!applications.ingress.external_ip"
+                class="settings-message js-no-ip-message"
+              >
+                {{ s__(`ClusterIntegration|The IP address is in process
+                to be assigned, please check your Kubernetes
+                cluster or Quotas on GKE if it takes a long time.`) }}
+                <a
+                  href="TODO"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
+                  {{ __("More information") }}
+                </a>
+              </p>
+
+              <p>
+                {{ s__(`ClusterIntegration|Point a wildcard DNS to this
+                generated IP address in order to access
+                your application after it has been deployed.`) }}
+                <a
+                  href="TODO"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
+                  {{ __("More information") }}
+                </a>
+              </p>
+
+            </template>
+            <template
+              v-else
+              v-html="ingressDescription"
+            >
+            </template>
+          </div>
+        </application-row>
         <application-row
           id="prometheus"
           :title="applications.prometheus.title"
           title-link="https://prometheus.io/docs/introduction/overview/"
           :manage-link="managePrometheusPath"
-          :description="prometheusDescription"
           :status="applications.prometheus.status"
           :status-reason="applications.prometheus.statusReason"
           :request-status="applications.prometheus.requestStatus"
           :request-reason="applications.prometheus.requestReason"
-        />
+        >
+          <div
+            slot="description"
+            v-html="prometheusDescription"
+          >
+          </div>
+        </application-row>
         <!--
           NOTE: Don't forget to update `clusters.scss`
           min-height for this block and uncomment `application_spec` tests
diff --git a/app/assets/javascripts/vue_shared/components/clipboard_button.vue b/app/assets/javascripts/vue_shared/components/clipboard_button.vue
index 31d9b9d9c48..ca4ad8eea92 100644
--- a/app/assets/javascripts/vue_shared/components/clipboard_button.vue
+++ b/app/assets/javascripts/vue_shared/components/clipboard_button.vue
@@ -28,6 +28,11 @@
         required: false,
         default: false,
       },
+      cssClass: {
+        type: String,
+        required: false,
+        default: 'btn btn-default btn-transparent btn-clipboard',
+      },
     },
   };
 </script>
@@ -35,7 +40,7 @@
 <template>
   <button
     type="button"
-    class="btn btn-transparent btn-clipboard"
+    :class="cssClass"
     :title="title"
     :data-clipboard-text="text"
     v-tooltip
diff --git a/changelogs/unreleased/42643-persist-external-ip-of-ingress-controller-gke.yml b/changelogs/unreleased/42643-persist-external-ip-of-ingress-controller-gke.yml
new file mode 100644
index 00000000000..8303a5860d6
--- /dev/null
+++ b/changelogs/unreleased/42643-persist-external-ip-of-ingress-controller-gke.yml
@@ -0,0 +1,5 @@
+---
+title: Display ingress IP address in the Kubernetes page
+merge_request:
+author:
+type: fixed
diff --git a/spec/javascripts/clusters/components/applications_spec.js b/spec/javascripts/clusters/components/applications_spec.js
index 1a8affad4e3..d055679aea8 100644
--- a/spec/javascripts/clusters/components/applications_spec.js
+++ b/spec/javascripts/clusters/components/applications_spec.js
@@ -44,4 +44,74 @@ describe('Applications', () => {
     });
     /* */
   });
+
+  describe('Ingress application', () => {
+    describe('when installed', () => {
+      describe('with ip address', () => {
+        it('renders ip address with a clipboard button', () => {
+          vm = mountComponent(Applications, {
+            applications: {
+              ingress: {
+                title: 'Ingress',
+                status: 'installed',
+                external_ip: '0.0.0.0',
+              },
+              helm: { title: 'Helm Tiller' },
+              runner: { title: 'GitLab Runner' },
+              prometheus: { title: 'Prometheus' },
+            },
+          });
+
+          expect(
+            vm.$el.querySelector('#ipAddress').getAttribute('placeholder'),
+          ).toEqual('0.0.0.0');
+          expect(
+            vm.$el.querySelector('.js-clipboard-btn').getAttribute('data-clipboard-text'),
+          ).toEqual('0.0.0.0');
+        });
+      });
+
+      describe('without ip address', () => {
+        it('renders an input text with a question mark and an alert text', () => {
+          vm = mountComponent(Applications, {
+            applications: {
+              ingress: {
+                title: 'Ingress',
+                status: 'installed',
+              },
+              helm: { title: 'Helm Tiller' },
+              runner: { title: 'GitLab Runner' },
+              prometheus: { title: 'Prometheus' },
+            },
+          });
+
+          expect(
+            vm.$el.querySelector('#ipAddress').getAttribute('placeholder'),
+          ).toEqual('?');
+
+          expect(
+            vm.$el.querySelector('.js-no-ip-message').textContent.replace(/\n(\s)+/g, ' ').trim(),
+          ).toEqual(
+            'The IP address is in process to be assigned, please check your Kubernetes cluster or Quotas on GKE if it takes a long time. More information',
+          );
+        });
+      });
+    });
+
+    describe('before installing', () => {
+      it('does not render the IP address', () => {
+        vm = mountComponent(Applications, {
+          applications: {
+            helm: { title: 'Helm Tiller' },
+            ingress: { title: 'Ingress' },
+            runner: { title: 'GitLab Runner' },
+            prometheus: { title: 'Prometheus' },
+          },
+        });
+
+        expect(vm.$el.textContent).not.toContain('Ingress IP Address');
+        expect(vm.$el.querySelector('#ipAddress')).toBe(null);
+      });
+    });
+  });
 });
-- 
cgit v1.2.1


From ba4114d25f538d198df2f681b9cb08567494207e Mon Sep 17 00:00:00 2001
From: Dylan Griffith <dyl.griffith@gmail.com>
Date: Tue, 20 Feb 2018 12:42:05 +1100
Subject: Refactor ingress IP address waiting code (#42643)

---
 app/models/clusters/applications/ingress.rb        | 15 ++--
 app/models/clusters/concerns/application_core.rb   |  4 -
 .../check_ingress_ip_address_service.rb            | 23 +++---
 .../check_installation_progress_service.rb         |  1 -
 .../cluster_wait_for_ingress_ip_address_worker.rb  | 15 +++-
 ...external_ip_to_clusters_applications_ingress.rb | 22 ------
 spec/fixtures/api/schemas/cluster_status.json      |  2 +-
 spec/models/clusters/applications/ingress_spec.rb  | 13 ++--
 .../check_ingress_ip_address_service_spec.rb       | 53 +++++---------
 ...ster_wait_for_ingress_ip_address_worker_spec.rb | 85 ++++++++++++++++++++--
 10 files changed, 141 insertions(+), 92 deletions(-)

diff --git a/app/models/clusters/applications/ingress.rb b/app/models/clusters/applications/ingress.rb
index 5e9086aecca..418ce7d1504 100644
--- a/app/models/clusters/applications/ingress.rb
+++ b/app/models/clusters/applications/ingress.rb
@@ -5,6 +5,7 @@ module Clusters
 
       include ::Clusters::Concerns::ApplicationCore
       include ::Clusters::Concerns::ApplicationStatus
+      include AfterCommitQueue
 
       default_value_for :ingress_type, :nginx
       default_value_for :version, :nginx
@@ -15,6 +16,15 @@ module Clusters
 
       IP_ADDRESS_FETCH_RETRIES = 3
 
+      state_machine :status do
+        before_transition any => [:installed] do |application|
+          application.run_after_commit do
+            ClusterWaitForIngressIpAddressWorker.perform_in(
+              ClusterWaitForIngressIpAddressWorker::INTERVAL, application.name, application.id, IP_ADDRESS_FETCH_RETRIES)
+          end
+        end
+      end
+
       def chart
         'stable/nginx-ingress'
       end
@@ -26,11 +36,6 @@ module Clusters
       def install_command
         Gitlab::Kubernetes::Helm::InstallCommand.new(name, chart: chart, chart_values_file: chart_values_file)
       end
-
-      def post_install
-        ClusterWaitForIngressIpAddressWorker.perform_in(
-          ClusterWaitForIngressIpAddressWorker::INTERVAL, name, id, IP_ADDRESS_FETCH_RETRIES)
-      end
     end
   end
 end
diff --git a/app/models/clusters/concerns/application_core.rb b/app/models/clusters/concerns/application_core.rb
index b047fbce214..a98fa85a5ff 100644
--- a/app/models/clusters/concerns/application_core.rb
+++ b/app/models/clusters/concerns/application_core.rb
@@ -23,10 +23,6 @@ module Clusters
         def name
           self.class.application_name
         end
-
-        def post_install
-          # Override for any extra work that needs to be done after install
-        end
       end
     end
   end
diff --git a/app/services/clusters/applications/check_ingress_ip_address_service.rb b/app/services/clusters/applications/check_ingress_ip_address_service.rb
index 3262aa59a90..300b7ed522c 100644
--- a/app/services/clusters/applications/check_ingress_ip_address_service.rb
+++ b/app/services/clusters/applications/check_ingress_ip_address_service.rb
@@ -1,22 +1,24 @@
 module Clusters
   module Applications
     class CheckIngressIpAddressService < BaseHelmService
+      Error = Class.new(StandardError)
+
       LEASE_TIMEOUT = 3.seconds.to_i
 
-      def execute(retries_remaining)
-        return if app.external_ip
-        return unless try_obtain_lease
+      def execute
+        return true if app.external_ip
+        return true unless try_obtain_lease
 
         service = get_service
 
         if service.status.loadBalancer.ingress
           resolve_external_ip(service)
         else
-          retry_if_necessary(retries_remaining)
+          false
         end
 
-      rescue KubeException
-        retry_if_necessary(retries_remaining)
+      rescue KubeException => e
+        raise Error, "#{e.class}: #{e.message}"
       end
 
       private
@@ -28,19 +30,12 @@ module Clusters
       end
 
       def resolve_external_ip(service)
-        app.update!( external_ip: service.status.loadBalancer.ingress[0].ip)
+        app.update!(external_ip: service.status.loadBalancer.ingress[0].ip)
       end
 
       def get_service
         kubeclient.get_service('ingress-nginx-ingress-controller', Gitlab::Kubernetes::Helm::NAMESPACE)
       end
-
-      def retry_if_necessary(retries_remaining)
-        if retries_remaining > 0
-          ClusterWaitForIngressIpAddressWorker.perform_in(
-            ClusterWaitForIngressIpAddressWorker::INTERVAL, app.name, app.id, retries_remaining - 1)
-        end
-      end
     end
   end
 end
diff --git a/app/services/clusters/applications/check_installation_progress_service.rb b/app/services/clusters/applications/check_installation_progress_service.rb
index 7dcddc1c3f7..bde090eaeec 100644
--- a/app/services/clusters/applications/check_installation_progress_service.rb
+++ b/app/services/clusters/applications/check_installation_progress_service.rb
@@ -20,7 +20,6 @@ module Clusters
 
       def on_success
         app.make_installed!
-        app.post_install
       ensure
         remove_installation_pod
       end
diff --git a/app/workers/cluster_wait_for_ingress_ip_address_worker.rb b/app/workers/cluster_wait_for_ingress_ip_address_worker.rb
index 829417484cf..0fbb9fb2526 100644
--- a/app/workers/cluster_wait_for_ingress_ip_address_worker.rb
+++ b/app/workers/cluster_wait_for_ingress_ip_address_worker.rb
@@ -4,11 +4,22 @@ class ClusterWaitForIngressIpAddressWorker
   include ClusterApplications
 
   INTERVAL = 10.seconds
-  TIMEOUT = 20.minutes
 
   def perform(app_name, app_id, retries_remaining)
     find_application(app_name, app_id) do |app|
-      Clusters::Applications::CheckIngressIpAddressService.new(app).execute(retries_remaining)
+      result = Clusters::Applications::CheckIngressIpAddressService.new(app).execute
+      retry_if_necessary(app_name, app_id, retries_remaining) unless result
+    end
+  rescue Clusters::Applications::CheckIngressIpAddressService::Error => e
+    retry_if_necessary(app_name, app_id, retries_remaining)
+    raise e
+  end
+
+  private
+
+  def retry_if_necessary(app_name, app_id, retries_remaining)
+    if retries_remaining > 0
+      self.class.perform_in(INTERVAL, app_name, app_id, retries_remaining - 1)
     end
   end
 end
diff --git a/db/migrate/20180212030105_add_external_ip_to_clusters_applications_ingress.rb b/db/migrate/20180212030105_add_external_ip_to_clusters_applications_ingress.rb
index c18d1d7a67b..dbe09a43aa7 100644
--- a/db/migrate/20180212030105_add_external_ip_to_clusters_applications_ingress.rb
+++ b/db/migrate/20180212030105_add_external_ip_to_clusters_applications_ingress.rb
@@ -1,30 +1,8 @@
-# See http://doc.gitlab.com/ce/development/migration_style_guide.html
-# for more information on how to write migrations for GitLab.
-
 class AddExternalIpToClustersApplicationsIngress < ActiveRecord::Migration
   include Gitlab::Database::MigrationHelpers
 
-  # Set this constant to true if this migration requires downtime.
   DOWNTIME = false
 
-  # When a migration requires downtime you **must** uncomment the following
-  # constant and define a short and easy to understand explanation as to why the
-  # migration requires downtime.
-  # DOWNTIME_REASON = ''
-
-  # When using the methods "add_concurrent_index", "remove_concurrent_index" or
-  # "add_column_with_default" you must disable the use of transactions
-  # as these methods can not run in an existing transaction.
-  # When using "add_concurrent_index" or "remove_concurrent_index" methods make sure
-  # that either of them is the _only_ method called in the migration,
-  # any other changes should go in a separate migration.
-  # This ensures that upon failure _only_ the index creation or removing fails
-  # and can be retried or reverted easily.
-  #
-  # To disable transactions uncomment the following line and remove these
-  # comments:
-  # disable_ddl_transaction!
-
   def change
     add_column :clusters_applications_ingress, :external_ip, :string
   end
diff --git a/spec/fixtures/api/schemas/cluster_status.json b/spec/fixtures/api/schemas/cluster_status.json
index 9617157ee37..d27c12e43f2 100644
--- a/spec/fixtures/api/schemas/cluster_status.json
+++ b/spec/fixtures/api/schemas/cluster_status.json
@@ -31,7 +31,7 @@
           }
         },
         "status_reason": { "type": ["string", "null"] },
-        "external_ip": { "type": ["string", null] }
+        "external_ip": { "type": ["string", "null"] }
       },
       "required" : [ "name", "status" ]
     }
diff --git a/spec/models/clusters/applications/ingress_spec.rb b/spec/models/clusters/applications/ingress_spec.rb
index da9535f9d16..c8109bf3cf6 100644
--- a/spec/models/clusters/applications/ingress_spec.rb
+++ b/spec/models/clusters/applications/ingress_spec.rb
@@ -4,16 +4,19 @@ describe Clusters::Applications::Ingress do
   it { is_expected.to belong_to(:cluster) }
   it { is_expected.to validate_presence_of(:cluster) }
 
-  include_examples 'cluster application specs', described_class
+  before do
+    allow(ClusterWaitForIngressIpAddressWorker).to receive(:perform_in)
+  end
 
-  describe '#post_install' do
-    let(:application) { create(:clusters_applications_ingress, :installed) }
+  include_examples 'cluster application specs', described_class
 
+  describe '#make_installed!' do
     before do
-      allow(ClusterWaitForIngressIpAddressWorker).to receive(:perform_in)
-      application.post_install
+      application.make_installed!
     end
 
+    let(:application) { create(:clusters_applications_ingress, :installing) }
+
     it 'schedules a ClusterWaitForIngressIpAddressWorker' do
       expect(ClusterWaitForIngressIpAddressWorker).to have_received(:perform_in)
         .with(ClusterWaitForIngressIpAddressWorker::INTERVAL, 'ingress', application.id, 3)
diff --git a/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb b/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb
index 6c81acfcf84..a9915493d42 100644
--- a/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb
+++ b/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb
@@ -1,8 +1,13 @@
 require 'spec_helper'
 
 describe Clusters::Applications::CheckIngressIpAddressService do
+  subject { service.execute }
   let(:application) { create(:clusters_applications_ingress, :installed) }
   let(:service) { described_class.new(application) }
+  let(:kubeclient) { double(::Kubeclient::Client, get_service: kube_service) }
+  let(:ingress) { [{ ip: '111.222.111.222' }] }
+  let(:exclusive_lease) { instance_double(Gitlab::ExclusiveLease, try_obtain: true) }
+
   let(:kube_service) do
     ::Kubeclient::Resource.new(
       {
@@ -14,9 +19,6 @@ describe Clusters::Applications::CheckIngressIpAddressService do
       }
     )
   end
-  let(:kubeclient) { double(::Kubeclient::Client, get_service: kube_service) }
-  let(:ingress) { [{ ip: '111.222.111.222' }] }
-  let(:exclusive_lease) { instance_double(Gitlab::ExclusiveLease, try_obtain: true) }
 
   before do
     allow(application.cluster).to receive(:kubeclient).and_return(kubeclient)
@@ -28,10 +30,10 @@ describe Clusters::Applications::CheckIngressIpAddressService do
 
   describe '#execute' do
     context 'when the ingress ip address is available' do
-      it 'updates the external_ip for the app and does not schedule another worker' do
-        expect(ClusterWaitForIngressIpAddressWorker).not_to receive(:perform_in)
+      it { is_expected.to eq(true) }
 
-        service.execute(1)
+      it 'updates the external_ip for the app' do
+        subject
 
         expect(application.external_ip).to eq('111.222.111.222')
       end
@@ -40,21 +42,7 @@ describe Clusters::Applications::CheckIngressIpAddressService do
     context 'when the ingress ip address is not available' do
       let(:ingress) { nil }
 
-      it 'it schedules another worker with 1 less retry' do
-        expect(ClusterWaitForIngressIpAddressWorker)
-          .to receive(:perform_in)
-          .with(ClusterWaitForIngressIpAddressWorker::INTERVAL, 'ingress', application.id, 0)
-
-        service.execute(1)
-      end
-
-      context 'when no more retries remaining' do
-        it 'does not schedule another worker' do
-          expect(ClusterWaitForIngressIpAddressWorker).not_to receive(:perform_in)
-
-          service.execute(0)
-        end
-      end
+      it { is_expected.to eq(false) }
     end
 
     context 'when the exclusive lease cannot be obtained' do
@@ -64,22 +52,24 @@ describe Clusters::Applications::CheckIngressIpAddressService do
           .and_return(false)
       end
 
+      it { is_expected.to eq(true) }
+
       it 'does not call kubeclient' do
-        expect(kubeclient).not_to receive(:get_service)
+        subject
 
-        service.execute(1)
+        expect(kubeclient).not_to have_received(:get_service)
       end
     end
 
     context 'when there is already an external_ip' do
       let(:application) { create(:clusters_applications_ingress, :installed, external_ip: '001.111.002.111') }
 
-      it 'does nothing' do
-        expect(kubeclient).not_to receive(:get_service)
+      it { is_expected.to eq(true) }
 
-        service.execute(1)
+      it 'does not call kubeclient' do
+        subject
 
-        expect(application.external_ip).to eq('001.111.002.111')
+        expect(kubeclient).not_to have_received(:get_service)
       end
     end
 
@@ -88,12 +78,9 @@ describe Clusters::Applications::CheckIngressIpAddressService do
         allow(kubeclient).to receive(:get_service).and_raise(KubeException.new(500, 'something blew up', nil))
       end
 
-      it 'it schedules another worker with 1 less retry' do
-        expect(ClusterWaitForIngressIpAddressWorker)
-          .to receive(:perform_in)
-          .with(ClusterWaitForIngressIpAddressWorker::INTERVAL, 'ingress', application.id, 0)
-
-        service.execute(1)
+      it 'it raises Clusters::Applications::CheckIngressIpAddressServiceError' do
+        expect { subject }
+          .to raise_error(Clusters::Applications::CheckIngressIpAddressService::Error, "KubeException: something blew up")
       end
     end
   end
diff --git a/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb b/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb
index 9f8bf35f604..aea924c6dd6 100644
--- a/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb
+++ b/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb
@@ -2,19 +2,94 @@ require 'spec_helper'
 
 describe ClusterWaitForIngressIpAddressWorker do
   describe '#perform' do
-    let(:service) { instance_double(Clusters::Applications::CheckIngressIpAddressService) }
+    let(:service) { instance_double(Clusters::Applications::CheckIngressIpAddressService, execute: true) }
     let(:application) { instance_double(Clusters::Applications::Ingress) }
     let(:worker) { described_class.new }
 
-    it 'finds the application and calls CheckIngressIpAddressService#execute' do
-      expect(worker).to receive(:find_application).with('ingress', 117).and_yield(application)
-      expect(Clusters::Applications::CheckIngressIpAddressService)
+    before do
+      allow(worker)
+        .to receive(:find_application)
+        .with('ingress', 117)
+        .and_yield(application)
+
+      allow(Clusters::Applications::CheckIngressIpAddressService)
         .to receive(:new)
         .with(application)
         .and_return(service)
-      expect(service).to receive(:execute).with(2)
 
+      allow(described_class)
+        .to receive(:perform_in)
+    end
+
+    it 'finds the application and calls CheckIngressIpAddressService#execute' do
       worker.perform('ingress', 117, 2)
+
+      expect(service).to have_received(:execute)
+    end
+
+    context 'when the service succeeds' do
+      it 'does not schedule another worker' do
+        worker.perform('ingress', 117, 2)
+
+        expect(described_class)
+          .not_to have_received(:perform_in)
+      end
+    end
+
+    context 'when the service fails' do
+      before do
+        allow(service)
+          .to receive(:execute)
+          .and_return(false)
+      end
+
+      context 'when there are retries remaining' do
+        it 'schedules another worker with 1 less retry' do
+          worker.perform('ingress', 117, 2)
+
+          expect(described_class)
+            .to have_received(:perform_in)
+            .with(ClusterWaitForIngressIpAddressWorker::INTERVAL, 'ingress', 117, 1)
+        end
+      end
+
+      context 'when there are no retries_remaining' do
+        it 'does not schedule another worker' do
+          worker.perform('ingress', 117, 0)
+
+          expect(described_class)
+            .not_to have_received(:perform_in)
+        end
+      end
+    end
+
+    context 'when the update raises exception' do
+      before do
+        allow(service)
+          .to receive(:execute)
+          .and_raise(Clusters::Applications::CheckIngressIpAddressService::Error, "something went wrong")
+      end
+
+      context 'when there are retries remaining' do
+        it 'schedules another worker with 1 less retry and re-raises the error' do
+          expect { worker.perform('ingress', 117, 2) }
+            .to raise_error(Clusters::Applications::CheckIngressIpAddressService::Error, "something went wrong")
+
+          expect(described_class)
+            .to have_received(:perform_in)
+            .with(ClusterWaitForIngressIpAddressWorker::INTERVAL, 'ingress', 117, 1)
+        end
+      end
+
+      context 'when there are no retries_remaining' do
+        it 'does not schedule another worker but re-raises the error' do
+          expect { worker.perform('ingress', 117, 0) }
+            .to raise_error(Clusters::Applications::CheckIngressIpAddressService::Error, "something went wrong")
+
+          expect(described_class)
+            .not_to have_received(:perform_in)
+        end
+      end
     end
   end
 end
-- 
cgit v1.2.1


From 3d3d09fa9d0ea81f0e20037f64bd43b0cd1e5891 Mon Sep 17 00:00:00 2001
From: Dylan Griffith <dyl.griffith@gmail.com>
Date: Tue, 20 Feb 2018 13:49:35 +1100
Subject: Schedule Ingress IP address fetch from K8s after clusters page load
 (#42643)

---
 app/controllers/projects/clusters_controller.rb    |  5 ++++
 app/models/clusters/applications/ingress.rb        |  8 ++++++
 app/models/clusters/concerns/application_core.rb   |  5 ++++
 .../projects/clusters_controller_spec.rb           |  6 +++++
 spec/models/clusters/applications/ingress_spec.rb  | 29 ++++++++++++++++++++++
 5 files changed, 53 insertions(+)

diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb
index 142e8b6e4bc..c351caeeb7b 100644
--- a/app/controllers/projects/clusters_controller.rb
+++ b/app/controllers/projects/clusters_controller.rb
@@ -4,6 +4,7 @@ class Projects::ClustersController < Projects::ApplicationController
   before_action :authorize_create_cluster!, only: [:new]
   before_action :authorize_update_cluster!, only: [:update]
   before_action :authorize_admin_cluster!, only: [:destroy]
+  before_action :sync_application_details, only: [:status]
 
   STATUS_POLLING_INTERVAL = 10_000
 
@@ -114,4 +115,8 @@ class Projects::ClustersController < Projects::ApplicationController
   def authorize_admin_cluster!
     access_denied! unless can?(current_user, :admin_cluster, cluster)
   end
+
+  def sync_application_details
+    @cluster.applications.each(&:sync_details)
+  end
 end
diff --git a/app/models/clusters/applications/ingress.rb b/app/models/clusters/applications/ingress.rb
index 418ce7d1504..e36fe9019c2 100644
--- a/app/models/clusters/applications/ingress.rb
+++ b/app/models/clusters/applications/ingress.rb
@@ -36,6 +36,14 @@ module Clusters
       def install_command
         Gitlab::Kubernetes::Helm::InstallCommand.new(name, chart: chart, chart_values_file: chart_values_file)
       end
+
+      def sync_details
+        return unless installed?
+        return if external_ip
+
+        ClusterWaitForIngressIpAddressWorker.perform_in(
+          ClusterWaitForIngressIpAddressWorker::INTERVAL, name, id, IP_ADDRESS_FETCH_RETRIES)
+      end
     end
   end
 end
diff --git a/app/models/clusters/concerns/application_core.rb b/app/models/clusters/concerns/application_core.rb
index a98fa85a5ff..44b0fca3d01 100644
--- a/app/models/clusters/concerns/application_core.rb
+++ b/app/models/clusters/concerns/application_core.rb
@@ -23,6 +23,11 @@ module Clusters
         def name
           self.class.application_name
         end
+
+        def sync_details
+          # Override if you need extra data synchronized
+          # from K8s after installation
+        end
       end
     end
   end
diff --git a/spec/controllers/projects/clusters_controller_spec.rb b/spec/controllers/projects/clusters_controller_spec.rb
index 954fc79f57d..617c1471239 100644
--- a/spec/controllers/projects/clusters_controller_spec.rb
+++ b/spec/controllers/projects/clusters_controller_spec.rb
@@ -91,6 +91,12 @@ describe Projects::ClustersController do
         expect(response).to have_gitlab_http_status(:ok)
         expect(response).to match_response_schema('cluster_status')
       end
+
+      it 'invokes sync_details on each application' do
+        expect_any_instance_of(Clusters::Applications::Ingress).to receive(:sync_details)
+
+        go
+      end
     end
 
     describe 'security' do
diff --git a/spec/models/clusters/applications/ingress_spec.rb b/spec/models/clusters/applications/ingress_spec.rb
index c8109bf3cf6..ced5a4ee4d5 100644
--- a/spec/models/clusters/applications/ingress_spec.rb
+++ b/spec/models/clusters/applications/ingress_spec.rb
@@ -22,4 +22,33 @@ describe Clusters::Applications::Ingress do
         .with(ClusterWaitForIngressIpAddressWorker::INTERVAL, 'ingress', application.id, 3)
     end
   end
+
+  describe '#sync_details' do
+    let(:application) { create(:clusters_applications_ingress, :installed) }
+
+    before do
+      application.sync_details
+    end
+
+    it 'schedules a ClusterWaitForIngressIpAddressWorker' do
+      expect(ClusterWaitForIngressIpAddressWorker).to have_received(:perform_in)
+        .with(ClusterWaitForIngressIpAddressWorker::INTERVAL, 'ingress', application.id, 3)
+    end
+
+    context 'when the application is not installed' do
+      let(:application) { create(:clusters_applications_ingress, :installing) }
+
+      it 'does not schedule a ClusterWaitForIngressIpAddressWorker' do
+        expect(ClusterWaitForIngressIpAddressWorker).not_to have_received(:perform_in)
+      end
+    end
+
+    context 'when there is already an external_ip' do
+      let(:application) { create(:clusters_applications_ingress, :installed, external_ip: '111.222.222.111') }
+
+      it 'does not schedule a ClusterWaitForIngressIpAddressWorker' do
+        expect(ClusterWaitForIngressIpAddressWorker).not_to have_received(:perform_in)
+      end
+    end
+  end
 end
-- 
cgit v1.2.1


From 7efb28515f4d25120638a7025ebb26afc6114975 Mon Sep 17 00:00:00 2001
From: Dylan Griffith <dyl.griffith@gmail.com>
Date: Tue, 20 Feb 2018 14:47:00 +1100
Subject: Update feature spec for kubernetes applications ingress IP address
 (#42643)

---
 spec/features/projects/clusters/applications_spec.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/spec/features/projects/clusters/applications_spec.rb b/spec/features/projects/clusters/applications_spec.rb
index 8d1e10b7191..b984bdb5803 100644
--- a/spec/features/projects/clusters/applications_spec.rb
+++ b/spec/features/projects/clusters/applications_spec.rb
@@ -72,6 +72,7 @@ feature 'Clusters Applications', :js do
         context 'when user installs application: Ingress' do
           before do
             allow(ClusterInstallAppWorker).to receive(:perform_async).and_return(nil)
+            allow(ClusterWaitForIngressIpAddressWorker).to receive(:perform_in)
 
             create(:clusters_applications_helm, :installed, cluster: cluster)
 
@@ -92,10 +93,19 @@ feature 'Clusters Applications', :js do
               expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
               expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installing')
 
+              # The application becomes installed but we keep waiting for external IP address
               Clusters::Cluster.last.application_ingress.make_installed!
 
               expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
               expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installed')
+              expect(page).to have_selector('.js-no-ip-message')
+              expect(page.find(:css, 'input#ipAddress')['placeholder']).to eq('?')
+
+              # We receive the external IP address and display
+              Clusters::Cluster.last.application_ingress.update!(external_ip: '192.168.1.100')
+
+              expect(page).not_to have_selector('.js-no-ip-message')
+              expect(page.find(:css, 'input#ipAddress')['placeholder']).to eq('192.168.1.100')
             end
 
             expect(page).to have_content('Ingress was successfully installed on your Kubernetes cluster')
-- 
cgit v1.2.1


From 3619c9174558bd2b2ae625ac6db480c437eb8484 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 20 Feb 2018 12:44:20 +0000
Subject: Adds missing links, uses value instead of placeholder in input field
 and properly sets the ip key

---
 app/assets/javascripts/clusters/clusters_bundle.js |  4 +++-
 .../clusters/components/application_row.vue        |  5 +----
 .../clusters/components/applications.vue           | 26 ++++++++++++++--------
 .../javascripts/clusters/stores/clusters_store.js  |  9 +++++++-
 app/views/projects/clusters/show.html.haml         |  1 +
 .../clusters/components/applications_spec.js       |  5 ++---
 spec/javascripts/clusters/services/mock_data.js    |  1 +
 .../clusters/stores/clusters_store_spec.js         |  1 +
 8 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js
index b070a59cf15..01aec4f36af 100644
--- a/app/assets/javascripts/clusters/clusters_bundle.js
+++ b/app/assets/javascripts/clusters/clusters_bundle.js
@@ -37,10 +37,11 @@ export default class Clusters {
       clusterStatusReason,
       helpPath,
       ingressHelpPath,
+      ingressDnsHelpPath,
     } = document.querySelector('.js-edit-cluster-form').dataset;
 
     this.store = new ClustersStore();
-    this.store.setHelpPaths(helpPath, ingressHelpPath);
+    this.store.setHelpPaths(helpPath, ingressHelpPath, ingressDnsHelpPath);
     this.store.setManagePrometheusPath(managePrometheusPath);
     this.store.updateStatus(clusterStatus);
     this.store.updateStatusReason(clusterStatusReason);
@@ -98,6 +99,7 @@ export default class Clusters {
             helpPath: this.state.helpPath,
             ingressHelpPath: this.state.ingressHelpPath,
             managePrometheusPath: this.state.managePrometheusPath,
+            ingressDnsHelpPath: this.state.ingressDnsHelpPath,
           },
         });
       },
diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue
index 428a762a9c8..c2a35341eb2 100644
--- a/app/assets/javascripts/clusters/components/application_row.vue
+++ b/app/assets/javascripts/clusters/components/application_row.vue
@@ -148,10 +148,7 @@
       </div>
       <div
         class="table-section table-button-footer section-align-top"
-        :class="{
-          'section-20': showManageButton,
-          'section-15': !showManageButton,
-        }"
+        :class="{ 'section-20': showManageButton, 'section-15': !showManageButton }"
         role="gridcell"
       >
         <div
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index 69178cb0162..6490cd6ff47 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -28,6 +28,11 @@
         required: false,
         default: '',
       },
+      ingressDnsHelpPath: {
+        type: String,
+        required: false,
+        default: '',
+      },
       managePrometheusPath: {
         type: String,
         required: false,
@@ -51,6 +56,9 @@
       ingressInstalled() {
         return this.applications.ingress.status === APPLICATION_INSTALLED;
       },
+      ingressExternalIp() {
+        return this.applications.ingress.externalIp;
+      },
       ingressDescription() {
         const extraCostParagraph = sprintf(
           _.escape(s__(
@@ -165,19 +173,19 @@
                   {{ s__("ClusterIntegration| Ingress IP Address") }}
                 </label>
                 <div
-                  v-if="applications.ingress.external_ip"
+                  v-if="ingressExternalIp"
                   class="input-group"
                 >
                   <input
                     type="text"
                     id="ipAddress"
-                    class="form-control js-select-on-focus"
-                    :placeholder="applications.ingress.external_ip"
+                    class="form-control"
+                    :placeholder="ingressExternalIp"
                     readonly
                   />
                   <span class="input-group-btn">
                     <clipboard-button
-                      :text="applications.ingress.external_ip"
+                      :text="ingressExternalIp"
                       :title="s__('ClusterIntegration|Copy Ingress IP Address')"
                       css-class="btn btn-default js-clipboard-btn"
                     />
@@ -194,14 +202,14 @@
               </div>
 
               <p
-                v-if="!applications.ingress.external_ip"
+                v-if="!ingressExternalIp"
                 class="settings-message js-no-ip-message"
               >
-                {{ s__(`ClusterIntegration|The IP address is in process
-                to be assigned, please check your Kubernetes
+                {{ s__(`ClusterIntegration|The IP address is still in
+                the process of being assigned, please check your Kubernetes
                 cluster or Quotas on GKE if it takes a long time.`) }}
                 <a
-                  href="TODO"
+                  :href="ingressHelpPath"
                   target="_blank"
                   rel="noopener noreferrer"
                 >
@@ -214,7 +222,7 @@
                 generated IP address in order to access
                 your application after it has been deployed.`) }}
                 <a
-                  href="TODO"
+                  :href="ingressDnsHelpPath"
                   target="_blank"
                   rel="noopener noreferrer"
                 >
diff --git a/app/assets/javascripts/clusters/stores/clusters_store.js b/app/assets/javascripts/clusters/stores/clusters_store.js
index 904ee5fd475..e0a15348e42 100644
--- a/app/assets/javascripts/clusters/stores/clusters_store.js
+++ b/app/assets/javascripts/clusters/stores/clusters_store.js
@@ -21,6 +21,7 @@ export default class ClusterStore {
           statusReason: null,
           requestStatus: null,
           requestReason: null,
+          externalIp: null,
         },
         runner: {
           title: s__('ClusterIntegration|GitLab Runner'),
@@ -40,9 +41,10 @@ export default class ClusterStore {
     };
   }
 
-  setHelpPaths(helpPath, ingressHelpPath) {
+  setHelpPaths(helpPath, ingressHelpPath, ingressDnsHelpPath) {
     this.state.helpPath = helpPath;
     this.state.ingressHelpPath = ingressHelpPath;
+    this.state.ingressDnsHelpPath = ingressDnsHelpPath;
   }
 
   setManagePrometheusPath(managePrometheusPath) {
@@ -64,6 +66,7 @@ export default class ClusterStore {
   updateStateFromServer(serverState = {}) {
     this.state.status = serverState.status;
     this.state.statusReason = serverState.status_reason;
+
     serverState.applications.forEach((serverAppEntry) => {
       const {
         name: appId,
@@ -76,6 +79,10 @@ export default class ClusterStore {
         status,
         statusReason,
       };
+
+      if (appId === 'ingress') {
+        this.state.applications.ingress.externalIp = serverAppEntry.external_ip;
+      }
     });
   }
 }
diff --git a/app/views/projects/clusters/show.html.haml b/app/views/projects/clusters/show.html.haml
index 2b1b23ba198..179c45a9867 100644
--- a/app/views/projects/clusters/show.html.haml
+++ b/app/views/projects/clusters/show.html.haml
@@ -15,6 +15,7 @@
   cluster_status_reason: @cluster.status_reason,
   help_path: help_page_path('user/project/clusters/index.md', anchor: 'installing-applications'),
   ingress_help_path: help_page_path('user/project/clusters/index.md', anchor: 'getting-the-external-ip-address'),
+  ingress_dns_help_path: help_page_path('topics/autodevops/quick_start_guide.md', anchor: 'point-dns-at-cluster-ip'),
   manage_prometheus_path: edit_project_service_path(@cluster.project, 'prometheus') } }
 
   .js-cluster-application-notice
diff --git a/spec/javascripts/clusters/components/applications_spec.js b/spec/javascripts/clusters/components/applications_spec.js
index d055679aea8..9bd47aea7f9 100644
--- a/spec/javascripts/clusters/components/applications_spec.js
+++ b/spec/javascripts/clusters/components/applications_spec.js
@@ -54,14 +54,13 @@ describe('Applications', () => {
               ingress: {
                 title: 'Ingress',
                 status: 'installed',
-                external_ip: '0.0.0.0',
+                externalIp: '0.0.0.0',
               },
               helm: { title: 'Helm Tiller' },
               runner: { title: 'GitLab Runner' },
               prometheus: { title: 'Prometheus' },
             },
           });
-
           expect(
             vm.$el.querySelector('#ipAddress').getAttribute('placeholder'),
           ).toEqual('0.0.0.0');
@@ -92,7 +91,7 @@ describe('Applications', () => {
           expect(
             vm.$el.querySelector('.js-no-ip-message').textContent.replace(/\n(\s)+/g, ' ').trim(),
           ).toEqual(
-            'The IP address is in process to be assigned, please check your Kubernetes cluster or Quotas on GKE if it takes a long time. More information',
+            'The IP address is still in the process of being assigned, please check your Kubernetes cluster or Quotas on GKE if it takes a long time. More information',
           );
         });
       });
diff --git a/spec/javascripts/clusters/services/mock_data.js b/spec/javascripts/clusters/services/mock_data.js
index 253b3c45243..6ae7a792329 100644
--- a/spec/javascripts/clusters/services/mock_data.js
+++ b/spec/javascripts/clusters/services/mock_data.js
@@ -18,6 +18,7 @@ const CLUSTERS_MOCK_DATA = {
           name: 'ingress',
           status: APPLICATION_ERROR,
           status_reason: 'Cannot connect',
+          external_ip: null,
         }, {
           name: 'runner',
           status: APPLICATION_INSTALLING,
diff --git a/spec/javascripts/clusters/stores/clusters_store_spec.js b/spec/javascripts/clusters/stores/clusters_store_spec.js
index 726a4ed30de..8028faf2f02 100644
--- a/spec/javascripts/clusters/stores/clusters_store_spec.js
+++ b/spec/javascripts/clusters/stores/clusters_store_spec.js
@@ -75,6 +75,7 @@ describe('Clusters Store', () => {
             statusReason: mockResponseData.applications[1].status_reason,
             requestStatus: null,
             requestReason: null,
+            externalIp: null,
           },
           runner: {
             title: 'GitLab Runner',
-- 
cgit v1.2.1


From e1d587f5d6fe76900dd7cce26178464d4455fb8b Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 20 Feb 2018 16:50:14 +0000
Subject: Remove duplicate ID

---
 app/assets/javascripts/clusters/components/applications.vue | 5 ++---
 spec/features/projects/clusters/applications_spec.rb        | 4 ++--
 spec/javascripts/clusters/components/applications_spec.js   | 6 +++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index 6490cd6ff47..bddc8756a1b 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -179,7 +179,7 @@
                   <input
                     type="text"
                     id="ipAddress"
-                    class="form-control"
+                    class="form-control js-ip-address"
                     :placeholder="ingressExternalIp"
                     readonly
                   />
@@ -194,8 +194,7 @@
                 <input
                   v-else
                   type="text"
-                  id="ipAddress"
-                  class="form-control"
+                  class="form-control js-ip-address"
                   readonly
                   placeholder="?"
                 />
diff --git a/spec/features/projects/clusters/applications_spec.rb b/spec/features/projects/clusters/applications_spec.rb
index b984bdb5803..fd322d2eeb4 100644
--- a/spec/features/projects/clusters/applications_spec.rb
+++ b/spec/features/projects/clusters/applications_spec.rb
@@ -99,13 +99,13 @@ feature 'Clusters Applications', :js do
               expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
               expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installed')
               expect(page).to have_selector('.js-no-ip-message')
-              expect(page.find(:css, 'input#ipAddress')['placeholder']).to eq('?')
+              expect(page.find(:css, 'input.js-ip-address')['placeholder']).to eq('?')
 
               # We receive the external IP address and display
               Clusters::Cluster.last.application_ingress.update!(external_ip: '192.168.1.100')
 
               expect(page).not_to have_selector('.js-no-ip-message')
-              expect(page.find(:css, 'input#ipAddress')['placeholder']).to eq('192.168.1.100')
+              expect(page.find(:css, 'input.js-ip-address')['placeholder']).to eq('192.168.1.100')
             end
 
             expect(page).to have_content('Ingress was successfully installed on your Kubernetes cluster')
diff --git a/spec/javascripts/clusters/components/applications_spec.js b/spec/javascripts/clusters/components/applications_spec.js
index 9bd47aea7f9..e3312f62c04 100644
--- a/spec/javascripts/clusters/components/applications_spec.js
+++ b/spec/javascripts/clusters/components/applications_spec.js
@@ -62,7 +62,7 @@ describe('Applications', () => {
             },
           });
           expect(
-            vm.$el.querySelector('#ipAddress').getAttribute('placeholder'),
+            vm.$el.querySelector('.js-ip-address').getAttribute('placeholder'),
           ).toEqual('0.0.0.0');
           expect(
             vm.$el.querySelector('.js-clipboard-btn').getAttribute('data-clipboard-text'),
@@ -85,7 +85,7 @@ describe('Applications', () => {
           });
 
           expect(
-            vm.$el.querySelector('#ipAddress').getAttribute('placeholder'),
+            vm.$el.querySelector('.js-ip-address').getAttribute('placeholder'),
           ).toEqual('?');
 
           expect(
@@ -109,7 +109,7 @@ describe('Applications', () => {
         });
 
         expect(vm.$el.textContent).not.toContain('Ingress IP Address');
-        expect(vm.$el.querySelector('#ipAddress')).toBe(null);
+        expect(vm.$el.querySelector('.js-ip-address')).toBe(null);
       });
     });
   });
-- 
cgit v1.2.1


From 7712b151ebd842ba507f8d4e3a95cf809c03c764 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 20 Feb 2018 17:34:55 +0000
Subject: Remove extra commas from templates

---
 app/assets/javascripts/clusters/components/applications.vue | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index bddc8756a1b..fce2ea14ef9 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -143,10 +143,8 @@
           :request-reason="applications.helm.requestReason"
         >
           <div slot="description">
-            {{ s__(
-              `ClusterIntegration|Helm streamlines installing and managing Kubernetes applications.
-              Tiller runs inside of your Kubernetes Cluster, and manages releases of your charts.`,
-            ) }}
+            {{ s__(`ClusterIntegration|Helm streamlines installing and managing Kubernetes applications.
+              Tiller runs inside of your Kubernetes Cluster, and manages releases of your charts.`) }}
           </div>
         </application-row>
         <application-row
@@ -160,11 +158,9 @@
         >
           <div slot="description">
             <p>
-              {{ s__(
-                `ClusterIntegration|Ingress gives you a way to route
+              {{ s__(`ClusterIntegration|Ingress gives you a way to route
                 requests to services based on the request host or path,
-                centralizing a number of services into a single entrypoint.`,
-              ) }}
+                centralizing a number of services into a single entrypoint.`) }}
             </p>
 
             <template v-if="ingressInstalled">
-- 
cgit v1.2.1


From 9b71f5f444420cadb7f90de7988ed5a1498a3276 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 20 Feb 2018 17:55:43 +0000
Subject: Fix eslint error

---
 app/assets/javascripts/clusters/components/applications.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index fce2ea14ef9..9823a666f8b 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -143,8 +143,10 @@
           :request-reason="applications.helm.requestReason"
         >
           <div slot="description">
-            {{ s__(`ClusterIntegration|Helm streamlines installing and managing Kubernetes applications.
-              Tiller runs inside of your Kubernetes Cluster, and manages releases of your charts.`) }}
+            {{ s__(`ClusterIntegration|Helm streamlines installing
+              and managing Kubernetes applications.
+              Tiller runs inside of your Kubernetes Cluster,
+              and manages releases of your charts.`) }}
           </div>
         </application-row>
         <application-row
-- 
cgit v1.2.1


From 95d8b8ac15d9553ae6785c024575d02f048769c2 Mon Sep 17 00:00:00 2001
From: Dylan Griffith <dyl.griffith@gmail.com>
Date: Wed, 21 Feb 2018 11:50:56 +1100
Subject: Update merge_request in changelog (#17052)

---
 .../unreleased/42643-persist-external-ip-of-ingress-controller-gke.yml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelogs/unreleased/42643-persist-external-ip-of-ingress-controller-gke.yml b/changelogs/unreleased/42643-persist-external-ip-of-ingress-controller-gke.yml
index 8303a5860d6..8002d8feecb 100644
--- a/changelogs/unreleased/42643-persist-external-ip-of-ingress-controller-gke.yml
+++ b/changelogs/unreleased/42643-persist-external-ip-of-ingress-controller-gke.yml
@@ -1,5 +1,5 @@
 ---
 title: Display ingress IP address in the Kubernetes page
-merge_request:
+merge_request: 17052
 author:
 type: fixed
-- 
cgit v1.2.1


From 218e7223de930ff754a4df782ee9c5b5e000af36 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 21 Feb 2018 13:44:07 +0000
Subject: Changes after review

---
 .../javascripts/clusters/components/applications.vue   | 18 +++++++++++-------
 app/assets/javascripts/clusters/constants.js           |  1 +
 .../javascripts/clusters/stores/clusters_store.js      |  3 ++-
 .../clusters/components/applications_spec.js           |  6 +-----
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index 9823a666f8b..84fdcda0c39 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -5,6 +5,7 @@
   import clipboardButton from '../../vue_shared/components/clipboard_button.vue';
   import {
     APPLICATION_INSTALLED,
+    INGRESS,
   } from '../constants';
 
   export default {
@@ -53,6 +54,9 @@
           false,
         );
       },
+      ingressId() {
+        return INGRESS;
+      },
       ingressInstalled() {
         return this.applications.ingress.status === APPLICATION_INSTALLED;
       },
@@ -150,7 +154,7 @@
           </div>
         </application-row>
         <application-row
-          id="ingress"
+          :id="ingressId"
           :title="applications.ingress.title"
           title-link="https://kubernetes.io/docs/concepts/services-networking/ingress/"
           :status="applications.ingress.status"
@@ -167,7 +171,7 @@
 
             <template v-if="ingressInstalled">
               <div class="form-group">
-                <label for="ipAddress">
+                <label for="ingress-ip-address">
                   {{ s__("ClusterIntegration| Ingress IP Address") }}
                 </label>
                 <div
@@ -176,7 +180,7 @@
                 >
                   <input
                     type="text"
-                    id="ipAddress"
+                    id="ingress-ip-address"
                     class="form-control js-ip-address"
                     :placeholder="ingressExternalIp"
                     readonly
@@ -210,7 +214,7 @@
                   target="_blank"
                   rel="noopener noreferrer"
                 >
-                  {{ __("More information") }}
+                  {{ __('More information') }}
                 </a>
               </p>
 
@@ -223,16 +227,16 @@
                   target="_blank"
                   rel="noopener noreferrer"
                 >
-                  {{ __("More information") }}
+                  {{ __('More information') }}
                 </a>
               </p>
 
             </template>
-            <template
+            <div
               v-else
               v-html="ingressDescription"
             >
-            </template>
+            </div>
           </div>
         </application-row>
         <application-row
diff --git a/app/assets/javascripts/clusters/constants.js b/app/assets/javascripts/clusters/constants.js
index 93223aefff8..b7179f52bb3 100644
--- a/app/assets/javascripts/clusters/constants.js
+++ b/app/assets/javascripts/clusters/constants.js
@@ -10,3 +10,4 @@ export const APPLICATION_ERROR = 'errored';
 export const REQUEST_LOADING = 'request-loading';
 export const REQUEST_SUCCESS = 'request-success';
 export const REQUEST_FAILURE = 'request-failure';
+export const INGRESS = 'ingress';
diff --git a/app/assets/javascripts/clusters/stores/clusters_store.js b/app/assets/javascripts/clusters/stores/clusters_store.js
index e0a15348e42..348bbec3b25 100644
--- a/app/assets/javascripts/clusters/stores/clusters_store.js
+++ b/app/assets/javascripts/clusters/stores/clusters_store.js
@@ -1,4 +1,5 @@
 import { s__ } from '../../locale';
+import { INGRESS } from '../constants';
 
 export default class ClusterStore {
   constructor() {
@@ -80,7 +81,7 @@ export default class ClusterStore {
         statusReason,
       };
 
-      if (appId === 'ingress') {
+      if (appId === INGRESS) {
         this.state.applications.ingress.externalIp = serverAppEntry.external_ip;
       }
     });
diff --git a/spec/javascripts/clusters/components/applications_spec.js b/spec/javascripts/clusters/components/applications_spec.js
index e3312f62c04..6e09c829213 100644
--- a/spec/javascripts/clusters/components/applications_spec.js
+++ b/spec/javascripts/clusters/components/applications_spec.js
@@ -88,11 +88,7 @@ describe('Applications', () => {
             vm.$el.querySelector('.js-ip-address').getAttribute('placeholder'),
           ).toEqual('?');
 
-          expect(
-            vm.$el.querySelector('.js-no-ip-message').textContent.replace(/\n(\s)+/g, ' ').trim(),
-          ).toEqual(
-            'The IP address is still in the process of being assigned, please check your Kubernetes cluster or Quotas on GKE if it takes a long time. More information',
-          );
+          expect(vm.$el.querySelector('.js-no-ip-message')).not.toBe(null);
         });
       });
     });
-- 
cgit v1.2.1


From 0103958d6f7cd35828ee7a74dbd984e316e2f1e1 Mon Sep 17 00:00:00 2001
From: Dylan Griffith <dyl.griffith@gmail.com>
Date: Thu, 22 Feb 2018 10:45:58 +1100
Subject: Update changelog 42643-persist-external-ip-of-ingress-controller-gke
 to be feature not bug fix

---
 .../unreleased/42643-persist-external-ip-of-ingress-controller-gke.yml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelogs/unreleased/42643-persist-external-ip-of-ingress-controller-gke.yml b/changelogs/unreleased/42643-persist-external-ip-of-ingress-controller-gke.yml
index 8002d8feecb..35457db82f4 100644
--- a/changelogs/unreleased/42643-persist-external-ip-of-ingress-controller-gke.yml
+++ b/changelogs/unreleased/42643-persist-external-ip-of-ingress-controller-gke.yml
@@ -2,4 +2,4 @@
 title: Display ingress IP address in the Kubernetes page
 merge_request: 17052
 author:
-type: fixed
+type: added
-- 
cgit v1.2.1


From 18b1b5be65e6421b080216e61e27c41be913f802 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 22 Feb 2018 16:38:12 +0000
Subject: Use value attribute in ip input Removes double quoted string

---
 app/assets/javascripts/clusters/components/applications.vue | 6 +++---
 spec/features/projects/clusters/applications_spec.rb        | 4 ++--
 spec/javascripts/clusters/components/applications_spec.js   | 6 ++++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index 84fdcda0c39..386b570d025 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -172,7 +172,7 @@
             <template v-if="ingressInstalled">
               <div class="form-group">
                 <label for="ingress-ip-address">
-                  {{ s__("ClusterIntegration| Ingress IP Address") }}
+                  {{ s__('ClusterIntegration| Ingress IP Address') }}
                 </label>
                 <div
                   v-if="ingressExternalIp"
@@ -182,7 +182,7 @@
                     type="text"
                     id="ingress-ip-address"
                     class="form-control js-ip-address"
-                    :placeholder="ingressExternalIp"
+                    :value="ingressExternalIp"
                     readonly
                   />
                   <span class="input-group-btn">
@@ -198,7 +198,7 @@
                   type="text"
                   class="form-control js-ip-address"
                   readonly
-                  placeholder="?"
+                  value="?"
                 />
               </div>
 
diff --git a/spec/features/projects/clusters/applications_spec.rb b/spec/features/projects/clusters/applications_spec.rb
index fd322d2eeb4..75cf80ba555 100644
--- a/spec/features/projects/clusters/applications_spec.rb
+++ b/spec/features/projects/clusters/applications_spec.rb
@@ -99,13 +99,13 @@ feature 'Clusters Applications', :js do
               expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
               expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installed')
               expect(page).to have_selector('.js-no-ip-message')
-              expect(page.find(:css, 'input.js-ip-address')['placeholder']).to eq('?')
+              expect(page.find('.js-ip-address').value).to eq('?')
 
               # We receive the external IP address and display
               Clusters::Cluster.last.application_ingress.update!(external_ip: '192.168.1.100')
 
               expect(page).not_to have_selector('.js-no-ip-message')
-              expect(page.find(:css, 'input.js-ip-address')['placeholder']).to eq('192.168.1.100')
+              expect(page.find('.js-ip-address').value).to eq('192.168.1.100')
             end
 
             expect(page).to have_content('Ingress was successfully installed on your Kubernetes cluster')
diff --git a/spec/javascripts/clusters/components/applications_spec.js b/spec/javascripts/clusters/components/applications_spec.js
index 6e09c829213..51c2a7e76c5 100644
--- a/spec/javascripts/clusters/components/applications_spec.js
+++ b/spec/javascripts/clusters/components/applications_spec.js
@@ -61,9 +61,11 @@ describe('Applications', () => {
               prometheus: { title: 'Prometheus' },
             },
           });
+
           expect(
-            vm.$el.querySelector('.js-ip-address').getAttribute('placeholder'),
+            vm.$el.querySelector('.js-ip-address').value,
           ).toEqual('0.0.0.0');
+
           expect(
             vm.$el.querySelector('.js-clipboard-btn').getAttribute('data-clipboard-text'),
           ).toEqual('0.0.0.0');
@@ -85,7 +87,7 @@ describe('Applications', () => {
           });
 
           expect(
-            vm.$el.querySelector('.js-ip-address').getAttribute('placeholder'),
+            vm.$el.querySelector('.js-ip-address').value,
           ).toEqual('?');
 
           expect(vm.$el.querySelector('.js-no-ip-message')).not.toBe(null);
-- 
cgit v1.2.1


From 17e85dacdd73b51a173d1f4c5efea5e20ee8c55b Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 22 Feb 2018 17:01:50 +0000
Subject: Improve grammar in IP sentence

---
 app/assets/javascripts/clusters/components/applications.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index 386b570d025..780c335cd37 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -206,9 +206,10 @@
                 v-if="!ingressExternalIp"
                 class="settings-message js-no-ip-message"
               >
-                {{ s__(`ClusterIntegration|The IP address is still in
-                the process of being assigned, please check your Kubernetes
+                {{ s__(`ClusterIntegration|The IP address is in
+                the process of being assigned. Please check your Kubernetes
                 cluster or Quotas on GKE if it takes a long time.`) }}
+
                 <a
                   :href="ingressHelpPath"
                   target="_blank"
-- 
cgit v1.2.1


From 3b320d675fe058311d921e26cd89b2e703310b21 Mon Sep 17 00:00:00 2001
From: Dylan Griffith <dyl.griffith@gmail.com>
Date: Fri, 23 Feb 2018 09:08:12 +1100
Subject: Simplify retrying for ClusterWaitForIngressIpAddressWorker and style
 changes

(#42643)
---
 app/controllers/projects/clusters_controller.rb    |  6 +-
 app/models/clusters/applications/ingress.rb        |  6 +-
 app/models/clusters/concerns/application_core.rb   |  2 +-
 .../check_ingress_ip_address_service.rb            | 27 ++++-----
 .../cluster_wait_for_ingress_ip_address_worker.rb  | 16 +-----
 spec/models/clusters/applications/ingress_spec.rb  | 11 ++--
 .../check_ingress_ip_address_service_spec.rb       | 24 ++------
 ...ster_wait_for_ingress_ip_address_worker_spec.rb | 65 ----------------------
 8 files changed, 31 insertions(+), 126 deletions(-)

diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb
index c351caeeb7b..aeaba3a0acf 100644
--- a/app/controllers/projects/clusters_controller.rb
+++ b/app/controllers/projects/clusters_controller.rb
@@ -4,7 +4,7 @@ class Projects::ClustersController < Projects::ApplicationController
   before_action :authorize_create_cluster!, only: [:new]
   before_action :authorize_update_cluster!, only: [:update]
   before_action :authorize_admin_cluster!, only: [:destroy]
-  before_action :sync_application_details, only: [:status]
+  before_action :update_applications_status, only: [:status]
 
   STATUS_POLLING_INTERVAL = 10_000
 
@@ -116,7 +116,7 @@ class Projects::ClustersController < Projects::ApplicationController
     access_denied! unless can?(current_user, :admin_cluster, cluster)
   end
 
-  def sync_application_details
-    @cluster.applications.each(&:sync_details)
+  def update_applications_status
+    @cluster.applications.each(&:schedule_status_update)
   end
 end
diff --git a/app/models/clusters/applications/ingress.rb b/app/models/clusters/applications/ingress.rb
index e36fe9019c2..57ced0f5c44 100644
--- a/app/models/clusters/applications/ingress.rb
+++ b/app/models/clusters/applications/ingress.rb
@@ -37,12 +37,12 @@ module Clusters
         Gitlab::Kubernetes::Helm::InstallCommand.new(name, chart: chart, chart_values_file: chart_values_file)
       end
 
-      def sync_details
+      def schedule_status_update
         return unless installed?
         return if external_ip
 
-        ClusterWaitForIngressIpAddressWorker.perform_in(
-          ClusterWaitForIngressIpAddressWorker::INTERVAL, name, id, IP_ADDRESS_FETCH_RETRIES)
+        ClusterWaitForIngressIpAddressWorker.perform_async(
+          name, id, IP_ADDRESS_FETCH_RETRIES)
       end
     end
   end
diff --git a/app/models/clusters/concerns/application_core.rb b/app/models/clusters/concerns/application_core.rb
index 44b0fca3d01..623b836c0ed 100644
--- a/app/models/clusters/concerns/application_core.rb
+++ b/app/models/clusters/concerns/application_core.rb
@@ -24,7 +24,7 @@ module Clusters
           self.class.application_name
         end
 
-        def sync_details
+        def schedule_status_update
           # Override if you need extra data synchronized
           # from K8s after installation
         end
diff --git a/app/services/clusters/applications/check_ingress_ip_address_service.rb b/app/services/clusters/applications/check_ingress_ip_address_service.rb
index 300b7ed522c..a98e05b25cb 100644
--- a/app/services/clusters/applications/check_ingress_ip_address_service.rb
+++ b/app/services/clusters/applications/check_ingress_ip_address_service.rb
@@ -1,24 +1,17 @@
 module Clusters
   module Applications
     class CheckIngressIpAddressService < BaseHelmService
+      include Gitlab::Utils::StrongMemoize
+
       Error = Class.new(StandardError)
 
       LEASE_TIMEOUT = 3.seconds.to_i
 
       def execute
-        return true if app.external_ip
-        return true unless try_obtain_lease
-
-        service = get_service
+        return if app.external_ip
+        return unless try_obtain_lease
 
-        if service.status.loadBalancer.ingress
-          resolve_external_ip(service)
-        else
-          false
-        end
-
-      rescue KubeException => e
-        raise Error, "#{e.class}: #{e.message}"
+        app.update!(external_ip: ingress_ip) if ingress_ip
       end
 
       private
@@ -29,12 +22,14 @@ module Clusters
           .try_obtain
       end
 
-      def resolve_external_ip(service)
-        app.update!(external_ip: service.status.loadBalancer.ingress[0].ip)
+      def ingress_ip
+        service.status.loadBalancer.ingress&.first&.ip
       end
 
-      def get_service
-        kubeclient.get_service('ingress-nginx-ingress-controller', Gitlab::Kubernetes::Helm::NAMESPACE)
+      def service
+        strong_memoize(:ingress_service) do
+          kubeclient.get_service('ingress-nginx-ingress-controller', Gitlab::Kubernetes::Helm::NAMESPACE)
+        end
       end
     end
   end
diff --git a/app/workers/cluster_wait_for_ingress_ip_address_worker.rb b/app/workers/cluster_wait_for_ingress_ip_address_worker.rb
index 0fbb9fb2526..72b3c8b49e0 100644
--- a/app/workers/cluster_wait_for_ingress_ip_address_worker.rb
+++ b/app/workers/cluster_wait_for_ingress_ip_address_worker.rb
@@ -3,23 +3,11 @@ class ClusterWaitForIngressIpAddressWorker
   include ClusterQueue
   include ClusterApplications
 
-  INTERVAL = 10.seconds
+  INTERVAL = 30.seconds
 
   def perform(app_name, app_id, retries_remaining)
     find_application(app_name, app_id) do |app|
-      result = Clusters::Applications::CheckIngressIpAddressService.new(app).execute
-      retry_if_necessary(app_name, app_id, retries_remaining) unless result
-    end
-  rescue Clusters::Applications::CheckIngressIpAddressService::Error => e
-    retry_if_necessary(app_name, app_id, retries_remaining)
-    raise e
-  end
-
-  private
-
-  def retry_if_necessary(app_name, app_id, retries_remaining)
-    if retries_remaining > 0
-      self.class.perform_in(INTERVAL, app_name, app_id, retries_remaining - 1)
+      Clusters::Applications::CheckIngressIpAddressService.new(app).execute
     end
   end
 end
diff --git a/spec/models/clusters/applications/ingress_spec.rb b/spec/models/clusters/applications/ingress_spec.rb
index ced5a4ee4d5..80c450c30cb 100644
--- a/spec/models/clusters/applications/ingress_spec.rb
+++ b/spec/models/clusters/applications/ingress_spec.rb
@@ -6,6 +6,7 @@ describe Clusters::Applications::Ingress do
 
   before do
     allow(ClusterWaitForIngressIpAddressWorker).to receive(:perform_in)
+    allow(ClusterWaitForIngressIpAddressWorker).to receive(:perform_async)
   end
 
   include_examples 'cluster application specs', described_class
@@ -23,23 +24,23 @@ describe Clusters::Applications::Ingress do
     end
   end
 
-  describe '#sync_details' do
+  describe '#schedule_status_update' do
     let(:application) { create(:clusters_applications_ingress, :installed) }
 
     before do
-      application.sync_details
+      application.schedule_status_update
     end
 
     it 'schedules a ClusterWaitForIngressIpAddressWorker' do
-      expect(ClusterWaitForIngressIpAddressWorker).to have_received(:perform_in)
-        .with(ClusterWaitForIngressIpAddressWorker::INTERVAL, 'ingress', application.id, 3)
+      expect(ClusterWaitForIngressIpAddressWorker).to have_received(:perform_async)
+        .with('ingress', application.id, 3)
     end
 
     context 'when the application is not installed' do
       let(:application) { create(:clusters_applications_ingress, :installing) }
 
       it 'does not schedule a ClusterWaitForIngressIpAddressWorker' do
-        expect(ClusterWaitForIngressIpAddressWorker).not_to have_received(:perform_in)
+        expect(ClusterWaitForIngressIpAddressWorker).not_to have_received(:perform_async)
       end
     end
 
diff --git a/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb b/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb
index a9915493d42..e14c82d32d4 100644
--- a/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb
+++ b/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Clusters::Applications::CheckIngressIpAddressService do
-  subject { service.execute }
   let(:application) { create(:clusters_applications_ingress, :installed) }
   let(:service) { described_class.new(application) }
   let(:kubeclient) { double(::Kubeclient::Client, get_service: kube_service) }
@@ -20,6 +19,8 @@ describe Clusters::Applications::CheckIngressIpAddressService do
     )
   end
 
+  subject { service.execute }
+
   before do
     allow(application.cluster).to receive(:kubeclient).and_return(kubeclient)
     allow(Gitlab::ExclusiveLease)
@@ -30,8 +31,6 @@ describe Clusters::Applications::CheckIngressIpAddressService do
 
   describe '#execute' do
     context 'when the ingress ip address is available' do
-      it { is_expected.to eq(true) }
-
       it 'updates the external_ip for the app' do
         subject
 
@@ -42,7 +41,9 @@ describe Clusters::Applications::CheckIngressIpAddressService do
     context 'when the ingress ip address is not available' do
       let(:ingress) { nil }
 
-      it { is_expected.to eq(false) }
+      it 'does not error' do
+        subject
+      end
     end
 
     context 'when the exclusive lease cannot be obtained' do
@@ -52,8 +53,6 @@ describe Clusters::Applications::CheckIngressIpAddressService do
           .and_return(false)
       end
 
-      it { is_expected.to eq(true) }
-
       it 'does not call kubeclient' do
         subject
 
@@ -64,24 +63,11 @@ describe Clusters::Applications::CheckIngressIpAddressService do
     context 'when there is already an external_ip' do
       let(:application) { create(:clusters_applications_ingress, :installed, external_ip: '001.111.002.111') }
 
-      it { is_expected.to eq(true) }
-
       it 'does not call kubeclient' do
         subject
 
         expect(kubeclient).not_to have_received(:get_service)
       end
     end
-
-    context 'when a kubernetes error occurs' do
-      before do
-        allow(kubeclient).to receive(:get_service).and_raise(KubeException.new(500, 'something blew up', nil))
-      end
-
-      it 'it raises Clusters::Applications::CheckIngressIpAddressServiceError' do
-        expect { subject }
-          .to raise_error(Clusters::Applications::CheckIngressIpAddressService::Error, "KubeException: something blew up")
-      end
-    end
   end
 end
diff --git a/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb b/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb
index aea924c6dd6..baa295984bf 100644
--- a/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb
+++ b/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb
@@ -26,70 +26,5 @@ describe ClusterWaitForIngressIpAddressWorker do
 
       expect(service).to have_received(:execute)
     end
-
-    context 'when the service succeeds' do
-      it 'does not schedule another worker' do
-        worker.perform('ingress', 117, 2)
-
-        expect(described_class)
-          .not_to have_received(:perform_in)
-      end
-    end
-
-    context 'when the service fails' do
-      before do
-        allow(service)
-          .to receive(:execute)
-          .and_return(false)
-      end
-
-      context 'when there are retries remaining' do
-        it 'schedules another worker with 1 less retry' do
-          worker.perform('ingress', 117, 2)
-
-          expect(described_class)
-            .to have_received(:perform_in)
-            .with(ClusterWaitForIngressIpAddressWorker::INTERVAL, 'ingress', 117, 1)
-        end
-      end
-
-      context 'when there are no retries_remaining' do
-        it 'does not schedule another worker' do
-          worker.perform('ingress', 117, 0)
-
-          expect(described_class)
-            .not_to have_received(:perform_in)
-        end
-      end
-    end
-
-    context 'when the update raises exception' do
-      before do
-        allow(service)
-          .to receive(:execute)
-          .and_raise(Clusters::Applications::CheckIngressIpAddressService::Error, "something went wrong")
-      end
-
-      context 'when there are retries remaining' do
-        it 'schedules another worker with 1 less retry and re-raises the error' do
-          expect { worker.perform('ingress', 117, 2) }
-            .to raise_error(Clusters::Applications::CheckIngressIpAddressService::Error, "something went wrong")
-
-          expect(described_class)
-            .to have_received(:perform_in)
-            .with(ClusterWaitForIngressIpAddressWorker::INTERVAL, 'ingress', 117, 1)
-        end
-      end
-
-      context 'when there are no retries_remaining' do
-        it 'does not schedule another worker but re-raises the error' do
-          expect { worker.perform('ingress', 117, 0) }
-            .to raise_error(Clusters::Applications::CheckIngressIpAddressService::Error, "something went wrong")
-
-          expect(described_class)
-            .not_to have_received(:perform_in)
-        end
-      end
-    end
   end
 end
-- 
cgit v1.2.1


From 69adf79234b586867eab8d0d130aff0083b7ef93 Mon Sep 17 00:00:00 2001
From: Dylan Griffith <dyl.griffith@gmail.com>
Date: Fri, 23 Feb 2018 10:31:19 +1100
Subject: Fix clusters_controller_spec (#42643)

---
 spec/controllers/projects/clusters_controller_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/controllers/projects/clusters_controller_spec.rb b/spec/controllers/projects/clusters_controller_spec.rb
index 617c1471239..15ce418d0d6 100644
--- a/spec/controllers/projects/clusters_controller_spec.rb
+++ b/spec/controllers/projects/clusters_controller_spec.rb
@@ -92,8 +92,8 @@ describe Projects::ClustersController do
         expect(response).to match_response_schema('cluster_status')
       end
 
-      it 'invokes sync_details on each application' do
-        expect_any_instance_of(Clusters::Applications::Ingress).to receive(:sync_details)
+      it 'invokes schedule_status_update on each application' do
+        expect_any_instance_of(Clusters::Applications::Ingress).to receive(:schedule_status_update)
 
         go
       end
-- 
cgit v1.2.1


From f76930800c9de8a232e548a8973d0edbbe936662 Mon Sep 17 00:00:00 2001
From: Dylan Griffith <dyl.griffith@gmail.com>
Date: Fri, 23 Feb 2018 11:46:32 +1100
Subject: Fix spec/features/projects/clusters/applications_spec.rb (#42643)>

Also remove the flakiness by using
`expect(page).to have_css(..., exact_text: '')` instead of
`expect(page.find(...).text).to eq('')` since the former will wait until
the text has this value while the latter will only wait for the element
to exist then test its text straight away which introduces a race
condition if the element is already there with a previous text value.
This test was failing locally most of the time because of this other
way of asserting.
---
 .../features/projects/clusters/applications_spec.rb | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/spec/features/projects/clusters/applications_spec.rb b/spec/features/projects/clusters/applications_spec.rb
index 75cf80ba555..f09533aa349 100644
--- a/spec/features/projects/clusters/applications_spec.rb
+++ b/spec/features/projects/clusters/applications_spec.rb
@@ -22,7 +22,7 @@ feature 'Clusters Applications', :js do
       scenario 'user is unable to install applications' do
         page.within('.js-cluster-application-row-helm') do
           expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-          expect(page.find(:css, '.js-cluster-application-install-button').text).to eq('Install')
+          expect(page).to have_css('.js-cluster-application-install-button', exact_text: 'Install')
         end
       end
     end
@@ -33,13 +33,13 @@ feature 'Clusters Applications', :js do
       scenario 'user can install applications' do
         page.within('.js-cluster-application-row-helm') do
           expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to be_nil
-          expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Install')
+          expect(page).to have_css('.js-cluster-application-install-button', exact_text: 'Install')
         end
       end
 
       context 'when user installs Helm' do
         before do
-          allow(ClusterInstallAppWorker).to receive(:perform_async).and_return(nil)
+          allow(ClusterInstallAppWorker).to receive(:perform_async)
 
           page.within('.js-cluster-application-row-helm') do
             page.find(:css, '.js-cluster-application-install-button').click
@@ -50,18 +50,18 @@ feature 'Clusters Applications', :js do
           page.within('.js-cluster-application-row-helm') do
             # FE sends request and gets the response, then the buttons is "Install"
             expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-            expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Install')
+            expect(page).to have_css('.js-cluster-application-install-button', exact_text: 'Install')
 
             Clusters::Cluster.last.application_helm.make_installing!
 
             # FE starts polling and update the buttons to "Installing"
             expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-            expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installing')
+            expect(page).to have_css('.js-cluster-application-install-button', exact_text: 'Installing')
 
             Clusters::Cluster.last.application_helm.make_installed!
 
             expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-            expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installed')
+            expect(page).to have_css('.js-cluster-application-install-button', exact_text: 'Installed')
           end
 
           expect(page).to have_content('Helm Tiller was successfully installed on your Kubernetes cluster')
@@ -71,8 +71,9 @@ feature 'Clusters Applications', :js do
       context 'when user installs Ingress' do
         context 'when user installs application: Ingress' do
           before do
-            allow(ClusterInstallAppWorker).to receive(:perform_async).and_return(nil)
+            allow(ClusterInstallAppWorker).to receive(:perform_async)
             allow(ClusterWaitForIngressIpAddressWorker).to receive(:perform_in)
+            allow(ClusterWaitForIngressIpAddressWorker).to receive(:perform_async)
 
             create(:clusters_applications_helm, :installed, cluster: cluster)
 
@@ -85,19 +86,19 @@ feature 'Clusters Applications', :js do
             page.within('.js-cluster-application-row-ingress') do
               # FE sends request and gets the response, then the buttons is "Install"
               expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-              expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Install')
+              expect(page).to have_css('.js-cluster-application-install-button', exact_text: 'Install')
 
               Clusters::Cluster.last.application_ingress.make_installing!
 
               # FE starts polling and update the buttons to "Installing"
               expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-              expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installing')
+              expect(page).to have_css('.js-cluster-application-install-button', exact_text: 'Installing')
 
               # The application becomes installed but we keep waiting for external IP address
               Clusters::Cluster.last.application_ingress.make_installed!
 
               expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-              expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installed')
+              expect(page).to have_css('.js-cluster-application-install-button', exact_text: 'Installed')
               expect(page).to have_selector('.js-no-ip-message')
               expect(page.find('.js-ip-address').value).to eq('?')
 
-- 
cgit v1.2.1


From 636e2856177cd86e6d810fce50d396ca8f7f4c45 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Fri, 23 Feb 2018 12:05:18 +0000
Subject: Remove extra space from string

---
 app/assets/javascripts/clusters/components/applications.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index 780c335cd37..a11e97118dd 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -172,7 +172,7 @@
             <template v-if="ingressInstalled">
               <div class="form-group">
                 <label for="ingress-ip-address">
-                  {{ s__('ClusterIntegration| Ingress IP Address') }}
+                  {{ s__('ClusterIntegration|Ingress IP Address') }}
                 </label>
                 <div
                   v-if="ingressExternalIp"
-- 
cgit v1.2.1


From 20897ebc7afe498c7a521dbe9f9c197ee63d346b Mon Sep 17 00:00:00 2001
From: Dylan Griffith <dyl.griffith@gmail.com>
Date: Sun, 25 Feb 2018 12:45:26 +1100
Subject: Increase lease timeout for CheckIngressIpAddressService to reduce
 polling frequency (#42643)

---
 app/services/clusters/applications/check_ingress_ip_address_service.rb  | 2 +-
 .../clusters/applications/check_ingress_ip_address_service_spec.rb      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/services/clusters/applications/check_ingress_ip_address_service.rb b/app/services/clusters/applications/check_ingress_ip_address_service.rb
index a98e05b25cb..e572b1e5d99 100644
--- a/app/services/clusters/applications/check_ingress_ip_address_service.rb
+++ b/app/services/clusters/applications/check_ingress_ip_address_service.rb
@@ -5,7 +5,7 @@ module Clusters
 
       Error = Class.new(StandardError)
 
-      LEASE_TIMEOUT = 3.seconds.to_i
+      LEASE_TIMEOUT = 15.seconds.to_i
 
       def execute
         return if app.external_ip
diff --git a/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb b/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb
index e14c82d32d4..bf038595a4d 100644
--- a/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb
+++ b/spec/services/clusters/applications/check_ingress_ip_address_service_spec.rb
@@ -25,7 +25,7 @@ describe Clusters::Applications::CheckIngressIpAddressService do
     allow(application.cluster).to receive(:kubeclient).and_return(kubeclient)
     allow(Gitlab::ExclusiveLease)
       .to receive(:new)
-      .with("check_ingress_ip_address_service:#{application.id}", timeout: 3.seconds.to_i)
+      .with("check_ingress_ip_address_service:#{application.id}", timeout: 15.seconds.to_i)
       .and_return(exclusive_lease)
   end
 
-- 
cgit v1.2.1


From 233cf07083faabcc11b2fa8de04123156d712efb Mon Sep 17 00:00:00 2001
From: Dylan Griffith <dyl.griffith@gmail.com>
Date: Sun, 25 Feb 2018 12:46:16 +1100
Subject: Remove redundant code and increase delay for
 ClusterWaitForIngressIpAddressWorker (#42643)

---
 app/models/clusters/applications/ingress.rb                     | 7 +++----
 app/workers/cluster_wait_for_ingress_ip_address_worker.rb       | 4 +---
 spec/models/clusters/applications/ingress_spec.rb               | 4 ++--
 spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb | 2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/models/clusters/applications/ingress.rb b/app/models/clusters/applications/ingress.rb
index 57ced0f5c44..9f583342c19 100644
--- a/app/models/clusters/applications/ingress.rb
+++ b/app/models/clusters/applications/ingress.rb
@@ -14,13 +14,13 @@ module Clusters
         nginx: 1
       }
 
-      IP_ADDRESS_FETCH_RETRIES = 3
+      FETCH_IP_ADDRESS_DELAY = 30.seconds
 
       state_machine :status do
         before_transition any => [:installed] do |application|
           application.run_after_commit do
             ClusterWaitForIngressIpAddressWorker.perform_in(
-              ClusterWaitForIngressIpAddressWorker::INTERVAL, application.name, application.id, IP_ADDRESS_FETCH_RETRIES)
+              FETCH_IP_ADDRESS_DELAY, application.name, application.id)
           end
         end
       end
@@ -41,8 +41,7 @@ module Clusters
         return unless installed?
         return if external_ip
 
-        ClusterWaitForIngressIpAddressWorker.perform_async(
-          name, id, IP_ADDRESS_FETCH_RETRIES)
+        ClusterWaitForIngressIpAddressWorker.perform_async(name, id)
       end
     end
   end
diff --git a/app/workers/cluster_wait_for_ingress_ip_address_worker.rb b/app/workers/cluster_wait_for_ingress_ip_address_worker.rb
index 72b3c8b49e0..8ba5951750c 100644
--- a/app/workers/cluster_wait_for_ingress_ip_address_worker.rb
+++ b/app/workers/cluster_wait_for_ingress_ip_address_worker.rb
@@ -3,9 +3,7 @@ class ClusterWaitForIngressIpAddressWorker
   include ClusterQueue
   include ClusterApplications
 
-  INTERVAL = 30.seconds
-
-  def perform(app_name, app_id, retries_remaining)
+  def perform(app_name, app_id)
     find_application(app_name, app_id) do |app|
       Clusters::Applications::CheckIngressIpAddressService.new(app).execute
     end
diff --git a/spec/models/clusters/applications/ingress_spec.rb b/spec/models/clusters/applications/ingress_spec.rb
index 80c450c30cb..a34f4ff2b48 100644
--- a/spec/models/clusters/applications/ingress_spec.rb
+++ b/spec/models/clusters/applications/ingress_spec.rb
@@ -20,7 +20,7 @@ describe Clusters::Applications::Ingress do
 
     it 'schedules a ClusterWaitForIngressIpAddressWorker' do
       expect(ClusterWaitForIngressIpAddressWorker).to have_received(:perform_in)
-        .with(ClusterWaitForIngressIpAddressWorker::INTERVAL, 'ingress', application.id, 3)
+        .with(Clusters::Applications::Ingress::FETCH_IP_ADDRESS_DELAY, 'ingress', application.id)
     end
   end
 
@@ -33,7 +33,7 @@ describe Clusters::Applications::Ingress do
 
     it 'schedules a ClusterWaitForIngressIpAddressWorker' do
       expect(ClusterWaitForIngressIpAddressWorker).to have_received(:perform_async)
-        .with('ingress', application.id, 3)
+        .with('ingress', application.id)
     end
 
     context 'when the application is not installed' do
diff --git a/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb b/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb
index baa295984bf..2e2e9afd25a 100644
--- a/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb
+++ b/spec/workers/cluster_wait_for_ingress_ip_address_worker_spec.rb
@@ -22,7 +22,7 @@ describe ClusterWaitForIngressIpAddressWorker do
     end
 
     it 'finds the application and calls CheckIngressIpAddressService#execute' do
-      worker.perform('ingress', 117, 2)
+      worker.perform('ingress', 117)
 
       expect(service).to have_received(:execute)
     end
-- 
cgit v1.2.1


From 0f00ee1640b529f1bfc3b8658ba76bfe620a3d03 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 28 Feb 2018 18:37:31 +0000
Subject: Add "to clipboard" to the copy text in the clipboard button

---
 app/assets/javascripts/clusters/components/applications.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index a11e97118dd..35618398468 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -188,7 +188,7 @@
                   <span class="input-group-btn">
                     <clipboard-button
                       :text="ingressExternalIp"
-                      :title="s__('ClusterIntegration|Copy Ingress IP Address')"
+                      :title="s__('ClusterIntegration|Copy Ingress IP Address to clipboard')"
                       css-class="btn btn-default js-clipboard-btn"
                     />
                   </span>
-- 
cgit v1.2.1


From ebac9c81ad1e859afe73482dd6f112b141cf9ede Mon Sep 17 00:00:00 2001
From: Dylan Griffith <dyl.griffith@gmail.com>
Date: Thu, 1 Mar 2018 11:59:44 +1100
Subject: Fix feature spec Clusters Applications (#17052)

We need to actually wait for the "Install" button to be enabled before clicking it otherwise we have a race condition where it sometimes works. Also change the `expect(page.find(...))` to `expect(page).to have_css` as this is prefered to avoid race conditions
---
 spec/features/projects/clusters/applications_spec.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/spec/features/projects/clusters/applications_spec.rb b/spec/features/projects/clusters/applications_spec.rb
index f09533aa349..7b2c57aa652 100644
--- a/spec/features/projects/clusters/applications_spec.rb
+++ b/spec/features/projects/clusters/applications_spec.rb
@@ -78,6 +78,7 @@ feature 'Clusters Applications', :js do
             create(:clusters_applications_helm, :installed, cluster: cluster)
 
             page.within('.js-cluster-application-row-ingress') do
+              expect(page).to have_css('.js-cluster-application-install-button:not([disabled])')
               page.find(:css, '.js-cluster-application-install-button').click
             end
           end
@@ -85,20 +86,20 @@ feature 'Clusters Applications', :js do
           it 'he sees status transition' do
             page.within('.js-cluster-application-row-ingress') do
               # FE sends request and gets the response, then the buttons is "Install"
-              expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
+              expect(page).to have_css('.js-cluster-application-install-button[disabled]')
               expect(page).to have_css('.js-cluster-application-install-button', exact_text: 'Install')
 
               Clusters::Cluster.last.application_ingress.make_installing!
 
               # FE starts polling and update the buttons to "Installing"
-              expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
               expect(page).to have_css('.js-cluster-application-install-button', exact_text: 'Installing')
+              expect(page).to have_css('.js-cluster-application-install-button[disabled]')
 
               # The application becomes installed but we keep waiting for external IP address
               Clusters::Cluster.last.application_ingress.make_installed!
 
-              expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
               expect(page).to have_css('.js-cluster-application-install-button', exact_text: 'Installed')
+              expect(page).to have_css('.js-cluster-application-install-button[disabled]')
               expect(page).to have_selector('.js-no-ip-message')
               expect(page.find('.js-ip-address').value).to eq('?')
 
-- 
cgit v1.2.1