Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
ce3c70ad
Commit
ce3c70ad
authored
Jan 10, 2018
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Ingress extra cost note to be more generic
Fix
https://gitlab.com/gitlab-org/gitlab-ce/issues/41163
parent
ab28ea07
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
app/assets/javascripts/clusters/components/applications.vue
app/assets/javascripts/clusters/components/applications.vue
+7
-6
changelogs/unreleased/41163-improve-cluster-ingress-extra-cost-language.yml
...sed/41163-improve-cluster-ingress-extra-cost-language.yml
+5
-0
No files found.
app/assets/javascripts/clusters/components/applications.vue
View file @
ce3c70ad
...
...
@@ -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
,
);
...
...
changelogs/unreleased/41163-improve-cluster-ingress-extra-cost-language.yml
0 → 100644
View file @
ce3c70ad
---
title
:
Improve wording about additional costs for Ingress on custom clusters
merge_request
:
author
:
type
:
changed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment