diff options
author | Fatih Acet <acetfatih@gmail.com> | 2018-01-11 20:48:40 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2018-01-11 20:48:40 +0000 |
commit | ee5468449b1cef2288074c03eab33b35cbdff950 (patch) | |
tree | 859e30e72133d0a09621ea4bc0555ea6e1b11286 | |
parent | 34760245bcb4156e21ca463b82b1fab84508b842 (diff) | |
parent | ce3c70aded0e10af6434d8bfd011815640083f71 (diff) | |
download | gitlab-ce-ee5468449b1cef2288074c03eab33b35cbdff950.tar.gz |
Merge branch '41163-improve-cluster-ingress-extra-cost-language' into 'master'
Improve wording about additional costs with Ingress on GKE or custom clusters
Closes #41163
See merge request gitlab-org/gitlab-ce!16370
-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 |