diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2018-01-10 14:18:15 -0600 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2018-01-11 12:37:54 -0600 |
| commit | ce3c70aded0e10af6434d8bfd011815640083f71 (patch) | |
| tree | ea9864272b004fcb7df35a3c562c08d24377e9ac | |
| parent | ab28ea071ba7f70e59e8aeba9da03031dd83b0f1 (diff) | |
| download | gitlab-ce-41163-improve-cluster-ingress-extra-cost-language.tar.gz | |
Update Ingress extra cost note to be more generic41163-improve-cluster-ingress-extra-cost-language
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41163
| -rw-r--r-- | app/assets/javascripts/clusters/components/applications.vue | 13 | ||||
| -rw-r--r-- | changelogs/unreleased/41163-improve-cluster-ingress-extra-cost-language.yml | 5 |
2 files changed, 12 insertions, 6 deletions
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index 25cef44c1b8..57457ebd0a3 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -46,14 +46,15 @@ )); const extraCostParagraph = sprintf( - _.escape(s__(`ClusterIntegration|%{boldNotice} This will add some -extra resources like a load balancer, -which incur additional costs. See %{pricingLink}`)), - { + _.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, + you can %{pricingLink}.`, + )), { boldNotice: `<strong>${_.escape(s__('ClusterIntegration|Note:'))}</strong>`, pricingLink: `<a href="https://cloud.google.com/compute/pricing#lb" target="_blank" rel="noopener noreferrer"> - ${_.escape(s__('ClusterIntegration|GKE pricing'))} - </a>`, + ${_.escape(s__('ClusterIntegration|check the pricing here'))}</a>`, }, false, ); diff --git a/changelogs/unreleased/41163-improve-cluster-ingress-extra-cost-language.yml b/changelogs/unreleased/41163-improve-cluster-ingress-extra-cost-language.yml new file mode 100644 index 00000000000..9c48831855c --- /dev/null +++ b/changelogs/unreleased/41163-improve-cluster-ingress-extra-cost-language.yml @@ -0,0 +1,5 @@ +--- +title: Improve wording about additional costs for Ingress on custom clusters +merge_request: +author: +type: changed |