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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
25c071a3
Commit
25c071a3
authored
Jan 24, 2020
by
Alishan Ladhani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename Cloud Run on GKE
To match what it is currently called
parent
b39a50ef
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
6 deletions
+11
-6
app/views/clusters/clusters/gcp/_form.html.haml
app/views/clusters/clusters/gcp/_form.html.haml
+1
-1
changelogs/unreleased/39462-cloud-run-mislabeled-on-gke-cluster-creation-form.yml
...462-cloud-run-mislabeled-on-gke-cluster-creation-form.yml
+5
-0
doc/user/project/clusters/add_remove_clusters.md
doc/user/project/clusters/add_remove_clusters.md
+4
-4
locale/gitlab.pot
locale/gitlab.pot
+1
-1
No files found.
app/views/clusters/clusters/gcp/_form.html.haml
View file @
25c071a3
...
@@ -66,7 +66,7 @@
...
@@ -66,7 +66,7 @@
-
if
Feature
.
enabled?
(
:create_cloud_run_clusters
,
clusterable
,
default_enabled:
true
)
-
if
Feature
.
enabled?
(
:create_cloud_run_clusters
,
clusterable
,
default_enabled:
true
)
.form-group
.form-group
=
provider_gcp_field
.
check_box
:cloud_run
,
{
label:
s_
(
'ClusterIntegration|Enable Cloud Run
on GKE (beta)
'
),
=
provider_gcp_field
.
check_box
:cloud_run
,
{
label:
s_
(
'ClusterIntegration|Enable Cloud Run
for Anthos
'
),
label_class:
'label-bold'
}
label_class:
'label-bold'
}
.form-text.text-muted
.form-text.text-muted
=
s_
(
'ClusterIntegration|Uses the Cloud Run, Istio, and HTTP Load Balancing addons for this cluster.'
)
=
s_
(
'ClusterIntegration|Uses the Cloud Run, Istio, and HTTP Load Balancing addons for this cluster.'
)
...
...
changelogs/unreleased/39462-cloud-run-mislabeled-on-gke-cluster-creation-form.yml
0 → 100644
View file @
25c071a3
---
title
:
Rename Cloud Run on GKE to Cloud Run for Anthos
merge_request
:
23694
author
:
type
:
other
doc/user/project/clusters/add_remove_clusters.md
View file @
25c071a3
...
@@ -230,8 +230,8 @@ To create and add a new Kubernetes cluster to your project, group, or instance:
...
@@ -230,8 +230,8 @@ To create and add a new Kubernetes cluster to your project, group, or instance:
-
**Number of nodes**
- Enter the number of nodes you wish the cluster to have.
-
**Number of nodes**
- Enter the number of nodes you wish the cluster to have.
-
**Machine type**
- The
[
machine type
](
https://cloud.google.com/compute/docs/machine-types
)
-
**Machine type**
- The
[
machine type
](
https://cloud.google.com/compute/docs/machine-types
)
of the Virtual Machine instance that the cluster will be based on.
of the Virtual Machine instance that the cluster will be based on.
-
**Enable Cloud Run
on GKE (beta)**
- Check this if you want to use Cloud Run on GKE
for this cluster.
-
**Enable Cloud Run
for Anthos**
- Check this if you want to use Cloud Run for Anthos
for this cluster.
See the
[
Cloud Run
on GKE section
](
#cloud-run-on-gke
)
for more information.
See the
[
Cloud Run
for Anthos section
](
#cloud-run-for-anthos
)
for more information.
-
**GitLab-managed cluster**
- Leave this checked if you want GitLab to manage namespaces and service accounts for this cluster.
-
**GitLab-managed cluster**
- Leave this checked if you want GitLab to manage namespaces and service accounts for this cluster.
See the
[
Managed clusters section
](
index.md#gitlab-managed-clusters
)
for more information.
See the
[
Managed clusters section
](
index.md#gitlab-managed-clusters
)
for more information.
1.
Finally, click the
**Create Kubernetes cluster**
button.
1.
Finally, click the
**Create Kubernetes cluster**
button.
...
@@ -239,11 +239,11 @@ To create and add a new Kubernetes cluster to your project, group, or instance:
...
@@ -239,11 +239,11 @@ To create and add a new Kubernetes cluster to your project, group, or instance:
After a couple of minutes, your cluster will be ready to go. You can now proceed
After a couple of minutes, your cluster will be ready to go. You can now proceed
to install some
[
pre-defined applications
](
index.md#installing-applications
)
.
to install some
[
pre-defined applications
](
index.md#installing-applications
)
.
#### Cloud Run
on GKE
#### Cloud Run
for Anthos
> [Introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/16566) in GitLab 12.4.
> [Introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/16566) in GitLab 12.4.
You can choose to use Cloud Run
on GKE
in place of installing Knative and Istio
You can choose to use Cloud Run
for Anthos
in place of installing Knative and Istio
separately after the cluster has been created. This means that Cloud Run
separately after the cluster has been created. This means that Cloud Run
(Knative), Istio, and HTTP Load Balancing will be enabled on the cluster at
(Knative), Istio, and HTTP Load Balancing will be enabled on the cluster at
create time and cannot be
[
installed or uninstalled
](
../../clusters/applications.md
)
separately.
create time and cannot be
[
installed or uninstalled
](
../../clusters/applications.md
)
separately.
...
...
locale/gitlab.pot
View file @
25c071a3
...
@@ -4061,7 +4061,7 @@ msgstr ""
...
@@ -4061,7 +4061,7 @@ msgstr ""
msgid "ClusterIntegration|Elastic Stack"
msgid "ClusterIntegration|Elastic Stack"
msgstr ""
msgstr ""
msgid "ClusterIntegration|Enable Cloud Run
on GKE (beta)
"
msgid "ClusterIntegration|Enable Cloud Run
for Anthos
"
msgstr ""
msgstr ""
msgid "ClusterIntegration|Enable Web Application Firewall"
msgid "ClusterIntegration|Enable Web Application Firewall"
...
...
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