From 2e6cefade76f74515c93e09e791160c9165e84aa Mon Sep 17 00:00:00 2001
From: Westly Wright <westly.wright@gmail.com>
Date: Fri, 15 Mar 2019 10:50:31 -0700
Subject: [PATCH] show final step banner all the time and reword message for
 gdns

rancher/rancher#18937
---
 .../addon/global-dns/entries/new/template.hbs  | 18 ++++++++----------
 translations/en-us.yaml                        |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/lib/global-admin/addon/global-dns/entries/new/template.hbs b/lib/global-admin/addon/global-dns/entries/new/template.hbs
index 2783ad3dc..de14d741d 100644
--- a/lib/global-admin/addon/global-dns/entries/new/template.hbs
+++ b/lib/global-admin/addon/global-dns/entries/new/template.hbs
@@ -188,17 +188,15 @@
           {{/if}}
         </div>
       </div>
-      {{#if (eq recordType "project")}}
-        <div class="row">
-          <div class="col span-12">
-            {{#banner-message icon="icon-info" color="bg-info mb-0 mt-10"}}
-              <p>
-                {{t "globalDnsPage.entriesPage.projectHelp" htmlSafe=true}}
-              </p>
-            {{/banner-message}}
-          </div>
+      <div class="row">
+        <div class="col span-12">
+          {{#banner-message icon="icon-info" color="bg-info mb-0 mt-10"}}
+            <p>
+              {{t "globalDnsPage.entriesPage.projectHelp" htmlSafe=true}}
+            </p>
+          {{/banner-message}}
         </div>
-      {{/if}}
+      </div>
       <div class="row">
         <div class="col span-3">
           <label
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index 0ff947513..d4a18132f 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -1125,7 +1125,7 @@ globalDnsPage:
       noAccessMulti: You do not have access to the target app
       noAccessProvider: You do not have access to the provider
       noAccessProject: You do not have access to the target project
-    projectHelp: "To finalize Global DNS for projects you must add the following annotation label ( <code>rancher.io/globalDNS.hostname</code> ) on the ingress in the project, where <code>hostname</code> is the host name used in the routing rules."
+    projectHelp: "To finalize configuring this Global DNS entry, you must add the following annotation label ( <code>rancher.io/globalDNS.&lt;HOSTNAME&gt;</code> ) on the ingress for your application or project, where <code>&lt;HOSTNAME&gt;</code> is the host name used in the routing rules of your ingress. This <code>&lt;HOSTNAME&gt;</code> must also match the FQDN of this Global DNS entry."
     table:
       name: Name
       fqdn: FQDN