From d2688b2855c9a039335da0ad2484aa02a44c1b2b Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Tue, 30 Jan 2018 17:13:54 -0600
Subject: add manage button to application rows in cluster integration

---
 .../javascripts/clusters/components/applications.vue      | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'app/assets/javascripts/clusters/components/applications.vue')

diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index ff2e0768a87..56c038aabd7 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -18,6 +18,11 @@
         required: false,
         default: '',
       },
+      managePrometheusPath: {
+        type: String,
+        required: false,
+        default: '',
+      }
     },
     computed: {
       generalApplicationDescription() {
@@ -76,11 +81,12 @@
       },
       prometheusDescription() {
         return sprintf(
-          _.escape(s__(`ClusterIntegration|Prometheus is an open-source monitoring system
-  with %{gitlabIntegrationLink} to monitor deployed applications.`)),
-          {
+          _.escape(s__(
+            `ClusterIntegration|Prometheus is an open-source monitoring system
+            with %{gitlabIntegrationLink} to monitor deployed applications.`,
+          )), {
             gitlabIntegrationLink: `<a href="https://docs.gitlab.com/ce/user/project/integrations/prometheus.html"
-target="_blank" rel="noopener noreferrer">
+              target="_blank" rel="noopener noreferrer">
               ${_.escape(s__('ClusterIntegration|GitLab Integration'))}</a>`,
           },
           false,
@@ -129,6 +135,7 @@ target="_blank" rel="noopener noreferrer">
           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"
-- 
cgit v1.2.1


From e25f383ddc6b867dc4010be10518d79c663d7409 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Wed, 31 Jan 2018 13:58:27 -0600
Subject: fix eslint and formatting issues

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

(limited to 'app/assets/javascripts/clusters/components/applications.vue')

diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index 56c038aabd7..4c9766fb96f 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -22,14 +22,14 @@
         type: String,
         required: false,
         default: '',
-      }
+      },
     },
     computed: {
       generalApplicationDescription() {
         return sprintf(
-          _.escape(s__(`ClusterIntegration|Install applications on your cluster.
-  Read more about %{helpLink}`)),
-          {
+          _.escape(s__(
+            'ClusterIntegration|Install applications on your cluster. Read more about %{helpLink}',
+          )), {
             helpLink: `<a href="${this.helpPath}">
               ${_.escape(s__('ClusterIntegration|installing applications'))}
             </a>`,
-- 
cgit v1.2.1


From 0ecd759d73abaee5c08adbd8ab3db651c2522b14 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Mon, 29 Jan 2018 20:49:00 +0100
Subject: Replace "cluster" with "Kubernetes cluster"

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

(limited to 'app/assets/javascripts/clusters/components/applications.vue')

diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index ff2e0768a87..25188c81db4 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -22,7 +22,7 @@
     computed: {
       generalApplicationDescription() {
         return sprintf(
-          _.escape(s__(`ClusterIntegration|Install applications on your cluster.
+          _.escape(s__(`ClusterIntegration|Install applications on your Kubernetes cluster.
   Read more about %{helpLink}`)),
           {
             helpLink: `<a href="${this.helpPath}">
@@ -34,7 +34,7 @@
       },
       helmTillerDescription() {
         return _.escape(s__(
-          `ClusterIntegration|Helm streamlines installing and managing Kubernets applications.
+          `ClusterIntegration|Helm streamlines installing and managing Kubernetes applications.
           Tiller runs inside of your Kubernetes Cluster, and manages
           releases of your charts.`,
         ));
@@ -49,7 +49,7 @@
           _.escape(s__(
             `ClusterIntegration|%{boldNotice} This will add some extra resources
             like a load balancer, which may incur additional costs depending on
-            the hosting provider Kubernetes is installed on. If you are using GKE,
+            the hosting provider your Kubernetes cluster is installed on. If you are using GKE,
             you can %{pricingLink}.`,
           )), {
             boldNotice: `<strong>${_.escape(s__('ClusterIntegration|Note:'))}</strong>`,
-- 
cgit v1.2.1


From 914415c79f4100494b96d5f883f235fd61d62f52 Mon Sep 17 00:00:00 2001
From: Fabio Busatto <fabio@gitlab.com>
Date: Tue, 6 Feb 2018 14:59:15 +0000
Subject: Resolve "Add a link to documentation on how to get external ip in the
 Kubernetes cluster details page"

---
 .../clusters/components/applications.vue           | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'app/assets/javascripts/clusters/components/applications.vue')

diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index ff2e0768a87..3b7195de635 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -18,6 +18,11 @@
         required: false,
         default: '',
       },
+      ingressHelpPath: {
+        type: String,
+        required: false,
+        default: '',
+      },
     },
     computed: {
       generalApplicationDescription() {
@@ -59,13 +64,28 @@
           false,
         );
 
+        const externalIpParagraph = sprintf(
+          _.escape(s__(
+            `ClusterIntegration|After installing Ingress, you will need to point your wildcard DNS
+            at the generated external IP address in order to view your app after it is deployed. %{ingressHelpLink}`,
+          )), {
+            ingressHelpLink: `<a href="${this.ingressHelpPath}">
+              ${_.escape(s__('ClusterIntegration|More information'))}
+            </a>`,
+          },
+          false,
+        );
+
         return `
           <p>
             ${descriptionParagraph}
           </p>
-          <p class="append-bottom-0">
+          <p>
             ${extraCostParagraph}
           </p>
+          <p class="settings-message append-bottom-0">
+            ${externalIpParagraph}
+          </p>
         `;
       },
       gitlabRunnerDescription() {
-- 
cgit v1.2.1