diff --git a/app/views/clusters/clusters/index.html.haml b/app/views/clusters/clusters/index.html.haml index ad6d1d856d6dfd06b6fde1cdd5fa06454f8360a3..219f71f775158e180975715a87420282a17ac13d 100644 --- a/app/views/clusters/clusters/index.html.haml +++ b/app/views/clusters/clusters/index.html.haml @@ -11,6 +11,13 @@ .nav-text = s_("ClusterIntegration|Kubernetes clusters can be used to deploy applications and to provide Review Apps for this project") = render 'clusters/clusters/buttons' + + - if @clusters.length > clusterable.clusters.length + .bs-callout.bs-callout-info + = s_("ClusterIntegration|Clusters are utilized by selecting the nearest ancestor with a matching environment scope. For example, project clusters will override group clusters.") + %strong + = link_to _('More information'), help_page_path('user/group/clusters/', anchor: 'cluster-precedence') + .clusters-table.js-clusters-list .gl-responsive-table-row.table-row-header{ role: "row" } .table-section.section-60{ role: "rowheader" } diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 0584d2006f7d6d5bbfc22609c552e2d2e859ce2a..ef1c56a50abfaae1a8772469aae89d874e474b67 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1497,6 +1497,9 @@ msgstr "" msgid "ClusterIntegration|Choose which of your environments will use this cluster." msgstr "" +msgid "ClusterIntegration|Clusters are utilized by selecting the nearest ancestor with a matching environment scope. For example, project clusters will override group clusters." +msgstr "" + msgid "ClusterIntegration|Copy API URL" msgstr ""